AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 11:34:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add conditional for when you aren't in a golden age (#12844)

Browse Source
This commit is contained in:
SeventhM 2025-01-22 07:38:51 -08:00 committed by GitHub
parent 32856f9956
commit f5ec43b8f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/ruleset/unique/Conditionals.kt
View File

@ -132,6 +132,7 @@ object Conditionals {
UniqueType.ConditionalAboveHappiness -> checkOnCiv { stats.happiness > conditional.params[0].toInt() } UniqueType.ConditionalAboveHappiness -> checkOnCiv { stats.happiness > conditional.params[0].toInt() }
UniqueType.ConditionalBelowHappiness -> checkOnCiv { stats.happiness < conditional.params[0].toInt() } UniqueType.ConditionalBelowHappiness -> checkOnCiv { stats.happiness < conditional.params[0].toInt() }
UniqueType.ConditionalGoldenAge -> checkOnCiv { goldenAges.isGoldenAge() } UniqueType.ConditionalGoldenAge -> checkOnCiv { goldenAges.isGoldenAge() }
UniqueType.ConditionalNotGoldenAge -> checkOnCiv { !goldenAges.isGoldenAge() }
UniqueType.ConditionalBeforeEra -> compareEra(conditional.params[0]) { current, param -> current < param } UniqueType.ConditionalBeforeEra -> compareEra(conditional.params[0]) { current, param -> current < param }
UniqueType.ConditionalStartingFromEra -> compareEra(conditional.params[0]) { current, param -> current >= param } UniqueType.ConditionalStartingFromEra -> compareEra(conditional.params[0]) { current, param -> current >= param }

1
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -682,6 +682,7 @@ enum class UniqueType(
ConditionalWar("when at war", UniqueTarget.Conditional), ConditionalWar("when at war", UniqueTarget.Conditional),
ConditionalNotWar("when not at war", UniqueTarget.Conditional), ConditionalNotWar("when not at war", UniqueTarget.Conditional),
ConditionalGoldenAge("during a Golden Age", 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), ConditionalWLTKD("during We Love The King Day", UniqueTarget.Conditional),
ConditionalHappy("while the empire is happy", UniqueTarget.Conditional), ConditionalHappy("while the empire is happy", UniqueTarget.Conditional),