From b5adf08dbe0f207f727d34720b29035afbb0d8ba Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Tue, 4 Dec 2018 10:48:38 +0800 Subject: [PATCH 1/2] Fix city might have negative free population after been conquered. --- core/src/com/unciv/logic/battle/Battle.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 85396c0d67..d58f3c9540 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -140,6 +140,7 @@ class Battle(val gameInfo:GameInfo) { city.expansion.reset() } city.moveToCiv(attacker.getCivilization()) + city.population.unassignExtraPopulation() } if(city.cityConstructions.isBuilt("Palace")){ From 6934ed0b0dfd61adc19c4d0a18fd4ad43e73e968 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Tue, 4 Dec 2018 18:21:05 +0800 Subject: [PATCH 2/2] Unassign population before conquered city given to conquerer. --- core/src/com/unciv/logic/battle/Battle.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index d58f3c9540..3179a01a11 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -139,8 +139,8 @@ class Battle(val gameInfo:GameInfo) { city.expansion.cultureStored = 0 city.expansion.reset() } - city.moveToCiv(attacker.getCivilization()) city.population.unassignExtraPopulation() + city.moveToCiv(attacker.getCivilization()) } if(city.cityConstructions.isBuilt("Palace")){