mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 23:37:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #4676 - one-city-challengers no longer get multiple settlers for later eras

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-30 15:15:16 +03:00
parent 71df35622f
commit 3388c540d5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/GameStarter.kt
View File

@ -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) {