diff --git a/core/src/com/unciv/GameStarter.kt b/core/src/com/unciv/GameStarter.kt index 7a5e97f410..544841fe94 100644 --- a/core/src/com/unciv/GameStarter.kt +++ b/core/src/com/unciv/GameStarter.kt @@ -52,7 +52,7 @@ class GameStarter(){ } fun getStartingLocations(numberOfPlayers:Int,tileMap: TileMap): Stack { - for(minimumDistanceBetweenStartingLocations in 7 downTo 1){ + for(minimumDistanceBetweenStartingLocations in 7 downTo 0){ val freeTiles = tileMap.values .filter { it.isLand() && vectorIsWithinNTilesOfEdge(it.position,3,tileMap)} .toMutableList() diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index c6b7751754..dc4a2f51d7 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -329,7 +329,8 @@ class MapUnit { city.population.autoAssignPopulation() civInfo.addNotification("We have found survivors the ruins - population added to ["+city.name+"]",city.location, Color.GREEN) } - val researchableAncientEraTechs = GameBasics.Technologies.values.filter { civInfo.tech.canBeResearched(it.name)} + val researchableAncientEraTechs = GameBasics.Technologies.values + .filter { !civInfo.tech.isResearched(it.name) && civInfo.tech.canBeResearched(it.name)} if(researchableAncientEraTechs.isNotEmpty()) actions.add { val tech = researchableAncientEraTechs.getRandom().name diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index c5e5ef7cfe..70cf636126 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -79,7 +79,8 @@ open class TileInfo { fun getHeight(): Int { var height = 0 if (listOf("Forest", "Jungle").contains(terrainFeature)) height += 1 - if ("Hill" == baseTerrain) height += 2 + if (baseTerrain == "Hill") height += 2 + if(baseTerrain=="Mountain") height = 4 return height }