From 3388c540d56df83bd892b1979819533364c22692 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 30 Jul 2021 15:15:16 +0300 Subject: [PATCH] Resolved #4676 - one-city-challengers no longer get multiple settlers for later eras --- core/src/com/unciv/logic/GameStarter.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt index 7ebd21d882..ab9bb3df7f 100644 --- a/core/src/com/unciv/logic/GameStarter.kt +++ b/core/src/com/unciv/logic/GameStarter.kt @@ -12,7 +12,6 @@ import com.unciv.models.ruleset.Era import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.tile.ResourceType -import com.unciv.models.ruleset.tile.TileResource import com.unciv.ui.newgamescreen.GameSetupInfo import java.util.* import kotlin.collections.ArrayList @@ -309,13 +308,12 @@ object GameStarter { return civ.getEquivalentUnit(unit).name } - - if (civ.isCityState()) { - // City states should spawn with one settler only irregardless of era and difficulty + // City states & one city challengers should spawn with one settler only regardless of era and difficulty + if (civ.isCityState() || civ.playerType==PlayerType.Human && gameInfo.gameParameters.oneCityChallenge) { val startingSettlers = startingUnits.filter { settlerLikeUnits.contains(it) } startingUnits.clear() - startingUnits.add( startingSettlers.random() ) + startingUnits.add(startingSettlers.random()) } for (unit in startingUnits) {