mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-30 14:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #4083 - Reconquering cities you've founded leads to no resistance

Browse Source
This commit is contained in:
Yair Morgenstern
2021-06-08 23:00:35 +03:00
parent 8441ab9e56
commit 68a3e09a19
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
View File

@ -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