mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 01:39:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

chore: isRemovable(terrain) returns if the tile improvement is actually buildable

Browse Source
This commit is contained in:
yairm210
2024-12-01 12:30:26 +02:00
parent 4f5d550e7b
commit e5c20f78dd
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
View File

@ -362,7 +362,7 @@ class WorkerAutomation(
val lastTerrain = tile.lastTerrain 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 { val improvementStringForResource: String? = when {
tile.resource == null || !tile.hasViewableResource(civInfo) -> null tile.resource == null || !tile.hasViewableResource(civInfo) -> null
@ -372,7 +372,6 @@ class WorkerAutomation(
&& isRemovable(lastTerrain) && isRemovable(lastTerrain)
&& !tile.providesResources(civInfo) && !tile.providesResources(civInfo)
&& !isResourceImprovementAllowedOnFeature(tile, potentialTileImprovements) && !isResourceImprovementAllowedOnFeature(tile, potentialTileImprovements)
&& potentialTileImprovements.containsKey(Constants.remove + lastTerrain.name)
-> Constants.remove + lastTerrain.name -> Constants.remove + lastTerrain.name
else -> tile.tileResource.getImprovements().filter { it in potentialTileImprovements || it == tile.improvement } else -> tile.tileResource.getImprovements().filter { it in potentialTileImprovements || it == tile.improvement }
@ -400,7 +399,6 @@ class WorkerAutomation(
lastTerrain.let { lastTerrain.let {
isRemovable(it) isRemovable(it)
&& potentialTileImprovements.containsKey(Constants.remove + lastTerrain.name)
&& (Automation.rankStatsValue(it, civInfo) < 0 || it.hasUnique(UniqueType.NullifyYields)) && (Automation.rankStatsValue(it, civInfo) < 0 || it.hasUnique(UniqueType.NullifyYields))
} -> Constants.remove + lastTerrain.name } -> Constants.remove + lastTerrain.name