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

Resolved #12350 - 'upon gaining/losing the [promotion] status/promotion' triggers now work correctly

Browse Source
This commit is contained in:
yairm210
2024-10-27 22:34:06 +02:00
parent 927b047c0a
commit c7d51ea38d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/mapunit/MapUnit.kt
View File

@ -1041,7 +1041,7 @@ class MapUnit : IsPartOfGameInfoSerialization {
statuses.add(status) statuses.add(status)
updateUniques() updateUniques()
for (unique in getMatchingUniques(UniqueType.TriggerUponStatusGain)) for (unique in getTriggeredUniques(UniqueType.TriggerUponStatusGain))
if (unique.params[0] == name) if (unique.params[0] == name)
UniqueTriggerActivation.triggerUnique(unique, this) UniqueTriggerActivation.triggerUnique(unique, this)
} }
@ -1052,7 +1052,7 @@ class MapUnit : IsPartOfGameInfoSerialization {
updateUniques() updateUniques()
for (unique in getMatchingUniques(UniqueType.TriggerUponStatusLoss)) for (unique in getTriggeredUniques(UniqueType.TriggerUponStatusLoss))
if (unique.params[0] == name) if (unique.params[0] == name)
UniqueTriggerActivation.triggerUnique(unique, this) UniqueTriggerActivation.triggerUnique(unique, this)
} }

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

@ -76,7 +76,7 @@ class UnitPromotions : IsPartOfGameInfoSerialization {
for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponPromotion)) for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponPromotion))
UniqueTriggerActivation.triggerUnique(unique, unit) UniqueTriggerActivation.triggerUnique(unique, unit)
for (unique in promotion.getMatchingUniques(UniqueType.TriggerUponPromotionGain)) for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponPromotionGain))
if (unique.params[0] == promotionName) if (unique.params[0] == promotionName)
UniqueTriggerActivation.triggerUnique(unique, unit) UniqueTriggerActivation.triggerUnique(unique, unit)
} }
@ -105,7 +105,7 @@ class UnitPromotions : IsPartOfGameInfoSerialization {
unit.updateUniques() unit.updateUniques()
unit.updateVisibleTiles() unit.updateVisibleTiles()
for (unique in unit.getMatchingUniques(UniqueType.TriggerUponPromotionLoss)) for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponPromotionLoss))
if (unique.params[0] == promotionName) if (unique.params[0] == promotionName)
UniqueTriggerActivation.triggerUnique(unique, unit) UniqueTriggerActivation.triggerUnique(unique, unit)
} }