Skip to content

Commit

Permalink
Add conditional for when you aren't in a golden age (#12844)
Browse files Browse the repository at this point in the history
  • Loading branch information
SeventhM authored Jan 22, 2025
1 parent 32856f9 commit f5ec43b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions core/src/com/unciv/models/ruleset/unique/Conditionals.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
1 change: 1 addition & 0 deletions core/src/com/unciv/models/ruleset/unique/UniqueType.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit f5ec43b

Please sign in to comment.