mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 09:18:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Starting locations work again =)

Browse Source
This commit is contained in:
Yair Morgenstern
2020-03-07 23:06:34 +02:00
parent 58f7e06b72
commit db6031da82
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,11 +91,6 @@ class GameStarter {
gameInfo.civilizations.add(civ) gameInfo.civilizations.add(civ)
} }
// remove starting locations one we're done
for(tile in gameInfo.tileMap.values){
if(tile.improvement!=null && tile.improvement!!.startsWith("StartingLocation "))
tile.improvement=null
}
} }
private fun addCivStartingUnits(gameInfo: GameInfo) { private fun addCivStartingUnits(gameInfo: GameInfo) {
@ -104,6 +99,12 @@ class GameStarter {
gameInfo.civilizations.filter { !it.isBarbarian() }, gameInfo.civilizations.filter { !it.isBarbarian() },
gameInfo.tileMap) gameInfo.tileMap)
// remove starting locations one we're done
for(tile in gameInfo.tileMap.values){
if(tile.improvement!=null && tile.improvement!!.startsWith("StartingLocation "))
tile.improvement=null
}
// For later starting eras, or for civs like Polynesia with a different Warrior, we need different starting units // For later starting eras, or for civs like Polynesia with a different Warrior, we need different starting units
fun getWarriorEquivalent(civ: CivilizationInfo): String { fun getWarriorEquivalent(civ: CivilizationInfo): String {
val availableMilitaryUnits = gameInfo.ruleSet.units.values.filter { val availableMilitaryUnits = gameInfo.ruleSet.units.values.filter {
@ -127,6 +128,7 @@ class GameStarter {
} }
} }
} }
} }
private fun getStartingLocations(civs:List<CivilizationInfo>, tileMap: TileMap): HashMap<CivilizationInfo, TileInfo> { private fun getStartingLocations(civs:List<CivilizationInfo>, tileMap: TileMap): HashMap<CivilizationInfo, TileInfo> {