mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-12 03:48:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

Worker automation no longer considers foreign unique improvements when deciding if to remove features

Browse Source
This commit is contained in:
Yair Morgenstern 2023-01-05 13:52:17 +02:00
parent 3e2a2a74f5
commit a0ff4c18d5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,7 +385,7 @@ class WorkerAutomation(
tile.resource == null || !tile.hasViewableResource(civInfo) -> null
tile.terrainFeatures.isNotEmpty()
&& isUnbuildableAndRemovable(lastTerrain)
&& !isResourceImprovementAllowedOnFeature(tile) -> Constants.remove + lastTerrain.name
&& !isResourceImprovementAllowedOnFeature(tile, potentialTileImprovements) -> Constants.remove + lastTerrain.name
else -> tile.tileResource.getImprovements().filter { it in potentialTileImprovements || it==tile.improvement }
.maxByOrNull { Automation.rankStatsValue(ruleSet.tileImprovements[it]!!, unit.civInfo) }
}
@ -421,9 +421,13 @@ class WorkerAutomation(
*
* Assumes the caller ensured that terrainFeature and resource are both present!
*/
private fun isResourceImprovementAllowedOnFeature(tile: TileInfo): Boolean {
private fun isResourceImprovementAllowedOnFeature(
tile: TileInfo,
potentialTileImprovements: Map<String, TileImprovement>
): Boolean {
return tile.tileResource.getImprovements().any { resourceImprovementName ->
val resourceImprovement = ruleSet.tileImprovements[resourceImprovementName] ?: return false
if (resourceImprovementName !in potentialTileImprovements) return@any false
val resourceImprovement = potentialTileImprovements[resourceImprovementName]!!
tile.terrainFeatures.any { resourceImprovement.isAllowedOnFeature(it) }
}
}