diff --git a/core/src/com/unciv/models/ruleset/unique/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt index 02a57e073f..8bb3219b45 100644 --- a/core/src/com/unciv/models/ruleset/unique/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -87,6 +87,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s return when (condition.type) { UniqueType.ConditionalWar -> state.civInfo?.isAtWar() == true UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false + UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true 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 822088f168..de597baaea 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -320,6 +320,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags: RequiresBuildingInAllCities("Requires a [buildingName] in all cities", UniqueTarget.Building), RequiresBuildingInSomeCities("Requires a [buildingName] in at least [amount] cities", UniqueTarget.Building), + @Deprecated("as of 3.19.7", ReplaceWith("[stats] ")) StatsWithResource("[stats] with [resource]", UniqueTarget.Building), @@ -541,6 +542,7 @@ 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),