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

Set Avoid Growth=false on capture (#12828)

Browse Source
This commit is contained in:
itanasi 2025-01-22 07:38:39 -08:00 committed by GitHub
parent 05d246cdbe
commit 32856f9956
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
View File

@ -99,6 +99,8 @@ class CityConquestFunctions(val city: City) {
Battle.destroyIfDefeated(conqueredCiv, conqueringCiv, city.location) Battle.destroyIfDefeated(conqueredCiv, conqueringCiv, city.location)
city.health = city.getMaxHealth() / 2 // I think that cities recover to half health when conquered? city.health = city.getMaxHealth() / 2 // I think that cities recover to half health when conquered?
city.avoidGrowth = false // reset settings
city.setCityFocus(CityFocus.NoFocus) // reset settings
if (city.population.population > 1) if (city.population.population > 1)
city.population.addPopulation(-1 - city.population.population / 4) // so from 2-4 population, remove 1, from 5-8, remove 2, etc. city.population.addPopulation(-1 - city.population.population / 4) // so from 2-4 population, remove 1, from 5-8, remove 2, etc.
city.reassignAllPopulation() city.reassignAllPopulation()
@ -136,6 +138,7 @@ class CityConquestFunctions(val city: City) {
fun annexCity() { fun annexCity() {
city.isPuppet = false city.isPuppet = false
if (!city.isInResistance()) city.shouldReassignPopulation = true if (!city.isInResistance()) city.shouldReassignPopulation = true
city.avoidGrowth = false
city.setCityFocus(CityFocus.NoFocus) city.setCityFocus(CityFocus.NoFocus)
city.cityStats.update() city.cityStats.update()
GUI.setUpdateWorldOnNextRender() GUI.setUpdateWorldOnNextRender()