From c1fad81e18be07453db1b92ca0cf64ad484fd49d Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Wed, 10 Apr 2019 13:50:39 +0800
Subject: [PATCH] Fix pop assignment when founding city.

---
 core/src/com/unciv/logic/battle/Battle.kt | 3 +++
 core/src/com/unciv/logic/city/CityInfo.kt | 1 +
 2 files changed, 4 insertions(+)

diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index 7bbb15573b..4dde38288f 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -186,6 +186,9 @@ class Battle(val gameInfo:GameInfo) {
 
             city.moveToCiv(attacker.getCivInfo())
             city.resistanceCounter = city.population.population
+            city.workedTiles = hashSetOf() //reassign 1st working tile
+            city.population.specialists.clear()
+            city.population.autoAssignPopulation()
             city.cityStats.update()
         }
 
diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt
index 8b19b629be..c6d6451c2a 100644
--- a/core/src/com/unciv/logic/city/CityInfo.kt
+++ b/core/src/com/unciv/logic/city/CityInfo.kt
@@ -73,6 +73,7 @@ class CityInfo {
         if (listOf("Forest", "Jungle", "Marsh").contains(tile.terrainFeature))
             tile.terrainFeature = null
 
+        workedTiles = hashSetOf() //reassign 1st working tile
         population.autoAssignPopulation()
         cityStats.update()
     }