mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-31 23:29:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add two population-related conditional uniques (#12258)

Browse Source 
* Added the Conditional Below Population

* Added the Conditional Between Population
This commit is contained in:
PLynx
2024-10-06 15:46:34 +02:00
committed by GitHub
parent 7fbd8a194b
commit 5d1c05d8e4
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,6 +195,10 @@ object Conditionals {
checkOnCity { population.getPopulationFilterAmount(conditional.params[1]) >= conditional.params[0].toInt() }
UniqueType.ConditionalExactPopulationFilter ->
checkOnCity { population.getPopulationFilterAmount(conditional.params[1]) == conditional.params[0].toInt() }
UniqueType.ConditionalBetweenPopulationFilter ->
checkOnCity {population.getPopulationFilterAmount(conditional.params[2]) in conditional.params[0].toInt()..conditional.params[1].toInt() }
UniqueType.ConditionalBelowPopulationFilter ->
checkOnCity { population.getPopulationFilterAmount(conditional.params[1]) < conditional.params[0].toInt() }
UniqueType.ConditionalWhenGarrisoned ->
checkOnCity { getCenterTile().militaryUnit?.canGarrison() == true }

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

@ -729,6 +729,8 @@ enum class UniqueType(
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),
ConditionalBetweenPopulationFilter("in cities with between [amount] and [amount] [populationFilter]", UniqueTarget.Conditional),
ConditionalBelowPopulationFilter("in cities with less than [amount] [populationFilter]", UniqueTarget.Conditional),
ConditionalWhenGarrisoned("with a garrison", UniqueTarget.Conditional),
/////// unit conditionals