diff --git a/core/src/com/unciv/models/ruleset/unique/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt index ebd3317464..0589e5a823 100644 --- a/core/src/com/unciv/models/ruleset/unique/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -83,6 +83,10 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s || (state.unit != null && state.unit.matchesFilter(condition.params[0])) UniqueType.ConditionalAttacking -> state.combatAction == CombatAction.Attack UniqueType.ConditionalDefending -> state.combatAction == CombatAction.Defend + UniqueType.ConditionalAboveHP -> + state.ourCombatant != null && state.ourCombatant.getHealth() > condition.params[0].toInt() + UniqueType.ConditionalBelowHP -> + state.ourCombatant != null && state.ourCombatant.getHealth() < condition.params[0].toInt() UniqueType.ConditionalInTiles -> state.attackedTile != null && state.attackedTile.matchesFilter(condition.params[0]) UniqueType.ConditionalVsLargerCiv -> { diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 9ecaf05455..b9429ab4f3 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -433,6 +433,8 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget, val flags: ConditionalDefending("when defending", UniqueTarget.Conditional), ConditionalInTiles("when fighting in [tileFilter] tiles", UniqueTarget.Conditional), ConditionalForeignContinent("on foreign continents", UniqueTarget.Conditional), + ConditionalAboveHP("when above [amount] HP", UniqueTarget.Conditional), + ConditionalBelowHP("when below [amount] HP", UniqueTarget.Conditional), /////// tile conditionals ConditionalNeighborTiles("with [amount] to [amount] neighboring [tileFilter] tiles", UniqueTarget.Conditional), diff --git a/core/src/com/unciv/models/translations/Translations.kt b/core/src/com/unciv/models/translations/Translations.kt index 2505e26a1b..765251d69e 100644 --- a/core/src/com/unciv/models/translations/Translations.kt +++ b/core/src/com/unciv/models/translations/Translations.kt @@ -213,7 +213,7 @@ class Translations : LinkedHashMap(){ // Whenever this string is changed, it should also be changed in the translation files! // It is mostly used as the template for translating the order of conditionals const val englishConditionalOrderingString = - " " + " " const val conditionalUniqueOrderString = "ConditionalsPlacement" const val shouldCapitalizeString = "StartWithCapitalLetter" }