mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-31 23:29:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #12528 - city construction progress is reset when puppeting, not when annexing

Browse Source
This commit is contained in:
yairm210
2024-11-27 12:59:17 +02:00
parent 6b64bc6f1a
commit e150cc102a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
View File

@ -128,13 +128,13 @@ class CityConquestFunctions(val city: City) {
city.cityStats.update()
// The city could be producing something that puppets shouldn't, like units
city.cityConstructions.currentConstructionIsUserSet = false
city.cityConstructions.inProgressConstructions.clear() // undo all progress of the previous civ on units etc.
city.cityConstructions.constructionQueue.clear()
city.cityConstructions.chooseNextConstruction()
}
fun annexCity() {
city.isPuppet = false
city.cityConstructions.inProgressConstructions.clear() // undo all progress of the previous civ on units etc.
if (!city.isInResistance()) city.shouldReassignPopulation = true
city.setCityFocus(CityFocus.NoFocus)
city.cityStats.update()