wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #803 - Heal Instantly didn't update health in unit icon

Browse source
This commit is contained in:
Yair Morgenstern 2019-05-26 16:16:42 +03:00
parent 408dfcfc7e
commit f78f9c2fad
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
View file

@ -28,6 +28,7 @@ class PromotionPickerScreen(mapUnit: MapUnit) : PickerScreen() {
if(mapUnit.promotions.canBePromoted()) game.screen = PromotionPickerScreen(mapUnit) if(mapUnit.promotions.canBePromoted()) game.screen = PromotionPickerScreen(mapUnit)
else game.setWorldScreen() else game.setWorldScreen()
dispose() dispose()
game.worldScreen.shouldUpdate=true
} }
rightSideButton.setText("Pick promotion".tr()) rightSideButton.setText("Pick promotion".tr())

11
core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
View file

@ -2,7 +2,10 @@ package com.unciv.ui.worldscreen.unit
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.* import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup
import com.unciv.UnCivGame import com.unciv.UnCivGame
import com.unciv.logic.battle.CityCombatant import com.unciv.logic.battle.CityCombatant
import com.unciv.logic.city.CityInfo import com.unciv.logic.city.CityInfo
@ -108,7 +111,11 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
val unit = selectedUnit!! val unit = selectedUnit!!
var nameLabelText = unit.name.tr() var nameLabelText = unit.name.tr()
if(unit.health<100) nameLabelText+=" ("+unit.health+")" if(unit.health<100) nameLabelText+=" ("+unit.health+")"
unitNameLabel.setText(nameLabelText) if(nameLabelText!=unitNameLabel.text.toString()){
unitNameLabel.setText(nameLabelText)
selectedUnitHasChanged=true // We need to reload the health bar of the unit in the icon - happens e.g. when picking the Heal Instantly promotion
}
unitDescriptionTable.clear() unitDescriptionTable.clear()
unitDescriptionTable.defaults().pad(2f) unitDescriptionTable.defaults().pad(2f)