From 29c647e0f79c87237e1a1533f17b9950d30c0305 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 9 Apr 2023 10:27:29 +0300 Subject: [PATCH] Actually implemented nation filter conditional --- core/src/com/unciv/models/ruleset/unique/Unique.kt | 1 + core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 2 +- 2 files changed, 2 insertions(+), 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 41f0a6fa3b..280e145342 100644 --- a/core/src/com/unciv/models/ruleset/unique/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -152,6 +152,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s UniqueType.ConditionalChance -> stateBasedRandom.nextFloat() < condition.params[0].toFloat() / 100f + UniqueType.ConditionalNationFilter -> state.civInfo?.nation?.matchesFilter(condition.params[0]) == true UniqueType.ConditionalWar -> state.civInfo?.isAtWar() == true UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 71653bdc68..a88376bf20 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -628,7 +628,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags: /////// civ conditionals - ConditionalCivFilter("for [nationFilter]", UniqueTarget.Conditional), + ConditionalNationFilter("for [nationFilter]", UniqueTarget.Conditional), ConditionalWar("when at war", UniqueTarget.Conditional), ConditionalNotWar("when not at war", UniqueTarget.Conditional), ConditionalGoldenAge("during a Golden Age", UniqueTarget.Conditional),