mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 02:09:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Puppeted cities can no longer become capitals (#7360)

Browse Source
This commit is contained in:
alexban011
2022-07-07 17:28:57 +03:00
committed by GitHub
parent fe2d3243fc
commit fc1896eaf1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -1376,9 +1376,15 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
}
fun moveCapitalToNextLargest() {
moveCapitalTo(cities
.filterNot { it.isCapital() }
.maxByOrNull { it.population.population})
val availableCities = cities.filterNot { it.isCapital() }
if (availableCities.none()) return
var newCapital = availableCities.filterNot { it.isPuppet }.maxByOrNull { it.population.population }
if (newCapital == null) { // No non-puppets, take largest puppet and annex
newCapital = availableCities.maxByOrNull { it.population.population }!!
newCapital.annexCity()
}
moveCapitalTo(newCapital)
}
//////////////////////// City State wrapper functions ////////////////////////