AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3465 - picking current impeovement closes picker screen, but doesn't reset improvement constrution

Browse Source
This commit is contained in:
Yair Morgenstern 2020-12-28 17:36:18 +02:00
parent 7dd2438dbd
commit e07fd6d0bc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,12 +21,13 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
val currentPlayerCiv = game.gameInfo.getCurrentPlayerCivilization() val currentPlayerCiv = game.gameInfo.getCurrentPlayerCivilization()
fun accept(improvement: TileImprovement?) { fun accept(improvement: TileImprovement?) {
if (improvement == null || improvement.name == tileInfo.improvementInProgress) return if (improvement == null) return
if (improvement.name == Constants.cancelImprovementOrder) { if (improvement.name == Constants.cancelImprovementOrder) {
tileInfo.stopWorkingOnImprovement() tileInfo.stopWorkingOnImprovement()
// no onAccept() - Worker can stay selected // no onAccept() - Worker can stay selected
} else { } else {
tileInfo.startWorkingOnImprovement(improvement, currentPlayerCiv) if (improvement.name != tileInfo.improvementInProgress)
tileInfo.startWorkingOnImprovement(improvement, currentPlayerCiv)
if (tileInfo.civilianUnit != null) tileInfo.civilianUnit!!.action = null // this is to "wake up" the worker if it's sleeping if (tileInfo.civilianUnit != null) tileInfo.civilianUnit!!.action = null // this is to "wake up" the worker if it's sleeping
onAccept() onAccept()
} }

3
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -99,7 +99,8 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
diplomacyTable.defaults().pad(10f) diplomacyTable.defaults().pad(10f)
val displayNameTable = Table() val displayNameTable = Table()
displayNameTable.add(ImageGetter.getNationIndicator(otherCiv.nation, 24f)).pad(0f,0f,5f,10f) displayNameTable.add(ImageGetter.getNationIndicator(otherCiv.nation, 24f))
.pad(0f,0f,5f,10f)
displayNameTable.add(otherCiv.getLeaderDisplayName().toLabel(fontSize = 24)) displayNameTable.add(otherCiv.getLeaderDisplayName().toLabel(fontSize = 24))
diplomacyTable.add(displayNameTable).row() diplomacyTable.add(displayNameTable).row()