modding: Negative tile damage cannot heal more than max health

yairm210 · Nov 7, 2023 · 75c4be3 · SomeTroglodyte · Nov 7, 2023 · SomeTroglodyte
1 parent c9212e1
commit 75c4be3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt
@@ -25,6 +25,7 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant {
 
     override fun takeDamage(damage: Int) {
         unit.health -= damage
+        if (unit.health > 100) unit.health = 100 // For cheating modders, e.g. negative tile damage
         if (unit.health < 0) unit.health = 0
         if (isDefeated()) unit.destroy()
     }

diff --git a/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt b/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
@@ -1,6 +1,7 @@
 package com.unciv.logic.map.mapunit
 
 import com.unciv.UncivGame
+import com.unciv.logic.battle.MapUnitCombatant
 import com.unciv.logic.civilization.LocationAction
 import com.unciv.logic.civilization.NotificationCategory
 import com.unciv.logic.civilization.NotificationIcon
@@ -83,7 +84,7 @@ class UnitTurnManager(val unit: MapUnit) {
             }.maxByOrNull { it.second }
             ?: return
         if (damage == 0) return
-        unit.health -= damage
+        MapUnitCombatant(unit).takeDamage(damage)
         val improvementName = citadelTile.improvement!!  // guarded by `getUnpillagedImprovement() != null` above
         val improvementIcon = "ImprovementIcons/$improvementName"
         val locations = LocationAction(citadelTile.position, unit.currentTile.position)
@@ -112,18 +113,19 @@ class UnitTurnManager(val unit: MapUnit) {
 
     private fun doTerrainDamage() {
         val tileDamage = unit.getDamageFromTerrain()
-        unit.health -= tileDamage
+        if (tileDamage == 0) return
 
-        if (unit.health <= 0) {
+        MapUnitCombatant(unit).takeDamage(tileDamage)
+
+        if (unit.isDestroyed) {
             unit.civ.addNotification(
                 "Our [${unit.name}] took [$tileDamage] tile damage and was destroyed",
                 unit.currentTile.position,
                 NotificationCategory.Units,
                 unit.name,
                 NotificationIcon.Death
             )
-            unit.destroy()
-        } else if (tileDamage > 0) unit.civ.addNotification(
+        } else unit.civ.addNotification(
             "Our [${unit.name}] took [$tileDamage] tile damage",
             unit.currentTile.position,
             NotificationCategory.Units,