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

Resolved #3437 - reselecting improvement in progress does not reset progress

Browse Source 
Unit improvement picker displays correct turns for improvement in progress
This commit is contained in:
Yair Morgenstern
2020-12-21 21:14:39 +02:00
parent e653e71cc9
commit 96c480af02
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
val currentPlayerCiv = game.gameInfo.getCurrentPlayerCivilization()
fun accept(improvement: TileImprovement?) {
if (improvement == null) return
if (improvement == null || improvement.name == tileInfo.improvementInProgress) return
if (improvement.name == Constants.cancelImprovementOrder) {
tileInfo.stopWorkingOnImprovement()
// no onAccept() - Worker can stay selected
@ -58,7 +58,8 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
var labelText = improvement.name.tr()
if (improvement.shortcutKey != null) labelText += " (${improvement.shortcutKey})"
val turnsToBuild = improvement.getTurnsToBuild(currentPlayerCiv)
val turnsToBuild = if (tileInfo.improvementInProgress == improvement.name) tileInfo.turnsToImprovement
else improvement.getTurnsToBuild(currentPlayerCiv)
if (turnsToBuild > 0) labelText += " - $turnsToBuild${Fonts.turn}"
val provideResource = tileInfo.hasViewableResource(currentPlayerCiv) && tileInfo.getTileResource().improvement == improvement.name
if (provideResource) labelText += "\n" + "Provides [${tileInfo.resource}]".tr()
@ -76,7 +77,9 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
descriptionLabel.setText(improvement.getDescription(ruleSet))
}
val pickNow = "Pick now!".toLabel().onClick { accept(improvement) }
val pickNow = if (tileInfo.improvementInProgress != improvement.name)
"Pick now!".toLabel().onClick { accept(improvement) }
else "Current construction".toLabel()
if (improvement.shortcutKey != null)
keyPressDispatcher[improvement.shortcutKey.toLowerCase()] = { accept(improvement) }
@ -147,5 +150,4 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
}
return statsTable
}
}
}