AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change improvement picker key indicators to tooltip (#4174)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-06-19 20:43:04 +02:00 committed by GitHub
parent 8f26a77b2d
commit 05e6609b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import com.unciv.models.ruleset.tile.TileImprovement
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
import com.unciv.ui.utils.StaticTooltip.Companion.addStaticTip
import kotlin.math.round import kotlin.math.round
class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) : PickerScreen() { class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) : PickerScreen() {
@ -81,7 +82,6 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
} }
var labelText = improvement.name.tr() var labelText = improvement.name.tr()
if (shortcutKey != null) labelText += " ($shortcutKey)"
val turnsToBuild = if (tileInfo.improvementInProgress == improvement.name) tileInfo.turnsToImprovement val turnsToBuild = if (tileInfo.improvementInProgress == improvement.name) tileInfo.turnsToImprovement
else improvement.getTurnsToBuild(currentPlayerCiv) else improvement.getTurnsToBuild(currentPlayerCiv)
if (turnsToBuild > 0) labelText += " - $turnsToBuild${Fonts.turn}" if (turnsToBuild > 0) labelText += " - $turnsToBuild${Fonts.turn}"
@ -104,10 +104,6 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
"Pick now!".toLabel().onClick { accept(improvement) } "Pick now!".toLabel().onClick { accept(improvement) }
else "Current construction".toLabel() else "Current construction".toLabel()
if (shortcutKey != null)
keyPressDispatcher[shortcutKey] = { accept(improvement) }
val statIcons = getStatIconsTable(provideResource, removeImprovement) val statIcons = getStatIconsTable(provideResource, removeImprovement)
// get benefits of the new improvement // get benefits of the new improvement
@ -129,6 +125,12 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
improvementButton.add(improvementButtonTable).pad(5f).fillY() improvementButton.add(improvementButtonTable).pad(5f).fillY()
if (improvement.name == tileInfo.improvementInProgress) improvementButton.color = Color.GREEN if (improvement.name == tileInfo.improvementInProgress) improvementButton.color = Color.GREEN
regularImprovements.add(improvementButton) regularImprovements.add(improvementButton)
if (shortcutKey != null) {
keyPressDispatcher[shortcutKey] = { accept(improvement) }
improvementButton.addStaticTip(shortcutKey)
}
regularImprovements.add(pickNow).padLeft(10f).fillY() regularImprovements.add(pickNow).padLeft(10f).fillY()
regularImprovements.row() regularImprovements.row()
} }