From b6512535fbb9465a969cd8cf52f5a7832f0e17e4 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 28 May 2019 23:09:47 +0300 Subject: [PATCH] Fixed bug in GetProductionCost that was probably caused by the construction changing while the city button was rendering --- android/build.gradle | 4 ++-- core/src/com/unciv/ui/tilegroups/CityButton.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f5f27c9e0b..7e064043ae 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 248 - versionName "2.16.10-patch1" + versionCode 249 + versionName "2.17.0" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index f85f7a37a8..6ebf349f3c 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -149,8 +149,8 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski group.addActor(label) val adoptedPolicies = cityConstructions.cityInfo.civInfo.policies.adoptedPolicies - val constructionPercentage = cityConstructions.getWorkDone(cityConstructions.currentConstruction) / - cityConstructions.getCurrentConstruction().getProductionCost(adoptedPolicies).toFloat() + val constructionPercentage = cityConstructions.getWorkDone(cityCurrentConstruction.name) / + cityCurrentConstruction.getProductionCost(adoptedPolicies).toFloat() val productionBar = ImageGetter.getProgressBarVertical(2f, groupHeight, constructionPercentage , Color.BROWN.cpy().lerp(Color.WHITE, 0.5f), Color.BLACK) productionBar.x = 10f