diff --git a/core/src/com/unciv/models/ruleset/unique/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt index 1441c6110a..10a8c5fb40 100644 --- a/core/src/com/unciv/models/ruleset/unique/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -146,6 +146,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s UniqueType.ConditionalWar -> state.civInfo?.isAtWar() == true UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true + UniqueType.ConditionalWithoutResource -> state.civInfo?.hasResource(condition.params[0]) == false UniqueType.ConditionalHappy -> state.civInfo != null && state.civInfo.statsForNextTurn.happiness >= 0 UniqueType.ConditionalBetweenHappiness -> diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 3deaba3e2b..c51882114e 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -602,7 +602,6 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags: ConditionalWar("when at war", UniqueTarget.Conditional), ConditionalNotWar("when not at war", UniqueTarget.Conditional), ConditionalGoldenAge("during a Golden Age", UniqueTarget.Conditional), - ConditionalWithResource("with [resource]", UniqueTarget.Conditional), ConditionalHappy("while the empire is happy", 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 ConditionalPolicy("after adopting [policy]", UniqueTarget.Conditional), ConditionalNoPolicy("before adopting [policy]", UniqueTarget.Conditional), + ConditionalBuildingBuilt("if [buildingName] is constructed", UniqueTarget.Conditional), + ConditionalWithResource("with [resource]", UniqueTarget.Conditional), + ConditionalWithoutResource("without [resource]", UniqueTarget.Conditional), /////// city conditionals ConditionalCityWithBuilding("in cities with a [buildingFilter]", UniqueTarget.Conditional),