From 1aa703e69b1a772d515788ff2d96fa9f1415c940 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 27 Jun 2019 10:46:32 +0300 Subject: [PATCH] "Current construction is user set" saved between saves/loads - #875 --- core/src/com/unciv/logic/city/CityConstructions.kt | 1 + core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index ea21a41d75..cb522d21c1 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -28,6 +28,7 @@ class CityConstructions { toReturn.builtBuildings.addAll(builtBuildings) toReturn.inProgressConstructions.putAll(inProgressConstructions) toReturn.currentConstruction=currentConstruction + toReturn.currentConstructionIsUserSet=currentConstructionIsUserSet return toReturn } diff --git a/core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt b/core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt index 1f13c6433d..865e2eb26c 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreenTileTable.kt @@ -45,11 +45,16 @@ class CityScreenTileTable(val city: CityInfo): Table(){ } innerTable.add(statsTable).row() - if(selectedTile.getOwner()==null && selectedTile.neighbors.any{it.getCity()==city}){ + if(selectedTile.getOwner()==null && selectedTile.neighbors.any {it.getCity()==city}){ val goldCostOfTile = city.expansion.getGoldCostOfTile(selectedTile) + val buyTileButton = TextButton("Buy for [$goldCostOfTile] gold".tr(), CameraStageBaseScreen.skin) - buyTileButton.onClick("coin") { city.expansion.buyTile(selectedTile); UnCivGame.Current.screen = CityScreen(city) } + buyTileButton.onClick("coin") { + city.expansion.buyTile(selectedTile) + UnCivGame.Current.screen = CityScreen(city) + } if(goldCostOfTile>city.civInfo.gold) buyTileButton.disable() + innerTable.add(buyTileButton) } if(city.canAcquireTile(selectedTile)){