wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #1234 - improvements that replace the current improvement now indicated in the improvement picker screen

Browse source
This commit is contained in:
Yair Morgenstern 2019-10-24 22:18:47 +03:00
parent 6fb3ba0f13
commit 891ea5584f
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/assets/jsons/Translations/Other.json
View file

@ -851,6 +851,12 @@
Czech:"Zvolte vylepšení"
}
"Provides [resource]":{
}
"Replaces [improvement]":{
}
"Pick now!": { //sample needed
Italian: "Scegli ora!"
German: "Jetzt wählen!"

4
android/build.gradle
View file

@ -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

4
core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
View file

@ -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)