From ae01a80a9de84b9598ef311d5c7ae321f5cf1f96 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 23 Feb 2025 22:44:18 +0200 Subject: [PATCH] Resolved #12991 - "upon gaining the [promotion] promotion" activates when gaining the promotion for free as well as during promotion --- core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt b/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt index e4ca5f8cca..f05a823f85 100644 --- a/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt +++ b/core/src/com/unciv/logic/map/mapunit/UnitPromotions.kt @@ -75,11 +75,11 @@ class UnitPromotions : IsPartOfGameInfoSerialization { for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponPromotion)) UniqueTriggerActivation.triggerUnique(unique, unit) - - for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponPromotionGain){ it.params[0] == promotionName }) - UniqueTriggerActivation.triggerUnique(unique, unit) } + for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponPromotionGain){ it.params[0] == promotionName }) + UniqueTriggerActivation.triggerUnique(unique, unit) + if (!promotion.hasUnique(UniqueType.SkipPromotion)) promotions.add(promotionName)