From 06a675c44fa86236cbc3a7c0807c4aaef792aa7d Mon Sep 17 00:00:00 2001 From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:05:31 +0100 Subject: [PATCH] More city filters (#11253) --- core/src/com/unciv/logic/city/City.kt | 2 ++ .../com/unciv/models/ruleset/unique/UniqueParameterType.kt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/city/City.kt b/core/src/com/unciv/logic/city/City.kt index 854fe1dc2c..bfe9cb7937 100644 --- a/core/src/com/unciv/logic/city/City.kt +++ b/core/src/com/unciv/logic/city/City.kt @@ -432,6 +432,8 @@ class City : IsPartOfGameInfoSerialization { "in foreign cities", "Foreign" -> viewingCiv != null && viewingCiv != civ "in annexed cities", "Annexed" -> foundingCiv != civ.civName && !isPuppet "in puppeted cities", "Puppeted" -> isPuppet + "in resisting cities", "Resisting" -> isInResistance() + "in cities being razed", "Razing" -> isBeingRazed "in holy cities", "Holy" -> isHolyCity() "in City-State cities" -> civ.isCityState() // This is only used in communication to the user indicating that only in cities with this diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index 8ce4bf70e4..1fbf5c3a4e 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -255,6 +255,8 @@ enum class UniqueParameterType( "in foreign cities", "Foreign", "in annexed cities", "Annexed", "in puppeted cities", "Puppeted", + "in resisting cities", "Resisting", + "in cities being razed", "Razing", "in holy cities", "Holy", "in City-State cities", "in cities following this religion", @@ -394,7 +396,7 @@ enum class UniqueParameterType( /** Used for region definitions, can be a terrain type with region unique, or "Hybrid" * - * See also: [UniqueType.ConditionalInRegionOfType], [UniqueType.ConditionalInRegionExceptOfType], [MapRegions][com.unciv.logic.map.mapgenerator.MapRegions] */ + * See also: [UniqueType.ConditionalInRegionOfType], [UniqueType.ConditionalInRegionExceptOfType], [MapRegions][com.unciv.logic.map.mapgenerator.mapregions.MapRegions] */ RegionType("regionType", "Hybrid", null, "Region Types") { private val knownValues = setOf("Hybrid") override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):