diff --git a/core/src/com/unciv/logic/civilization/Civilization.kt b/core/src/com/unciv/logic/civilization/Civilization.kt index 13b61e9146..97a148cf78 100644 --- a/core/src/com/unciv/logic/civilization/Civilization.kt +++ b/core/src/com/unciv/logic/civilization/Civilization.kt @@ -125,10 +125,6 @@ class Civilization : IsPartOfGameInfoSerialization { @Transient var passThroughImpassableUnlocked = false // Cached Boolean equal to passableImpassables.isNotEmpty() - @Transient - var nonStandardTerrainDamage = false - - @Transient var thingsToFocusOnForVictory = setOf() @@ -701,9 +697,6 @@ class Civilization : IsPartOfGameInfoSerialization { city.workedTiles.remove(workedTile) passThroughImpassableUnlocked = passableImpassables.isNotEmpty() - // Cache whether this civ gets nonstandard terrain damage for performance reasons. - nonStandardTerrainDamage = getMatchingUniques(UniqueType.DamagesContainingUnits) - .any { gameInfo.ruleset.terrains[it.params[0]]!!.damagePerTurn != it.params[1].toInt() } hasLongCountDisplayUnique = hasUnique(UniqueType.MayanCalendarDisplay) diff --git a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt index 3d4c59ef02..0812aea918 100644 --- a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt +++ b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt @@ -485,14 +485,6 @@ class MapUnit : IsPartOfGameInfoSerialization { } fun getDamageFromTerrain(tile: Tile = currentTile): Int { - if (civ.nonStandardTerrainDamage) { - for (unique in getMatchingUniques(UniqueType.DamagesContainingUnits)) { - if (unique.params[0] in tile.allTerrains.map { it.name }) { - return unique.params[1].toInt() // Use the damage from the unique - } - } - } - // Otherwise fall back to the defined standard damage return tile.allTerrains.sumOf { it.damagePerTurn } }