From 3db82c24005de60aa57723331559a6ff12128974 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 26 Aug 2018 07:57:08 +0300
Subject: [PATCH] Some ridiculous people have passed the 15-city mark. Crazy.

---
 core/src/com/unciv/logic/city/CityInfo.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt
index 0c2bee93..a9244c3d 100644
--- a/core/src/com/unciv/logic/city/CityInfo.kt
+++ b/core/src/com/unciv/logic/city/CityInfo.kt
@@ -39,7 +39,11 @@ class CityInfo {
         val allExistingCityNames = civInfo.gameInfo.civilizations.flatMap { it.cities }.map { it.name }.toHashSet()
         val probablyName = civInfo.getNation().cities.firstOrNull { !allExistingCityNames.contains(it) }
         if(probablyName!=null) name=probablyName
-        else name = civInfo.getNation().cities.map { "New $it" }.first { !allExistingCityNames.contains(it) }
+        else {
+            val newName = civInfo.getNation().cities.map { "New $it" }.firstOrNull{ !allExistingCityNames.contains(it) }
+            if(newName!=null) name=newName
+            else name = civInfo.getNation().cities.map { "Newer $it" }.first{ !allExistingCityNames.contains(it) }
+        }
 
         this.location = cityLocation
         civInfo.cities.add(this)