mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 05:41:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added a conditional for WLTKD (#7830)

Browse Source
This commit is contained in:
Xander Lenstra
2022-09-23 07:34:47 +02:00
committed by GitHub
parent 77a1f4a6c1
commit 14d253fe24
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/models/ruleset/GlobalUniques.kt
View File

@ -17,8 +17,9 @@ class GlobalUniques: RulesetObject() {
UniqueType.ConditionalGoldenAge -> "Golden Age" UniqueType.ConditionalGoldenAge -> "Golden Age"
UniqueType.ConditionalHappy -> "Happiness" UniqueType.ConditionalHappy -> "Happiness"
UniqueType.ConditionalBetweenHappiness, UniqueType.ConditionalBelowHappiness -> "Unhappiness" UniqueType.ConditionalBetweenHappiness, UniqueType.ConditionalBelowHappiness -> "Unhappiness"
UniqueType.ConditionalWLTKD -> "We Love The King Day"
else -> "Global Effect" else -> "Global Effect"
} }
} }
} }
} }

2
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -157,6 +157,8 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
state.civInfo != null && state.civInfo.happinessForNextTurn < condition.params[0].toInt() state.civInfo != null && state.civInfo.happinessForNextTurn < condition.params[0].toInt()
UniqueType.ConditionalGoldenAge -> UniqueType.ConditionalGoldenAge ->
state.civInfo != null && state.civInfo.goldenAges.isGoldenAge() state.civInfo != null && state.civInfo.goldenAges.isGoldenAge()
UniqueType.ConditionalWLTKD ->
state.cityInfo != null && state.cityInfo.isWeLoveTheKingDayActive()
UniqueType.ConditionalBeforeEra -> UniqueType.ConditionalBeforeEra ->
state.civInfo != null && state.civInfo.getEraNumber() < ruleset().eras[condition.params[0]]!!.eraNumber state.civInfo != null && state.civInfo.getEraNumber() < ruleset().eras[condition.params[0]]!!.eraNumber
UniqueType.ConditionalStartingFromEra -> UniqueType.ConditionalStartingFromEra ->

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

@ -602,6 +602,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
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),
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),
ConditionalBetweenHappiness("when between [amount] and [amount] Happiness", UniqueTarget.Conditional), ConditionalBetweenHappiness("when between [amount] and [amount] Happiness", UniqueTarget.Conditional),