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

Resolved #10417 - "Nullifies all other stats this tile provides" includes nullifying improvement stats

Browse Source
This commit is contained in:
yairm210 2025-04-08 09:11:27 +03:00
parent d99fbd88a7
commit a3df5e3c61
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,11 +56,15 @@ class TileStatFunctions(val tile: Tile) {
): List<Pair<String, Stats>> {
val stateForConditionals = StateForConditionals(civInfo = observingCiv, city = city, tile = tile)
val listOfStats = getTerrainStatsBreakdown(stateForConditionals)
val otherYieldsIgnored = tile.allTerrains.any { it.hasUnique(UniqueType.NullifyYields, stateForConditionals) }
val improvement = tile.getUnpillagedTileImprovement()
val improvement = if (otherYieldsIgnored) null // Treat it as if there is no improvement
else tile.getUnpillagedTileImprovement()
val improvementStats = improvement?.cloneStats() ?: Stats.ZERO // If improvement==null, will never be added to
val road = tile.getUnpillagedRoadImprovement()
val road = if (otherYieldsIgnored) null
else tile.getUnpillagedRoadImprovement()
val roadStats = road?.cloneStats() ?: Stats.ZERO
if (city != null) {