From 45db7ade2eb78af4b871fcada5c2b892a917550e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 27 Sep 2023 23:25:53 +0300 Subject: [PATCH] isTriggerable fixed to reinclude timed uniques --- core/src/com/unciv/models/ruleset/unique/Unique.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/ruleset/unique/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt index 70c4a1ceb6..7a1a7ea57c 100644 --- a/core/src/com/unciv/models/ruleset/unique/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -33,7 +33,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s val isTriggerable = type != null && ( type.targetTypes.contains(UniqueTarget.Triggerable) || type.targetTypes.contains(UniqueTarget.UnitTriggerable) - // in effect makes any unique become a triggerable unique + || conditionals.any { it.type == UniqueType.ConditionalTimedUnique } ) val allParams = params + conditionals.flatMap { it.params }