From 389c489faf8bfaf4022189f4a139e7000c2a9776 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 25 May 2018 12:01:06 +0300 Subject: [PATCH] Added icons to improvement picker screen --- .../ImprovementIcons/Railroad_(Civ5).png | Bin 0 -> 5939 bytes .../assets/ImprovementIcons/Road_(Civ5).png | Bin 0 -> 5597 bytes .../pickerscreens/ImprovementPickerScreen.kt | 20 +++++++++++------- .../unciv/ui/worldscreen/WorldScreenTopBar.kt | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 android/assets/ImprovementIcons/Railroad_(Civ5).png create mode 100644 android/assets/ImprovementIcons/Road_(Civ5).png diff --git a/android/assets/ImprovementIcons/Railroad_(Civ5).png b/android/assets/ImprovementIcons/Railroad_(Civ5).png new file mode 100644 index 0000000000000000000000000000000000000000..96a5607f764dc1c568740ce5d8e3d549e87ae330 GIT binary patch literal 5939 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 literal 0 HcmV?d00001 diff --git a/android/assets/ImprovementIcons/Road_(Civ5).png b/android/assets/ImprovementIcons/Road_(Civ5).png new file mode 100644 index 0000000000000000000000000000000000000000..614672dbcb6669460d55f4ecd7d931d5055ab3b9 GIT binary patch literal 5597 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 MS`ReK)$PLm2czDj(EtDd literal 0 HcmV?d00001 diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt index 1d8ffe0400..ec4407530f 100644 --- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt @@ -1,12 +1,15 @@ package com.unciv.ui.pickerscreens -import com.badlogic.gdx.scenes.scene2d.ui.TextButton +import com.badlogic.gdx.graphics.Color +import com.badlogic.gdx.scenes.scene2d.ui.Button +import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup import com.unciv.logic.map.TileInfo import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.TileImprovement import com.unciv.ui.cityscreen.addClickListener -import com.unciv.ui.utils.CameraStageBaseScreen +import com.unciv.ui.utils.ImageGetter +import com.unciv.ui.utils.setFontColor class ImprovementPickerScreen(tileInfo: TileInfo) : PickerScreen() { private var selectedImprovement: TileImprovement? = null @@ -25,17 +28,18 @@ class ImprovementPickerScreen(tileInfo: TileInfo) : PickerScreen() { regularImprovements.space(10f) for (improvement in GameBasics.TileImprovements.values) { if (!tileInfo.canBuildImprovement(improvement, civInfo) || improvement.name == tileInfo.improvement) continue - val improvementTextButton = TextButton( - improvement.name + "\r\n" + improvement.getTurnsToBuild(civInfo) + " turns", - CameraStageBaseScreen.skin - ) + val improvementButton = Button(skin) - improvementTextButton.addClickListener { + improvementButton.add(ImageGetter.getImprovementIcon(improvement.name)).size(30f).pad(10f) + improvementButton.add(Label(improvement.name + " - " + improvement.getTurnsToBuild(civInfo) + " turns",skin) + .setFontColor(Color.WHITE)).pad(10f) + + improvementButton.addClickListener { selectedImprovement = improvement pick(improvement.name) descriptionLabel.setText(improvement.description) } - regularImprovements.addActor(improvementTextButton) + regularImprovements.addActor(improvementButton) } topTable.add(regularImprovements) } diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt index dda40b83b3..23853a290d 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt @@ -17,7 +17,7 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() { val labelSkin = CameraStageBaseScreen.skin - private val turnsLabel = Label("Turns: 0/400",labelSkin) + private val turnsLabel = Label("Turns: 0/400",labelSkin).setFontColor(Color.WHITE) private val goldLabel = Label("Gold:", labelSkin).setFontColor(colorFromRGB(225, 217, 71) ) private val scienceLabel = Label("Science:", labelSkin).setFontColor(colorFromRGB(78, 140, 151) ) private val happinessLabel = Label("Happiness:", labelSkin)