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

Fixed naval units not tp-ing out of razed cities (#4238)

Browse Source
This commit is contained in:
Arthur van der Staaij 2021-06-23 08:40:32 +02:00 committed by GitHub
parent f745ca9421
commit cf9e00c589
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,6 +383,12 @@ class CityInfo {
fun destroyCity() { fun destroyCity() {
for (airUnit in getCenterTile().airUnits.toList()) airUnit.destroy() //Destroy planes stationed in city for (airUnit in getCenterTile().airUnits.toList()) airUnit.destroy() //Destroy planes stationed in city
// The relinquish ownership MUST come before removing the city,
// because it updates the city stats which assumes there is a capital, so if you remove the capital it crashes
getTiles().forEach { expansion.relinquishOwnership(it) }
civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) }
getCenterTile().improvement = "City ruins"
// Edge case! What if a water unit is in a city, and you raze the city? // Edge case! What if a water unit is in a city, and you raze the city?
// Well, the water unit has to return to the water! // Well, the water unit has to return to the water!
for (unit in getCenterTile().getUnits()) { for (unit in getCenterTile().getUnits()) {
@ -390,12 +396,6 @@ class CityInfo {
unit.movement.teleportToClosestMoveableTile() unit.movement.teleportToClosestMoveableTile()
} }
// The relinquish ownership MUST come before removing the city,
// because it updates the city stats which assumes there is a capital, so if you remove the capital it crashes
getTiles().forEach { expansion.relinquishOwnership(it) }
civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) }
getCenterTile().improvement = "City ruins"
if (isCapital() && civInfo.cities.isNotEmpty()) { // Move the capital if destroyed (by a nuke or by razing) if (isCapital() && civInfo.cities.isNotEmpty()) { // Move the capital if destroyed (by a nuke or by razing)
civInfo.cities.first().cityConstructions.addBuilding(capitalCityIndicator()) civInfo.cities.first().cityConstructions.addBuilding(capitalCityIndicator())
} }