AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #1369 - nuking capitals no longer crashes the game

Browse Source
This commit is contained in:
Yair Morgenstern 2019-11-28 22:21:39 +02:00
parent c1d3ac2604
commit 5807957d32
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,8 +287,6 @@ class CityInfo {
if (population.population <= 0) { // there are strange cases where we geet to -1 if (population.population <= 0) { // there are strange cases where we geet to -1
civInfo.addNotification("[$name] has been razed to the ground!", location, Color.RED) civInfo.addNotification("[$name] has been razed to the ground!", location, Color.RED)
destroyCity() destroyCity()
if (isCapital() && civInfo.cities.isNotEmpty()) // Yes, we actually razed the capital. Some people do this.
civInfo.cities.first().cityConstructions.addBuilding("Palace")
} else {//if not razed yet: } else {//if not razed yet:
if (population.foodStored >= population.getFoodToNextPopulation()) {//if surplus in the granary... if (population.foodStored >= population.getFoodToNextPopulation()) {//if surplus in the granary...
population.foodStored = population.getFoodToNextPopulation() - 1//...reduce below the new growth treshold population.foodStored = population.getFoodToNextPopulation() - 1//...reduce below the new growth treshold
@ -315,6 +313,9 @@ class CityInfo {
civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) } civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) }
getTiles().forEach { expansion.relinquishOwnership(it) } getTiles().forEach { expansion.relinquishOwnership(it) }
getCenterTile().improvement="City ruins" getCenterTile().improvement="City ruins"
if (isCapital() && civInfo.cities.isNotEmpty()) // Move the capital if destroyed (by a nuke or by razing)
civInfo.cities.first().cityConstructions.addBuilding("Palace")
} }
fun annexCity() { fun annexCity() {