diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 69b81cfb3c..047064d970 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 886 - const val appVersion = "4.7.6" + const val appCodeNumber = 887 + const val appVersion = "4.7.6-patch1" const val gdxVersion = "1.11.0" const val ktorVersion = "2.2.3" diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index bc0e6e91cd..721d693ccf 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -536,7 +536,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.7.6", 886) + val VERSION = Version("4.7.6-patch1", 887) //endregion lateinit var Current: UncivGame diff --git a/core/src/com/unciv/logic/city/City.kt b/core/src/com/unciv/logic/city/City.kt index 1ad1297f55..167b6aeb92 100644 --- a/core/src/com/unciv/logic/city/City.kt +++ b/core/src/com/unciv/logic/city/City.kt @@ -457,9 +457,7 @@ class City : IsPartOfGameInfoSerialization { // Move the capital if destroyed (by a nuke or by razing) // Must be before removing existing capital because we may be annexing a puppet which means city stats update - see #8337 - if (isCapital() && civ.cities.size > 1) { - civ.moveCapitalToNextLargest() - } + if (isCapital()) civ.moveCapitalToNextLargest() civ.cities = civ.cities.toMutableList().apply { remove(this@City) } getCenterTile().changeImprovement("City ruins") diff --git a/core/src/com/unciv/logic/civilization/Civilization.kt b/core/src/com/unciv/logic/civilization/Civilization.kt index e673544a29..5399f2f2e4 100644 --- a/core/src/com/unciv/logic/civilization/Civilization.kt +++ b/core/src/com/unciv/logic/civilization/Civilization.kt @@ -815,7 +815,11 @@ class Civilization : IsPartOfGameInfoSerialization { fun moveCapitalToNextLargest() { val availableCities = cities.filterNot { it.isCapital() } - if (availableCities.none()) return + if (availableCities.none()) { + moveCapitalTo(null) + return + } + var newCapital = availableCities.filterNot { it.isPuppet }.maxByOrNull { it.population.population } if (newCapital == null) { // No non-puppets, take largest puppet and annex