From 891ea5584fd0cb8ea482a0a79a836698ff9cfc2f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 24 Oct 2019 22:18:47 +0300 Subject: [PATCH] Resolved #1234 - improvements that replace the current improvement now indicated in the improvement picker screen --- android/assets/jsons/Translations/Other.json | 6 ++++++ android/build.gradle | 4 ++-- .../com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index ba74c1a3fc..326ead2347 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -851,6 +851,12 @@ Czech:"Zvolte vylepšení" } + "Provides [resource]":{ + } + + "Replaces [improvement]":{ + } + "Pick now!": { //sample needed Italian: "Scegli ora!" German: "Jetzt wählen!" diff --git a/android/build.gradle b/android/build.gradle index 7c4f970ddb..3874114036 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 29 - versionCode 313 - versionName "3.1.8" + versionCode 314 + versionName "3.1.9" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt index 6c247fc204..ee3a4256a9 100644 --- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt @@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Button import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup +import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.tile.TileImprovement @@ -53,6 +54,9 @@ class ImprovementPickerScreen(tileInfo: TileInfo, onAccept: ()->Unit) : PickerSc var labelText = improvement.name.tr() + " - " + improvement.getTurnsToBuild(currentPlayerCiv) + " {turns}" if(tileInfo.hasViewableResource(currentPlayerCiv) && tileInfo.getTileResource().improvement == improvement.name) labelText += "\n"+"Provides [${tileInfo.resource}]".tr() + if(tileInfo.improvement!=null && improvement.name!=RoadStatus.Road.name + && improvement.name!=RoadStatus.Railroad.name && !improvement.name.startsWith("Remove")) + labelText += "\n" + "Replaces [${tileInfo.improvement}]".tr() group.add(labelText.toLabel().setFontColor(Color.WHITE)).pad(10f)