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

Resolve #8127 - If several improvements can provide a resource, workers pick the one that gives the most yields

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-02 09:43:53 +02:00
parent f2ad07a96c
commit d4bd4dc4b2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,12 +386,13 @@ class WorkerAutomation(
tile.terrainFeatures.isNotEmpty()
&& isUnbuildableAndRemovable(lastTerrain)
&& !isResourceImprovementAllowedOnFeature(tile) -> Constants.remove + lastTerrain.name
else -> tile.tileResource.getImprovements().firstOrNull { it in potentialTileImprovements }
else -> tile.tileResource.getImprovements().filter { it in potentialTileImprovements || it==tile.improvement }
.maxByOrNull { Automation.rankStatsValue(ruleSet.tileImprovements[it]!!, unit.civInfo) }
}
val improvementString = when {
tile.improvementInProgress != null -> tile.improvementInProgress!!
improvementStringForResource != null -> improvementStringForResource
improvementStringForResource != null -> if (improvementStringForResource==tile.improvement) null else improvementStringForResource
// if this is a resource that HAS an improvement, but this unit can't build it, don't waste your time
tile.resource != null && tile.tileResource.getImprovements().any() -> return null
tile.containsGreatImprovement() -> return null