mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 16:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added conditionals for above and below resource amounts

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-21 23:36:53 +02:00
parent 1276036c64
commit 4beaaadfc8
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,6 +157,10 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false
UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true
UniqueType.ConditionalWithoutResource -> state.civInfo?.hasResource(condition.params[0]) == false UniqueType.ConditionalWithoutResource -> state.civInfo?.hasResource(condition.params[0]) == false
UniqueType.ConditionalWhenAboveAmountResource -> state.civInfo != null
&& state.civInfo.getCivResourcesByName()[condition.params[1]]!! > condition.params[0].toInt()
UniqueType.ConditionalWhenBelowAmountResource -> state.civInfo != null
&& state.civInfo.getCivResourcesByName()[condition.params[1]]!! < condition.params[0].toInt()
UniqueType.ConditionalHappy -> UniqueType.ConditionalHappy ->
state.civInfo != null && state.civInfo.stats.statsForNextTurn.happiness >= 0 state.civInfo != null && state.civInfo.stats.statsForNextTurn.happiness >= 0
UniqueType.ConditionalBetweenHappiness -> UniqueType.ConditionalBetweenHappiness ->

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

@ -613,9 +613,13 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
ConditionalAfterPantheon("after founding a Pantheon", UniqueTarget.Conditional), ConditionalAfterPantheon("after founding a Pantheon", UniqueTarget.Conditional),
ConditionalBuildingBuilt("if [buildingFilter] is constructed", UniqueTarget.Conditional), ConditionalBuildingBuilt("if [buildingFilter] is constructed", UniqueTarget.Conditional),
ConditionalWithResource("with [resource]", UniqueTarget.Conditional), ConditionalWithResource("with [resource]", UniqueTarget.Conditional),
ConditionalWithoutResource("without [resource]", UniqueTarget.Conditional), ConditionalWithoutResource("without [resource]", UniqueTarget.Conditional),
ConditionalWhenAboveAmountResource("when above [amount] [resource]", UniqueTarget.Conditional),
ConditionalWhenBelowAmountResource("when below [amount] [resource]", UniqueTarget.Conditional),
/////// city conditionals /////// city conditionals
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),

10
docs/Modders/uniques.md
View File

@ -1750,6 +1750,16 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Conditional Applicable to: Conditional
??? example "&lt;when above [amount] [resource]&gt;"
Example: "&lt;when above [3] [Iron]&gt;"
Applicable to: Conditional
??? example "&lt;when below [amount] [resource]&gt;"
Example: "&lt;when below [3] [Iron]&gt;"
Applicable to: Conditional
??? example "&lt;in cities with a [buildingFilter]&gt;" ??? example "&lt;in cities with a [buildingFilter]&gt;"
Example: "&lt;in cities with a [Culture]&gt;" Example: "&lt;in cities with a [Culture]&gt;"