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

Battletable only displays combat if the enemy unit is viewable or if the enemy ciity's tile has been explored

Browse source
This commit is contained in:
Yair Morgenstern 2018-04-08 08:58:42 +03:00
parent a72c1c7d95
commit d8a5acb6f2
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/src/com/unciv/ui/worldscreen/BattleTable.kt
View file

@ -17,20 +17,21 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
skin = CameraStageBaseScreen.skin
}
fun update(){
if(worldScreen.unitTable.selectedUnit==null
|| worldScreen.unitTable.selectedUnit!!.getBaseUnit().unitType== UnitType.Civilian) return // no attacker
fun update() {
if (worldScreen.unitTable.selectedUnit == null
|| worldScreen.unitTable.selectedUnit!!.getBaseUnit().unitType == UnitType.Civilian) return // no attacker
val attacker = MapUnitCombatant(worldScreen.unitTable.selectedUnit!!)
if(worldScreen.tileMapHolder.selectedTile==null) return
if (worldScreen.tileMapHolder.selectedTile == null) return
val selectedTile = worldScreen.tileMapHolder.selectedTile!!
val defender:ICombatant
if(selectedTile.isCityCenter && selectedTile.getOwner() != worldScreen.civInfo)
val defender: ICombatant
if (selectedTile.explored && selectedTile.isCityCenter && selectedTile.getOwner() != worldScreen.civInfo)
defender = CityCombatant(selectedTile.city!!)
else if(selectedTile.unit!=null
&& selectedTile.unit!!.owner != worldScreen.civInfo.civName) // enemy unit on selected tile,
defender = MapUnitCombatant(selectedTile.unit!!)
else if (selectedTile.unit != null
&& selectedTile.unit!!.owner != worldScreen.civInfo.civName // enemy unit on selected tile,
&& worldScreen.civInfo.getViewableTiles().contains(selectedTile))
defender = MapUnitCombatant(selectedTile.unit!!)
else {
clear()
return