mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-15 04:14:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Actually implemented nation filter conditional

Browse Source
This commit is contained in:
Yair Morgenstern 2023-04-09 10:27:29 +03:00
parent 892a1bc4cc
commit 29c647e0f7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
UniqueType.ConditionalChance -> stateBasedRandom.nextFloat() < condition.params[0].toFloat() / 100f
UniqueType.ConditionalNationFilter -> state.civInfo?.nation?.matchesFilter(condition.params[0]) == true
UniqueType.ConditionalWar -> state.civInfo?.isAtWar() == true
UniqueType.ConditionalNotWar -> state.civInfo?.isAtWar() == false
UniqueType.ConditionalWithResource -> state.civInfo?.hasResource(condition.params[0]) == true

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

@ -628,7 +628,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
/////// civ conditionals
ConditionalCivFilter("for [nationFilter]", UniqueTarget.Conditional),
ConditionalNationFilter("for [nationFilter]", UniqueTarget.Conditional),
ConditionalWar("when at war", UniqueTarget.Conditional),
ConditionalNotWar("when not at war", UniqueTarget.Conditional),
ConditionalGoldenAge("during a Golden Age", UniqueTarget.Conditional),