diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index dcc2bf8996..d4cfce1359 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -406,6 +406,13 @@ enum class UniqueParameterType( } }, + StockpiledResource("stockpiledResource", "StockpiledResource", "The name of any stockpiled") { + override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): + UniqueType.UniqueComplianceErrorSeverity? = if (parameterText in ruleset.tileResources && ruleset.tileResources[parameterText]!!.isStockpiled()) null + else UniqueType.UniqueComplianceErrorSeverity.RulesetSpecific + }, + + /** Used by [UniqueType.FreeExtraBeliefs], see ReligionManager.getBeliefsToChooseAt* functions */ BeliefTypeName("beliefType", "Follower", "'Pantheon', 'Follower', 'Founder' or 'Enhancer'") { override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 58afb1ba29..29e146e4f3 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -155,8 +155,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags: ConsumesResources("Consumes [amount] [resource]", UniqueTarget.Improvement, UniqueTarget.Building, UniqueTarget.Unit), ProvidesResources("Provides [amount] [resource]", UniqueTarget.Improvement, UniqueTarget.Global), - /** For stockpiled resources */ - CostsResources("Costs [amount] [resource]", UniqueTarget.Improvement, UniqueTarget.Building, UniqueTarget.Unit), + CostsResources("Costs [amount] [stockpiledResource]", UniqueTarget.Improvement, UniqueTarget.Building, UniqueTarget.Unit), GrowthPercentBonus("[relativeAmount]% growth [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), CarryOverFood("[relativeAmount]% Food is carried over after population increases [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), @@ -730,10 +729,8 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags: OneTimeFreeBelief("Gain a free [beliefType] belief", UniqueTarget.Triggerable), OneTimeTriggerVoting("Triggers voting for the Diplomatic Victory", UniqueTarget.Triggerable), // used in Building - /** For stockpiled resources */ - OneTimeConsumeResources("Instantly consumes [amount] [resource]", UniqueTarget.Triggerable), - /** For stockpiled resources */ - OneTimeProvideResources("Instantly provides [amount] [resource]", UniqueTarget.Triggerable), + OneTimeConsumeResources("Instantly consumes [amount] [stockpiledResource]", UniqueTarget.Triggerable), + OneTimeProvideResources("Instantly provides [amount] [stockpiledResource]", UniqueTarget.Triggerable), OneTimeGainStat("Gain [amount] [stat/resource]", UniqueTarget.Triggerable), OneTimeGainStatRange("Gain [amount]-[amount] [stat]", UniqueTarget.Triggerable),