From 68a3e09a19b1520c4666246a7f7adcfcac04f941 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 8 Jun 2021 23:00:35 +0300
Subject: [PATCH] Resolved #4083 - Reconquering cities you've founded leads to
 no resistance

---
 core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
index 1892fd0f0c..3349fed417 100644
--- a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
+++ b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
@@ -36,7 +36,8 @@ class CityInfoConquestFunctions(val city: CityInfo){
             conqueringCiv.addNotification("Received [$goldPlundered] Gold for capturing [$name]", getCenterTile().position, NotificationIcon.Gold)
 
             val oldCiv = civInfo
-            val reconqueredOurCity = previousOwner == conqueringCiv.civName
+            val reconqueredCityWhileStillInResistance = previousOwner == conqueringCiv.civName && resistanceCounter != 0
+
 
             previousOwner = oldCiv.civName
             // must be before moving the city to the conquering civ,
@@ -49,7 +50,7 @@ class CityInfoConquestFunctions(val city: CityInfo){
             if (population.population > 1) population.population -= 1 + population.population / 4 // so from 2-4 population, remove 1, from 5-8, remove 2, etc.
             reassignPopulation()
 
-            if (reconqueredOurCity && resistanceCounter != 0) // we reconquered our city while it was still in resistance - we get it back with no resistance
+            if (reconqueredCityWhileStillInResistance || foundingCiv == conqueringCiv.civName)
                 resistanceCounter = 0
             else resistanceCounter = population.population  // I checked, and even if you puppet there's resistance for conquering
             isPuppet = true