wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modOptions propogation now works - mods can get by without having a Barbarians civilization!

Browse source
This commit is contained in:
Yair Morgenstern 2020-04-19 00:24:50 +03:00
parent 745d48c2ae
commit 004bede4bb
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/com/unciv/logic/GameStarter.kt
View file

@ -60,7 +60,7 @@ object GameStarter {
val availableCivNames = Stack<String>()
availableCivNames.addAll(ruleset.nations.filter { !it.value.isCityState() }.keys.shuffled())
availableCivNames.removeAll(newGameParameters.players.map { it.chosenCiv })
availableCivNames.remove(Constants.barbarianEncampment)
availableCivNames.remove(Constants.barbarians)
if(!newGameParameters.noBarbarians && ruleset.modOptions.barbarians!=Constants.disabled) {
val barbarianCivilization = CivilizationInfo(Constants.barbarians)

3
core/src/com/unciv/models/ruleset/Ruleset.kt
View file

@ -209,6 +209,9 @@ object RulesetCache :HashMap<String,Ruleset>() {
for (mod in loadedMods.sortedByDescending { it.modOptions.isBaseRuleset }) {
newRuleset.add(mod)
newRuleset.mods += mod.name
if(mod.modOptions.isBaseRuleset){
newRuleset.modOptions = mod.modOptions
}
}
newRuleset.updateBuildingCosts() // only after we've added all the mods can we calculate the building costs

10
core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt
View file

@ -194,12 +194,14 @@ class NewGameScreenOptionsTable(val newGameScreen: NewGameScreen, val updatePlay
val modRulesets = RulesetCache.filter { it.key!="" }.values
if(modRulesets.isEmpty()) return
fun reloadMods(){
fun reloadMods() {
ruleset.clear()
ruleset.add(RulesetCache.getComplexRuleset(newGameParameters.mods))
ruleset.mods+=newGameParameters.mods
val newRuleset = RulesetCache.getComplexRuleset(newGameParameters.mods)
ruleset.add(newRuleset)
ruleset.mods += newGameParameters.mods
ruleset.modOptions = newRuleset.modOptions
ImageGetter.ruleset=ruleset
ImageGetter.ruleset = ruleset
ImageGetter.setTextureRegionDrawables()
}