From cc8d080b72b6ca817c73ee94d11ae9e81e636a3c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 21 Mar 2023 17:35:45 +0200 Subject: [PATCH] Resolved #8944 - triggered notification text for unit triggers sent correctly --- core/src/com/unciv/logic/battle/Battle.kt | 4 ++-- core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index df24441bea..a18bc442a7 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -376,12 +376,12 @@ object Battle { if (attacker is MapUnitCombatant) for (unique in attacker.unit.getTriggeredUniques(UniqueType.TriggerUponLosingHealth)) if (unique.conditionals.any { it.params[0].toInt() <= defenderDamageDealt }) - UniqueTriggerActivation.triggerUnitwideUnique(unique, attacker.unit, "due to losing [$defenderDamageDealt] HP") + UniqueTriggerActivation.triggerUnitwideUnique(unique, attacker.unit, triggerNotificationText = "due to losing [$defenderDamageDealt] HP") if (defender is MapUnitCombatant) for (unique in defender.unit.getTriggeredUniques(UniqueType.TriggerUponLosingHealth)) if (unique.conditionals.any { it.params[0].toInt() <= attackerDamageDealt }) - UniqueTriggerActivation.triggerUnitwideUnique(unique, defender.unit, "due to losing [$attackerDamageDealt] HP") + UniqueTriggerActivation.triggerUnitwideUnique(unique, defender.unit, triggerNotificationText = "due to losing [$attackerDamageDealt] HP") plunderFromDamage(attacker, defender, attackerDamageDealt) return DamageDealt(attackerDamageDealt, defenderDamageDealt) diff --git a/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt b/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt index 68bb54cea7..6fb14ddb8e 100644 --- a/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt +++ b/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt @@ -91,7 +91,7 @@ class UnitPromotions : IsPartOfGameInfoSerialization { for (unique in promotion.uniqueObjects) if (unique.conditionalsApply(StateForConditionals(civInfo = unit.civ, unit = unit)) && unique.conditionals.none { it.type?.targetTypes?.contains(UniqueTarget.TriggerCondition) == true }) - UniqueTriggerActivation.triggerUnitwideUnique(unique, unit, "due to our [${unit.name}] being promoted") + UniqueTriggerActivation.triggerUnitwideUnique(unique, unit, triggerNotificationText = "due to our [${unit.name}] being promoted") } /** Gets all promotions this unit could currently "buy" with enough [XP]