Cities beyond the 15th get "New" names properly

This commit is contained in:
Yair Morgenstern 2018-05-17 10:44:27 +03:00
parent e267a7a6be
commit 64f8b3fef8

View File

@ -89,7 +89,7 @@ class CityInfo {
val allExistingCityNames = civInfo.gameInfo.civilizations.flatMap { it.cities }.map { it.name }.toHashSet() val allExistingCityNames = civInfo.gameInfo.civilizations.flatMap { it.cities }.map { it.name }.toHashSet()
val probablyName = civInfo.getCivilization().cities.firstOrNull { !allExistingCityNames.contains(it) } val probablyName = civInfo.getCivilization().cities.firstOrNull { !allExistingCityNames.contains(it) }
if(probablyName!=null) name=probablyName if(probablyName!=null) name=probablyName
else name = civInfo.getCivilization().cities.first { !allExistingCityNames.contains("New $it") } else name = civInfo.getCivilization().cities.map { "New $it" }.first { !allExistingCityNames.contains(it) }
this.location = cityLocation this.location = cityLocation
civInfo.cities.add(this) civInfo.cities.add(this)