From 9b1ca770cbaa46cfce8ea932425ce9bbcc5dd68d Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 19 Apr 2020 09:16:19 +0300 Subject: [PATCH] We don't need a special parameter for 'no barbarians'... since we can jut not include barbarians in the Nations to begin with... Obviously --- core/src/com/unciv/logic/GameStarter.kt | 2 +- core/src/com/unciv/models/ruleset/Ruleset.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt index 4c81e523f7..208834e10f 100644 --- a/core/src/com/unciv/logic/GameStarter.kt +++ b/core/src/com/unciv/logic/GameStarter.kt @@ -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) } diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt index 6994a69a25..f22098e1fe 100644 --- a/core/src/com/unciv/models/ruleset/Ruleset.kt +++ b/core/src/com/unciv/models/ruleset/Ruleset.kt @@ -17,7 +17,6 @@ import kotlin.collections.set class ModOptions { var isBaseRuleset = false - var barbarians = Constants.enabled var techsToRemove = HashSet() var buildingsToRemove = HashSet() var unitsToRemove = HashSet()