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

Civ is properly destroyed when liberating the last city of the civ

Browse Source
This commit is contained in:
Yair Morgenstern 2020-07-05 23:03:28 +03:00
parent 75c6ab8acb
commit 1b7b9bfcd5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,7 +392,6 @@ class CityInfo {
moveToCiv(conqueringCiv) moveToCiv(conqueringCiv)
Battle.destroyIfDefeated(oldCiv, conqueringCiv) Battle.destroyIfDefeated(oldCiv, conqueringCiv)
if(population.population>1) population.population -= 1 + population.population/4 // so from 2-4 population, remove 1, from 5-8, remove 2, etc. if(population.population>1) population.population -= 1 + population.population/4 // so from 2-4 population, remove 1, from 5-8, remove 2, etc.
reassignPopulation() reassignPopulation()
@ -439,25 +438,27 @@ class CityInfo {
} }
val oldCiv = civInfo
diplomaticRepercussionsForLiberatingCity(conqueringCiv) diplomaticRepercussionsForLiberatingCity(conqueringCiv)
val foundingCiv = civInfo.gameInfo.civilizations.first { it.civName == foundingCiv } val foundingCiv = civInfo.gameInfo.civilizations.first { it.civName == foundingCiv }
moveToCiv(foundingCiv) moveToCiv(foundingCiv)
health = getMaxHealth() / 2 // I think that cities recover to half health when conquered? Battle.destroyIfDefeated(oldCiv, conqueringCiv)
health = getMaxHealth() / 2 // I think that cities recover to half health when conquered?
reassignPopulation() reassignPopulation()
if(foundingCiv.cities.size == 1) cityConstructions.addBuilding("Palace") // Resurrection! if (foundingCiv.cities.size == 1) cityConstructions.addBuilding("Palace") // Resurrection!
isPuppet = false isPuppet = false
cityStats.update() cityStats.update()
// Move units out of the city when liberated // Move units out of the city when liberated
for(unit in getTiles().flatMap { it.getUnits() }.toList()) for (unit in getTiles().flatMap { it.getUnits() }.toList())
if(!unit.movement.canPassThrough(unit.currentTile)) if (!unit.movement.canPassThrough(unit.currentTile))
unit.movement.teleportToClosestMoveableTile() unit.movement.teleportToClosestMoveableTile()
UncivGame.Current.worldScreen.shouldUpdate=true UncivGame.Current.worldScreen.shouldUpdate = true
} }
private fun diplomaticRepercussionsForLiberatingCity(conqueringCiv: CivilizationInfo) { private fun diplomaticRepercussionsForLiberatingCity(conqueringCiv: CivilizationInfo) {