AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added conditional for exact amount of population in a city

Browse Source
This commit is contained in:
Yair Morgenstern 2024-02-27 16:00:42 +02:00
parent ffeae91b0a
commit 04528696f7
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/models/ruleset/unique/Conditionals.kt
View File

@ -192,6 +192,8 @@ object Conditionals {
checkOnCity { !cityConstructions.containsBuildingOrEquivalent(condition.params[0]) } checkOnCity { !cityConstructions.containsBuildingOrEquivalent(condition.params[0]) }
UniqueType.ConditionalPopulationFilter -> UniqueType.ConditionalPopulationFilter ->
checkOnCity { population.getPopulationFilterAmount(condition.params[1]) >= condition.params[0].toInt() } checkOnCity { population.getPopulationFilterAmount(condition.params[1]) >= condition.params[0].toInt() }
UniqueType.ConditionalExactPopulationFilter ->
checkOnCity { population.getPopulationFilterAmount(condition.params[1]) == condition.params[0].toInt() }
UniqueType.ConditionalWhenGarrisoned -> UniqueType.ConditionalWhenGarrisoned ->
checkOnCity { getCenterTile().militaryUnit?.canGarrison() == true } checkOnCity { getCenterTile().militaryUnit?.canGarrison() == true }

1
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -677,6 +677,7 @@ enum class UniqueType(
ConditionalCityWithBuilding("in cities with a [buildingFilter]", UniqueTarget.Conditional), ConditionalCityWithBuilding("in cities with a [buildingFilter]", UniqueTarget.Conditional),
ConditionalCityWithoutBuilding("in cities without a [buildingFilter]", UniqueTarget.Conditional), ConditionalCityWithoutBuilding("in cities without a [buildingFilter]", UniqueTarget.Conditional),
ConditionalPopulationFilter("in cities with at least [amount] [populationFilter]", 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), ConditionalWhenGarrisoned("with a garrison", UniqueTarget.Conditional),
/////// unit conditionals /////// unit conditionals