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

Added 'without resource' conditional (#7611)

Browse Source
This commit is contained in:
Xander Lenstra
2022-08-05 09:16:30 +02:00
committed by GitHub
parent 121859defb
commit 7a749fdec1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
UniqueType.ConditionalWar -> state.civInfo?.isAtWar() == true UniqueType.ConditionalWar -> state.civInfo?.isAtWar() == true
UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false
UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true
UniqueType.ConditionalWithoutResource -> state.civInfo?.hasResource(condition.params[0]) == false
UniqueType.ConditionalHappy -> UniqueType.ConditionalHappy ->
state.civInfo != null && state.civInfo.statsForNextTurn.happiness >= 0 state.civInfo != null && state.civInfo.statsForNextTurn.happiness >= 0
UniqueType.ConditionalBetweenHappiness -> UniqueType.ConditionalBetweenHappiness ->

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

@ -602,7 +602,6 @@ 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),
ConditionalWithResource("with [resource]", 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),
@ -618,7 +617,10 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
ConditionalWhenTech("upon discovering [tech]", UniqueTarget.Conditional), //todo no references anywhere ConditionalWhenTech("upon discovering [tech]", UniqueTarget.Conditional), //todo no references anywhere
ConditionalPolicy("after adopting [policy]", UniqueTarget.Conditional), ConditionalPolicy("after adopting [policy]", UniqueTarget.Conditional),
ConditionalNoPolicy("before adopting [policy]", UniqueTarget.Conditional), ConditionalNoPolicy("before adopting [policy]", UniqueTarget.Conditional),
ConditionalBuildingBuilt("if [buildingName] is constructed", UniqueTarget.Conditional), ConditionalBuildingBuilt("if [buildingName] is constructed", UniqueTarget.Conditional),
ConditionalWithResource("with [resource]", UniqueTarget.Conditional),
ConditionalWithoutResource("without [resource]", UniqueTarget.Conditional),
/////// city conditionals /////// city conditionals
ConditionalCityWithBuilding("in cities with a [buildingFilter]", UniqueTarget.Conditional), ConditionalCityWithBuilding("in cities with a [buildingFilter]", UniqueTarget.Conditional),