mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-19 08:47:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #9501 - badly configured era conditional no longer causes crashes

Browse Source
This commit is contained in:
Yair Morgenstern 2023-06-03 22:42:36 +03:00
parent b3e2faed71
commit 9bbd3b416e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,11 +176,14 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
UniqueType.ConditionalWLTKD ->
state.city != null && state.city.isWeLoveTheKingDayActive()
UniqueType.ConditionalBeforeEra ->
state.civInfo != null && state.civInfo.getEraNumber() < ruleset().eras[condition.params[0]]!!.eraNumber
state.civInfo != null && ruleset().eras.containsKey(condition.params[0])
&& state.civInfo.getEraNumber() < ruleset().eras[condition.params[0]]!!.eraNumber
UniqueType.ConditionalStartingFromEra ->
state.civInfo != null && state.civInfo.getEraNumber() >= ruleset().eras[condition.params[0]]!!.eraNumber
state.civInfo != null && ruleset().eras.containsKey(condition.params[0])
&& state.civInfo.getEraNumber() >= ruleset().eras[condition.params[0]]!!.eraNumber
UniqueType.ConditionalDuringEra ->
state.civInfo != null && state.civInfo.getEraNumber() == ruleset().eras[condition.params[0]]!!.eraNumber
state.civInfo != null && ruleset().eras.containsKey(condition.params[0])
&& state.civInfo.getEraNumber() == ruleset().eras[condition.params[0]]!!.eraNumber
UniqueType.ConditionalIfStartingInEra ->
state.civInfo != null && state.civInfo.gameInfo.gameParameters.startingEra == condition.params[0]
UniqueType.ConditionalTech ->