AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 23:10:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed base ruleset mods (#3078)

Browse Source 
oldBaseRuleset mod will be removed from gameParameters before adding selected one
This commit is contained in:
HadeanLake 2020-09-02 13:18:51 +03:00 committed by GitHub
parent 0335b3ba46
commit 0e71da82d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt
View File

@ -191,7 +191,13 @@ class GameOptionsTable(val previousScreen: IPreviousScreen, val updatePlayerPick
checkBox.isDisabled = locked checkBox.isDisabled = locked
if (mod.name in gameParameters.mods) checkBox.isChecked = true if (mod.name in gameParameters.mods) checkBox.isChecked = true
checkBox.onChange { checkBox.onChange {
if (checkBox.isChecked) gameParameters.mods.add(mod.name) if (checkBox.isChecked) {
if (mod.modOptions.isBaseRuleset)
for (oldBaseRuleset in gameParameters.mods)
if (modRulesets.firstOrNull { it.name == oldBaseRuleset }?.modOptions?.isBaseRuleset == true)
gameParameters.mods.remove(oldBaseRuleset)
gameParameters.mods.add(mod.name)
}
else gameParameters.mods.remove(mod.name) else gameParameters.mods.remove(mod.name)
reloadRuleset() reloadRuleset()
update() update()
@ -201,10 +207,6 @@ class GameOptionsTable(val previousScreen: IPreviousScreen, val updatePlayerPick
if (modNations != null && modNations.size > 0) { if (modNations != null && modNations.size > 0) {
desiredCiv = modNations.keys.first() desiredCiv = modNations.keys.first()
} }
if (mod.modOptions.isBaseRuleset)
for (oldBaseRuleset in gameParameters.mods)
if (modRulesets.firstOrNull { it.name == oldBaseRuleset }?.modOptions?.isBaseRuleset == true)
gameParameters.mods.remove(oldBaseRuleset)
} }
updatePlayerPickerTable(desiredCiv) updatePlayerPickerTable(desiredCiv)
} }