From e5c20f78ddc28cf40ce0b0f5d7c06099ef134628 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 1 Dec 2024 12:30:26 +0200 Subject: [PATCH] chore: isRemovable(terrain) returns if the tile improvement is actually buildable --- core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt index 72951fe135..ef4b27ce9f 100644 --- a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt @@ -362,7 +362,7 @@ class WorkerAutomation( val lastTerrain = tile.lastTerrain - fun isRemovable(terrain: Terrain): Boolean = ruleSet.tileImprovements.containsKey(Constants.remove + terrain.name) + fun isRemovable(terrain: Terrain): Boolean = potentialTileImprovements.containsKey(Constants.remove + terrain.name) val improvementStringForResource: String? = when { tile.resource == null || !tile.hasViewableResource(civInfo) -> null @@ -372,7 +372,6 @@ class WorkerAutomation( && isRemovable(lastTerrain) && !tile.providesResources(civInfo) && !isResourceImprovementAllowedOnFeature(tile, potentialTileImprovements) - && potentialTileImprovements.containsKey(Constants.remove + lastTerrain.name) -> Constants.remove + lastTerrain.name else -> tile.tileResource.getImprovements().filter { it in potentialTileImprovements || it == tile.improvement } @@ -400,7 +399,6 @@ class WorkerAutomation( lastTerrain.let { isRemovable(it) - && potentialTileImprovements.containsKey(Constants.remove + lastTerrain.name) && (Automation.rankStatsValue(it, civInfo) < 0 || it.hasUnique(UniqueType.NullifyYields)) } -> Constants.remove + lastTerrain.name