From 73d9179f09272917eddbdcdc126c1d292c6ffc7f Mon Sep 17 00:00:00 2001 From: SimonCeder <63475501+SimonCeder@users.noreply.github.com> Date: Sun, 7 Nov 2021 17:25:27 +0100 Subject: [PATCH] can remove fallout on oases (#5640) * can remove fallout on oases * remove matchesfilter --- core/src/com/unciv/logic/map/TileInfo.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index c4e8840de0..848e4b8d1b 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -472,8 +472,9 @@ open class TileInfo { RoadStatus.values().none { it.name == improvement.name || it.removeAction == improvement.name } && getTileImprovement().let { it != null && it.hasUnique("Irremovable") } -> false - // Terrain blocks most improvements - getAllTerrains().any { it.getMatchingUniques(UniqueType.RestrictedBuildableImprovements) + // Terrain blocks BUILDING improvements - removing things (such as fallout) is fine + !improvement.name.startsWith("Remove ") && + getAllTerrains().any { it.getMatchingUniques(UniqueType.RestrictedBuildableImprovements) .any { unique -> !improvement.matchesFilter(unique.params[0]) } } -> false // Decide cancelImprovementOrder earlier, otherwise next check breaks it