From 6633db330eeab05ea0351f062959a5bff56af398 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Fri, 2 May 2025 11:59:24 +0300 Subject: [PATCH] Validation catches 'global triggers attached to unit triggerables', which will have no effect --- core/src/com/unciv/models/ruleset/unique/UniqueTarget.kt | 2 +- core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTarget.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTarget.kt index f7eddb0bc3..f5541a12d8 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueTarget.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTarget.kt @@ -64,7 +64,7 @@ enum class UniqueTarget( // Modifiers Conditional("Modifiers that can be added to other uniques to limit when they will be active", modifierType = ModifierType.Conditional), TriggerCondition("Special conditionals that can be added to Triggerable uniques, to make them activate upon specific actions.", inheritsFrom = Global, modifierType = ModifierType.Other), - UnitTriggerCondition("Special conditionals that can be added to UnitTriggerable uniques, to make them activate upon specific actions.", inheritsFrom = TriggerCondition, modifierType = ModifierType.Other), + UnitTriggerCondition("Special conditionals that can be added to UnitTriggerable uniques, to make them activate upon specific actions.", inheritsFrom = Global, modifierType = ModifierType.Other), UnitActionModifier("Modifiers that can be added to UnitAction uniques as conditionals", modifierType = ModifierType.Other), MetaModifier("Modifiers that can be added to other uniques changing user experience, not their behavior", modifierType = ModifierType.Other), ; diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 73125ea141..d14bf3798d 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -903,8 +903,8 @@ enum class UniqueType( // We have a separate trigger to include the cityFilter, since '[in all cities]' can be read '*only* if it's in all cities' TriggerUponConstructingBuildingCityFilter("upon constructing [buildingFilter] [cityFilter]", UniqueTarget.TriggerCondition), TriggerUponGainingUnit("upon gaining a [baseUnitFilter] unit", UniqueTarget.TriggerCondition), - TriggerUponTurnEnd("upon turn end", UniqueTarget.TriggerCondition), - TriggerUponTurnStart("upon turn start", UniqueTarget.TriggerCondition), + TriggerUponTurnEnd("upon turn end", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition), + TriggerUponTurnStart("upon turn start", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition), TriggerUponFoundingPantheon("upon founding a Pantheon", UniqueTarget.TriggerCondition), TriggerUponFoundingReligion("upon founding a Religion", UniqueTarget.TriggerCondition),