mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 07:16:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added icons to improvement picker screen

Browse Source
This commit is contained in:
Yair Morgenstern 2018-05-25 12:01:06 +03:00
parent 53ff1290e8
commit 389c489faf
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/assets/ImprovementIcons/Railroad_(Civ5).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
android/assets/ImprovementIcons/Road_(Civ5).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

20
core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
View File

@ -1,12 +1,15 @@
package com.unciv.ui.pickerscreens 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.badlogic.gdx.scenes.scene2d.ui.VerticalGroup
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.TileImprovement import com.unciv.models.gamebasics.TileImprovement
import com.unciv.ui.cityscreen.addClickListener 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() { class ImprovementPickerScreen(tileInfo: TileInfo) : PickerScreen() {
private var selectedImprovement: TileImprovement? = null private var selectedImprovement: TileImprovement? = null
@ -25,17 +28,18 @@ class ImprovementPickerScreen(tileInfo: TileInfo) : PickerScreen() {
regularImprovements.space(10f) regularImprovements.space(10f)
for (improvement in GameBasics.TileImprovements.values) { for (improvement in GameBasics.TileImprovements.values) {
if (!tileInfo.canBuildImprovement(improvement, civInfo) || improvement.name == tileInfo.improvement) continue if (!tileInfo.canBuildImprovement(improvement, civInfo) || improvement.name == tileInfo.improvement) continue
val improvementTextButton = TextButton( val improvementButton = Button(skin)
improvement.name + "\r\n" + improvement.getTurnsToBuild(civInfo) + " turns",
CameraStageBaseScreen.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 selectedImprovement = improvement
pick(improvement.name) pick(improvement.name)
descriptionLabel.setText(improvement.description) descriptionLabel.setText(improvement.description)
} }
regularImprovements.addActor(improvementTextButton) regularImprovements.addActor(improvementButton)
} }
topTable.add(regularImprovements) topTable.add(regularImprovements)
} }

2
core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
View File

@ -17,7 +17,7 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() {
val labelSkin = CameraStageBaseScreen.skin 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 goldLabel = Label("Gold:", labelSkin).setFontColor(colorFromRGB(225, 217, 71) )
private val scienceLabel = Label("Science:", labelSkin).setFontColor(colorFromRGB(78, 140, 151) ) private val scienceLabel = Label("Science:", labelSkin).setFontColor(colorFromRGB(78, 140, 151) )
private val happinessLabel = Label("Happiness:", labelSkin) private val happinessLabel = Label("Happiness:", labelSkin)