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

Added check for multiple policies with the same name - unlike techs buildings etc, these are also saved in the *policy branch* and so can affect gameplay

Browse Source
This commit is contained in:
Yair Morgenstern
2022-03-28 16:43:04 +03:00
parent 892fc1f936
commit 52f797c8e3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -745,6 +745,10 @@ class Ruleset {
lines += "${policy.name} requires policy $prereq which does not exist!" lines += "${policy.name} requires policy $prereq which does not exist!"
checkUniques(policy, lines, rulesetSpecific, forOptionsPopup) checkUniques(policy, lines, rulesetSpecific, forOptionsPopup)
} }
for (policy in policyBranches.values.flatMap { it.policies + it })
if (policy != policies[policy.name])
lines += "More than one policy with the name ${policy.name} exists!"
for (reward in ruinRewards.values) { for (reward in ruinRewards.values) {
for (difficulty in reward.excludedDifficulties) for (difficulty in reward.excludedDifficulties)
@ -870,7 +874,8 @@ object RulesetCache : HashMap<String,Ruleset>() {
val newRuleset = Ruleset() val newRuleset = Ruleset()
val baseRuleset = val baseRuleset =
if (containsKey(optionalBaseRuleset) && this[optionalBaseRuleset]!!.modOptions.isBaseRuleset) this[optionalBaseRuleset]!! if (containsKey(optionalBaseRuleset) && this[optionalBaseRuleset]!!.modOptions.isBaseRuleset)
this[optionalBaseRuleset]!!
else getVanillaRuleset() else getVanillaRuleset()