From d828fdaeca43fc2a5972402d862da0683ea0f4ba Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 3 May 2020 21:45:23 +0300
Subject: [PATCH] Maps no longer spawn ancient ruins in immediate vicinity of
 civ spawns

---
 core/src/com/unciv/logic/GameStarter.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt
index 19d055d73e..7242ac2558 100644
--- a/core/src/com/unciv/logic/GameStarter.kt
+++ b/core/src/com/unciv/logic/GameStarter.kt
@@ -129,10 +129,11 @@ object GameStarter {
 
         for (civ in gameInfo.civilizations.filter { !it.isBarbarian() }) {
             val startingLocation = startingLocations[civ]!!
+            for (tile in startingLocation.getTilesInDistance(3))
+                tile.improvement = null // Remove ancient ruins in immediate vicinity
 
-            fun placeNearStartingPosition(unitName:String) {
-                val newUnit = civ.placeUnitNearTile(startingLocation.position, unitName)
-                if (newUnit != null) newUnit.currentTile.improvement = null
+            fun placeNearStartingPosition(unitName: String) {
+                civ.placeUnitNearTile(startingLocation.position, unitName)
             }
             placeNearStartingPosition(Constants.settler)
             placeNearStartingPosition(getWarriorEquivalent(civ))
@@ -144,7 +145,6 @@ object GameStarter {
                 }
             }
         }
-
     }
 
     private fun getStartingLocations(civs: List<CivilizationInfo>, tileMap: TileMap): HashMap<CivilizationInfo, TileInfo> {