From 32856f9956c11842a3c1bce66a92ead74b4f8b5f Mon Sep 17 00:00:00 2001
From: itanasi <44038014+itanasi@users.noreply.github.com>
Date: Wed, 22 Jan 2025 07:38:39 -0800
Subject: [PATCH] Set Avoid Growth=false on capture (#12828)

---
 .../src/com/unciv/logic/city/managers/CityConquestFunctions.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt b/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
index c1fb088cd96d0..5dc4f90275bdf 100644
--- a/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
+++ b/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
@@ -99,6 +99,8 @@ class CityConquestFunctions(val city: City) {
         Battle.destroyIfDefeated(conqueredCiv, conqueringCiv, city.location)
 
         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)
             city.population.addPopulation(-1 - city.population.population / 4) // so from 2-4 population, remove 1, from 5-8, remove 2, etc.
         city.reassignAllPopulation()
@@ -136,6 +138,7 @@ class CityConquestFunctions(val city: City) {
     fun annexCity() {
         city.isPuppet = false
         if (!city.isInResistance()) city.shouldReassignPopulation = true
+        city.avoidGrowth = false
         city.setCityFocus(CityFocus.NoFocus)
         city.cityStats.update()
         GUI.setUpdateWorldOnNextRender()