mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-06 16:28:40 +07: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
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,12 +77,12 @@ class PopulationManager {
}
if (foodStored >= getFoodToNextPopulation()) { // growth!
foodStored -= getFoodToNextPopulation()
var percentOfFoodCarriedOver =
var percentOfFoodCarriedOver =
cityInfo.getMatchingUniques(UniqueType.CarryOverFood)
.filter { cityInfo.matchesFilter(it.params[1]) }
.sumOf { it.params[0].toInt() }
// Try to avoid runaway food gain in mods, just in case
if (percentOfFoodCarriedOver > 95) percentOfFoodCarriedOver = 95
// Try to avoid runaway food gain in mods, just in case
if (percentOfFoodCarriedOver > 95) percentOfFoodCarriedOver = 95
foodStored += (getFoodToNextPopulation() * percentOfFoodCarriedOver / 100f).toInt()
addPopulation(1)
cityInfo.updateCitizens = true
@ -93,7 +93,7 @@ class PopulationManager {
private fun getStatsOfSpecialist(name: String) = cityInfo.cityStats.getStatsOfSpecialist(name)
fun addPopulation(count: Int) {
val changedAmount =
val changedAmount =
if (population + count < 0) -population
else count
population += changedAmount
@ -121,7 +121,7 @@ class PopulationManager {
if (cityInfo.matchesFilter(unique.params[1]))
specialistFoodBonus *= unique.params[0].toPercent()
specialistFoodBonus = 2f - specialistFoodBonus
for (i in 1..getFreePopulation()) {
//evaluate tiles
val (bestTile, valueBestTile) = cityInfo.getTiles()
@ -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)
}
}
}
@ -211,4 +219,4 @@ class PopulationManager {
counter.add(building.newSpecialists())
return counter
}
}
}