From 81b29a5b575ae8b122bb4af0428e38a2e353d091 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 12 Mar 2019 19:24:50 +0200 Subject: [PATCH] Resolved #551 - Update city stats on production change --- android/assets/jsons/Translations.json | 7 ------- android/build.gradle | 2 +- core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt | 2 +- core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index fe05a6e8c5..7dc06e14e6 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -8358,13 +8358,6 @@ Italian:"Attacco in massa III" German:"Rudeltaktik III" } - /* - //Air units promotions (suggested by Smashfanful) - "Wolfpack III":{ - Italian:"Attacco in massa III" - German:"Rudeltaktik III" - } - */ // Civilopedia texts "Basics":{ diff --git a/android/build.gradle b/android/build.gradle index bb58589ab9..c8e880ac3c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,7 +21,7 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 214 + versionCode 215 versionName "2.13.13" } diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt index da57ffe08d..ba33b1c25c 100644 --- a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt @@ -34,7 +34,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre pickProductionButton.add(buttonText.toLabel().setFontColor(Color.WHITE)) pickProductionButton.onClick { cityScreen.city.cityConstructions.currentConstruction = construction - update() + cityScreen.update() } if(construction==cityScreen.city.cityConstructions.currentConstruction) pickProductionButton.color= Color.GREEN diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt index fd3085871c..0f2d3cb266 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt +++ b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt @@ -135,7 +135,6 @@ class BattleTable(val worldScreen: WorldScreen): Table() { if (attacker.canAttack()) { if (attacker is MapUnitCombatant) { - attacker.unit.getDistanceToTiles() attackableEnemy = UnitAutomation() .getAttackableEnemies(attacker.unit, attacker.unit.getDistanceToTiles()) .firstOrNull{ it.tileToAttack == defender.getTile()}