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

We don't need a special parameter for 'no barbarians'... since we can jut not include barbarians in the Nations to begin with...

Browse source 
Obviously
This commit is contained in:
Yair Morgenstern 2020-04-19 09:16:19 +03:00
parent 004bede4bb
commit 9b1ca770cb
2 changed files with 1 additions and 2 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

@ -62,7 +62,7 @@ object GameStarter {
availableCivNames.removeAll(newGameParameters.players.map { it.chosenCiv })
availableCivNames.remove(Constants.barbarians)
if(!newGameParameters.noBarbarians && ruleset.modOptions.barbarians!=Constants.disabled) {
if(!newGameParameters.noBarbarians && ruleset.nations.containsKey(Constants.barbarians)) {
val barbarianCivilization = CivilizationInfo(Constants.barbarians)
gameInfo.civilizations.add(barbarianCivilization)
}

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

@ -17,7 +17,6 @@ import kotlin.collections.set
class ModOptions {
var isBaseRuleset = false
var barbarians = Constants.enabled
var techsToRemove = HashSet<String>()
var buildingsToRemove = HashSet<String>()
var unitsToRemove = HashSet<String>()