mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-04 23:40:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cities will be called "New $name" if all city names are exhausted

Browse Source
This commit is contained in:
Yair Morgenstern
2018-05-16 23:37:56 +03:00
parent a1995a3e37
commit 75b6a59ef4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -87,7 +87,9 @@ class CityInfo {
// Since cities can be captures between civilizations, // Since cities can be captures between civilizations,
// we need to check which other cities exist globally and name accordingly // we need to check which other cities exist globally and name accordingly
val allExistingCityNames = civInfo.gameInfo.civilizations.flatMap { it.cities }.map { it.name }.toHashSet() val allExistingCityNames = civInfo.gameInfo.civilizations.flatMap { it.cities }.map { it.name }.toHashSet()
name = civInfo.getCivilization().cities.first { !allExistingCityNames.contains(it) } val probablyName = civInfo.getCivilization().cities.firstOrNull { !allExistingCityNames.contains(it) }
if(probablyName!=null) name=probablyName
else name = civInfo.getCivilization().cities.first { !allExistingCityNames.contains("New $it") }
this.location = cityLocation this.location = cityLocation
civInfo.cities.add(this) civInfo.cities.add(this)