From d075ad01008710109e4b457b5d9cfe306ae8e03c Mon Sep 17 00:00:00 2001 From: yairm210 Date: Tue, 25 Jun 2024 23:58:53 +0300 Subject: [PATCH] Clearer "no damage penalty for wounded units" unique --- core/src/com/unciv/logic/battle/BattleDamage.kt | 1 + core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 839366925c..dc53aa5f88 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -243,6 +243,7 @@ object BattleDamage { private fun getHealthDependantDamageRatio(combatant: ICombatant): Float { return if (combatant !is MapUnitCombatant || combatant.unit.hasUnique(UniqueType.NoDamagePenalty, checkCivInfoUniques = true) + || combatant.unit.hasUnique(UniqueType.NoDamagePenaltyWoundedUnits, checkCivInfoUniques = true) ) 1f // Each 3 points of health reduces damage dealt by 1% else 1 - (100 - combatant.getHealth()) / BattleConstants.DAMAGE_REDUCTION_WOUNDED_UNIT_RATIO_PERCENTAGE diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index eb8567ea48..9dab216dd6 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -407,6 +407,8 @@ enum class UniqueType( NoDefensiveTerrainBonus("No defensive terrain bonus", UniqueTarget.Unit, UniqueTarget.Global), NoDefensiveTerrainPenalty("No defensive terrain penalty", UniqueTarget.Unit, UniqueTarget.Global), + NoDamagePenaltyWoundedUnits("No damage penalty for wounded units", UniqueTarget.Unit, UniqueTarget.Global), + @Deprecated("As of 4.12.4", ReplaceWith("No damage penalty for wounded units")) NoDamagePenalty("Damage is ignored when determining unit Strength", UniqueTarget.Unit, UniqueTarget.Global), Uncapturable("Uncapturable", UniqueTarget.Unit), // Replace with "Withdraws before melee combat "?