From fa2c5f7cde21759e3a606c1a9d22f53e1272cfd6 Mon Sep 17 00:00:00 2001 From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com> Date: Tue, 17 May 2022 17:43:20 +0200 Subject: [PATCH] Added 'in puppeted cities' cityFilter (#6843) * Added 'in puppetted cities' cityFilter * Added to list of unique parameters --- core/src/com/unciv/logic/city/CityInfo.kt | 1 + core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 60fca92734..cc3cc72a7a 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -858,6 +858,7 @@ class CityInfo { && !civInfo.isAtWarWith(viewingCiv) "in foreign cities" -> viewingCiv != civInfo "in annexed cities" -> foundingCiv != civInfo.civName && !isPuppet + "in puppeted cities" -> isPuppet "in holy cities" -> religion.religionThisIsTheHolyCityOf != null "in City-State cities" -> civInfo.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 063a717939..3f3509371f 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -188,6 +188,7 @@ enum class UniqueParameterType( "in non-enemy foreign cities", "in foreign cities", "in annexed cities", + "in puppeted cities", "in holy cities", "in City-State cities", "in cities following this religion",