diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 2706dc48af..0f7f7b0088 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -265,7 +265,7 @@ object Battle { for (unique in plunderingUnit.unit.getMatchingUniques(UniqueType.DamageUnitsPlunder, checkCivInfoUniques = true)) { if (plunderedUnit.matchesCategory(unique.params[1])) { val percentage = unique.params[0].toFloat() - plunderedGoods.add(Stat.valueOf(unique.params[2]), percentage / 100f * min(damageDealt,100)) + plunderedGoods.add(Stat.valueOf(unique.params[2]), percentage / 100f * damageDealt) } } diff --git a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt index 931ac3736c..6a97aedf4d 100644 --- a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt +++ b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt @@ -25,7 +25,8 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant { override fun takeDamage(damage: Int) { unit.health -= damage - if(isDefeated()) unit.destroy() + if (unit.health < 0) unit.health = 0 + if (isDefeated()) unit.destroy() } override fun getAttackingStrength(): Int {