wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some ridiculous people have passed the 15-city mark. Crazy.

Browse source
This commit is contained in:
Yair Morgenstern 2018-08-26 07:57:08 +03:00
parent c828b57577
commit 3db82c2400
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/com/unciv/logic/city/CityInfo.kt
View file

@ -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)