AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 23:10:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Autoassign the population when the manual assignment fails (#7028)

Browse Source 
* Whitespaces "magic"

* Fallback to assign the worker automatically
This commit is contained in:
Jack Rainy 2022-05-31 23:59:19 +03:00 committed by GitHub
parent 8e5a9a3385
commit cd9746560e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/logic/city/PopulationManager.kt
View File

@ -197,10 +197,18 @@ class PopulationManager {
//un-assign population
if ((worstWorkedTile != null && valueWorstTile < valueWorstSpecialist)
|| worstJob == null) {
cityInfo.workedTiles = cityInfo.workedTiles.withoutItem(worstWorkedTile!!.position)
} else specialistAllocations.add(worstJob, -1)
if (worstWorkedTile != null && valueWorstTile < valueWorstSpecialist) {
cityInfo.workedTiles = cityInfo.workedTiles.withoutItem(worstWorkedTile.position)
} else if (worstJob != null) specialistAllocations.add(worstJob, -1)
else {
// It happens when "cityInfo.manualSpecialists == true"
// and population goes below the number of specialists, e.g. city is razing.
// Let's give a chance to do the work automatically at least.
val worstAutoJob = specialistAllocations.keys.minByOrNull {
Automation.rankSpecialist(it, cityInfo, cityInfo.cityStats.currentCityStats) }
?: break // sorry, we can do nothing about that
specialistAllocations.add(worstAutoJob, -1)
}
}
}