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

Growth nullifying uniques do not nullify starvation

Browse Source
This commit is contained in:
yairm210
2024-11-14 08:17:27 +02:00
parent a020a2a797
commit 386c0812be
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -589,12 +589,13 @@ class CityStats(val city: City) {
val growthNullifyingUnique = city.getMatchingUniques(UniqueType.NullifiesGrowth).firstOrNull() val growthNullifyingUnique = city.getMatchingUniques(UniqueType.NullifiesGrowth).firstOrNull()
if (growthNullifyingUnique != null) { if (growthNullifyingUnique != null) {
// Note that negative food will also be nullified. Pretty sure that's conform civ V, but haven't checked. // Does not nullify negative growth (starvation)
val amountToRemove = -newFinalStatList.values.sumOf { it[Stat.Food].toDouble() } val currentGrowth = newFinalStatList.values.sumOf { it[Stat.Food].toDouble() }
newFinalStatList.add( if (currentGrowth > 0)
growthNullifyingUnique.getSourceNameForUser(), newFinalStatList.add(
Stats(food = amountToRemove.toFloat()) growthNullifyingUnique.getSourceNameForUser(),
) Stats(food = -currentGrowth.toFloat())
)
} }
if (city.isInResistance()) if (city.isInResistance())