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

City stats and resources updates after creating great improvement

Browse Source
This commit is contained in:
Yair Morgenstern 2020-03-26 10:43:27 +02:00
parent 2d33273c8d
commit 093ee0e3a9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,9 +145,7 @@ class CityInfo {
for (tileInfo in getTiles().filter { it.resource != null }) { for (tileInfo in getTiles().filter { it.resource != null }) {
val resource = tileInfo.getTileResource() val resource = tileInfo.getTileResource()
val amount = getTileResourceAmount(tileInfo) val amount = getTileResourceAmount(tileInfo)
if (amount > 0) { if (amount > 0) cityResources.add(resource, amount, "Tiles")
cityResources.add(resource, amount, "Tiles")
}
} }
for (building in cityConstructions.getBuiltBuildings().filter { it.requiredResource != null }) { for (building in cityConstructions.getBuiltBuildings().filter { it.requiredResource != null }) {

14
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -344,10 +344,16 @@ object UnitActions {
title = "Create [$improvementName]", title = "Create [$improvementName]",
uncivSound = UncivSound.Chimes, uncivSound = UncivSound.Chimes,
action = { action = {
unit.getTile().terrainFeature = null // remove forest/jungle/marsh val unitTile = unit.getTile()
unit.getTile().improvement = improvementName unitTile.terrainFeature = null // remove forest/jungle/marsh
unit.getTile().improvementInProgress = null unitTile.improvement = improvementName
unit.getTile().turnsToImprovement = 0 unitTile.improvementInProgress = null
unitTile.turnsToImprovement = 0
val city = unitTile.getCity()
if (city != null) {
city.cityStats.update()
city.civInfo.updateDetailedCivResources()
}
unit.destroy() unit.destroy()
}.takeIf { unit.currentMovement > 0f && !tile.isWater && !tile.isCityCenter() && !tile.getLastTerrain().impassable }) }.takeIf { unit.currentMovement > 0f && !tile.isWater && !tile.isCityCenter() && !tile.getLastTerrain().impassable })
} }