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

Civs never start out on snow (might as well start over...)

Browse source
This commit is contained in:
Yair Morgenstern 2020-04-17 18:03:50 +03:00
parent a3843450bf
commit 75b11a0a9a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ object GameStarter {
else availableCivNames.pop()
val playerCiv = CivilizationInfo(nationName)
for(tech in ruleset.technologies.values.filter { it.uniques.contains("Starting tech") })
for (tech in ruleset.technologies.values.filter { it.uniques.contains("Starting tech") })
playerCiv.tech.techsResearched.add(tech.name) // can't be .addTechnology because the civInfo isn't assigned yet
playerCiv.playerType = player.playerType
playerCiv.playerId = player.playerId
@ -92,7 +92,6 @@ object GameStarter {
val civ = CivilizationInfo(cityStateName)
gameInfo.civilizations.add(civ)
}
}
private fun addCivStartingUnits(gameInfo: GameInfo) {
@ -139,7 +138,8 @@ object GameStarter {
private fun getStartingLocations(civs: List<CivilizationInfo>, tileMap: TileMap): HashMap<CivilizationInfo, TileInfo> {
var landTiles = tileMap.values
.filter { it.isLand && !it.getBaseTerrain().impassable }
// Games starting on snow might as well start over...
.filter { it.isLand && !it.getBaseTerrain().impassable && it.baseTerrain!=Constants.snow }
val landTilesInBigEnoughGroup = ArrayList<TileInfo>()
while (landTiles.any()) {