From f5ec43b8f2cafb0a562fae1ee8e27d357398dcef Mon Sep 17 00:00:00 2001 From: SeventhM <127357473+SeventhM@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:38:51 -0800 Subject: [PATCH] Add conditional for when you aren't in a golden age (#12844) --- core/src/com/unciv/models/ruleset/unique/Conditionals.kt | 1 + core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt index 0aa30e15f9fd4..30c436494e60c 100644 --- a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt +++ b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt @@ -132,6 +132,7 @@ object Conditionals { UniqueType.ConditionalAboveHappiness -> checkOnCiv { stats.happiness > conditional.params[0].toInt() } UniqueType.ConditionalBelowHappiness -> checkOnCiv { stats.happiness < conditional.params[0].toInt() } UniqueType.ConditionalGoldenAge -> checkOnCiv { goldenAges.isGoldenAge() } + UniqueType.ConditionalNotGoldenAge -> checkOnCiv { !goldenAges.isGoldenAge() } UniqueType.ConditionalBeforeEra -> compareEra(conditional.params[0]) { current, param -> current < param } UniqueType.ConditionalStartingFromEra -> compareEra(conditional.params[0]) { current, param -> current >= param } diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index b0c8c55b49035..50fccfc53657e 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -682,6 +682,7 @@ enum class UniqueType( ConditionalWar("when at war", UniqueTarget.Conditional), ConditionalNotWar("when not at war", UniqueTarget.Conditional), ConditionalGoldenAge("during a Golden Age", UniqueTarget.Conditional), + ConditionalNotGoldenAge("when not in a Golden Age", UniqueTarget.Conditional), ConditionalWLTKD("during We Love The King Day", UniqueTarget.Conditional), ConditionalHappy("while the empire is happy", UniqueTarget.Conditional),