mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-10 07:48:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #8944 - triggered notification text for unit triggers sent correctly

Browse Source
This commit is contained in:
Yair Morgenstern
2023-03-21 17:35:45 +02:00
parent 4c694be94b
commit cc8d080b72
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -376,12 +376,12 @@ object Battle {
if (attacker is MapUnitCombatant) if (attacker is MapUnitCombatant)
for (unique in attacker.unit.getTriggeredUniques(UniqueType.TriggerUponLosingHealth)) for (unique in attacker.unit.getTriggeredUniques(UniqueType.TriggerUponLosingHealth))
if (unique.conditionals.any { it.params[0].toInt() <= defenderDamageDealt }) 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) if (defender is MapUnitCombatant)
for (unique in defender.unit.getTriggeredUniques(UniqueType.TriggerUponLosingHealth)) for (unique in defender.unit.getTriggeredUniques(UniqueType.TriggerUponLosingHealth))
if (unique.conditionals.any { it.params[0].toInt() <= attackerDamageDealt }) 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) plunderFromDamage(attacker, defender, attackerDamageDealt)
return DamageDealt(attackerDamageDealt, defenderDamageDealt) return DamageDealt(attackerDamageDealt, defenderDamageDealt)

2
core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt
View File

@ -91,7 +91,7 @@ class UnitPromotions : IsPartOfGameInfoSerialization {
for (unique in promotion.uniqueObjects) for (unique in promotion.uniqueObjects)
if (unique.conditionalsApply(StateForConditionals(civInfo = unit.civ, unit = unit)) if (unique.conditionalsApply(StateForConditionals(civInfo = unit.civ, unit = unit))
&& unique.conditionals.none { it.type?.targetTypes?.contains(UniqueTarget.TriggerCondition) == true }) && 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] /** Gets all promotions this unit could currently "buy" with enough [XP]