From 56f4d2d57b37bf05a5bd99ed1751f0b678809938 Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Wed, 25 Sep 2019 11:08:26 +0800
Subject: [PATCH] Annexed city from puppet status should not be in resistance.

---
 core/src/com/unciv/ui/cityscreen/CityScreen.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt
index 99de1b8526..135e227773 100644
--- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt
@@ -168,9 +168,13 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
             val annexCityButton = TextButton("Annex city".tr(), skin)
             annexCityButton.labelCell.pad(10f)
             annexCityButton.onClick {
+                if(!city.civInfo.policies.isAdopted("Police State")) {
+                    city.expansion.cultureStored = 0
+                    city.expansion.reset()
+                }
+
                 city.isPuppet=false
                 city.isBeingRazed=false
-                city.resistanceCounter = city.population.population
                 update()
             }
             razeCityButtonHolder.add(annexCityButton).colspan(cityPickerTable.columns)