White halo around selected unit is now shield-shaped iff the unit is fortified

This commit is contained in:
Yair Morgenstern 2018-05-23 21:45:43 +03:00
parent 5a564f29c3
commit 9cbdee4b12
2 changed files with 8 additions and 7 deletions

View File

@ -18,12 +18,13 @@ import com.unciv.ui.utils.center
class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) { class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
var cityButton: Table? = null var cityButton: Table? = null
fun addWhiteCircleAroundUnit(){ fun addWhiteHaloAroundUnit(){
val whiteCircle = ImageGetter.getImage("UnitIcons/Circle.png") val whiteHalo = if(tileInfo.unit!!.isFortified()) ImageGetter.getImage("UnitIcons/Shield.png")
whiteCircle.setSize(25f,25f) else ImageGetter.getImage("UnitIcons/Circle.png")
whiteCircle.center(unitImage!!) whiteHalo.setSize(25f,25f)
unitImage!!.addActor(whiteCircle) whiteHalo.center(unitImage!!)
whiteCircle.toBack() unitImage!!.addActor(whiteHalo)
whiteHalo.toBack()
} }

View File

@ -100,7 +100,7 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
if(worldScreen.bottomBar.unitTable.selectedUnit!=null){ if(worldScreen.bottomBar.unitTable.selectedUnit!=null){
val unit = worldScreen.bottomBar.unitTable.selectedUnit!! val unit = worldScreen.bottomBar.unitTable.selectedUnit!!
tileGroups[unit.getTile()]!!.addWhiteCircleAroundUnit() tileGroups[unit.getTile()]!!.addWhiteHaloAroundUnit()
val attackableTiles:List<TileInfo> val attackableTiles:List<TileInfo>
when(unit.getBaseUnit().unitType){ when(unit.getBaseUnit().unitType){
UnitType.Civilian -> return UnitType.Civilian -> return