AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 19:43:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ranged attacks can reach attackee if tile is in range

Browse Source
This commit is contained in:
Yair Morgenstern 2018-04-09 11:03:55 +03:00
parent 3045fe040d
commit b59e235df5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/ui/worldscreen/BattleTable.kt
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.logic.battle.* import com.unciv.logic.battle.*
import com.unciv.logic.map.UnitType import com.unciv.logic.map.UnitType
import com.unciv.ui.UnCivGame
import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.cityscreen.addClickListener
import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.disable import com.unciv.ui.utils.disable
@ -111,7 +112,13 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
worldScreen.update() worldScreen.update()
} }
val attackerCanReachDefender = attacker.unit.getDistanceToTiles().containsKey(defender.getTile()) val attackerCanReachDefender:Boolean
if (attacker.getCombatantType() == CombatantType.Ranged) {
val tilesInRange = UnCivGame.Current.gameInfo.tileMap.getTilesInDistance(attacker.getTile().position, 2)
attackerCanReachDefender = tilesInRange.contains(defender.getTile())
}
else attackerCanReachDefender = attacker.unit.getDistanceToTiles().containsKey(defender.getTile())
if(attacker.unit.currentMovement==0f || !attackerCanReachDefender) attackButton.disable() if(attacker.unit.currentMovement==0f || !attackerCanReachDefender) attackButton.disable()
add(attackButton).colspan(2) add(attackButton).colspan(2)