AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #634 from ninjatao/population_assign

Browse Source 
Fix pop assignment when founding city.
This commit is contained in:
Yair Morgenstern 2019-04-10 09:21:10 +03:00 committed by GitHub
commit 2c638d46e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -186,6 +186,9 @@ class Battle(val gameInfo:GameInfo) {
city.moveToCiv(attacker.getCivInfo()) city.moveToCiv(attacker.getCivInfo())
city.resistanceCounter = city.population.population city.resistanceCounter = city.population.population
city.workedTiles = hashSetOf() //reassign 1st working tile
city.population.specialists.clear()
city.population.autoAssignPopulation()
city.cityStats.update() city.cityStats.update()
} }

1
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -73,6 +73,7 @@ class CityInfo {
if (listOf("Forest", "Jungle", "Marsh").contains(tile.terrainFeature)) if (listOf("Forest", "Jungle", "Marsh").contains(tile.terrainFeature))
tile.terrainFeature = null tile.terrainFeature = null
workedTiles = hashSetOf() //reassign 1st working tile
population.autoAssignPopulation() population.autoAssignPopulation()
cityStats.update() cityStats.update()
} }