AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Annexed city from puppet status should not be in resistance.

Browse Source
This commit is contained in:
Duan Tao 2019-09-25 11:08:26 +08:00 committed by Yair Morgenstern
parent 751c33c609
commit 56f4d2d57b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

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