From 04528696f7acab3364d8202760386d6a09e041a5 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 27 Feb 2024 16:00:42 +0200 Subject: [PATCH] Added conditional for exact amount of population in a city --- core/src/com/unciv/models/ruleset/unique/Conditionals.kt | 2 ++ core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 1 + 2 files changed, 3 insertions(+) diff --git a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt index c19df380ee..23e6c7d8b0 100644 --- a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt +++ b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt @@ -192,6 +192,8 @@ object Conditionals { checkOnCity { !cityConstructions.containsBuildingOrEquivalent(condition.params[0]) } UniqueType.ConditionalPopulationFilter -> checkOnCity { population.getPopulationFilterAmount(condition.params[1]) >= condition.params[0].toInt() } + UniqueType.ConditionalExactPopulationFilter -> + checkOnCity { population.getPopulationFilterAmount(condition.params[1]) == condition.params[0].toInt() } UniqueType.ConditionalWhenGarrisoned -> checkOnCity { getCenterTile().militaryUnit?.canGarrison() == true } diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index cb1f94594e..e1258657d0 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -677,6 +677,7 @@ enum class UniqueType( ConditionalCityWithBuilding("in cities with a [buildingFilter]", UniqueTarget.Conditional), ConditionalCityWithoutBuilding("in cities without a [buildingFilter]", UniqueTarget.Conditional), ConditionalPopulationFilter("in cities with at least [amount] [populationFilter]", UniqueTarget.Conditional), + ConditionalExactPopulationFilter("in cities with [amount] [populationFilter]", UniqueTarget.Conditional), ConditionalWhenGarrisoned("with a garrison", UniqueTarget.Conditional), /////// unit conditionals