mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 10:18:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Ensure Minimum Stats (#9408)

Browse Source
This commit is contained in:
SomeTroglodyte
2023-05-20 23:13:50 +02:00
committed by GitHub
parent 728afab1db
commit ec4586af6c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/map/tile/TileStatFunctions.kt
View File

@ -84,9 +84,12 @@ class TileStatFunctions(val tile: Tile) {
/** Ensures each stat is >= [other].stat - modifies in place */ /** Ensures each stat is >= [other].stat - modifies in place */
private fun Stats.coerceAtLeast(other: Stats) { private fun Stats.coerceAtLeast(other: Stats) {
for ((stat, value) in other) // Note: Not `for ((stat, value) in other)` - that would skip zero values
for (stat in Stat.values()) {
val value = other[stat]
if (this[stat] < value) this[stat] = value if (this[stat] < value) this[stat] = value
} }
}
/** Gets basic stats to start off [getTileStats] or [getTileStartYield], independently mutable result */ /** Gets basic stats to start off [getTileStats] or [getTileStartYield], independently mutable result */
private fun getTerrainStats(): Stats { private fun getTerrainStats(): Stats {