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

Can right-click to attack when a unit is selected

Browse Source
This commit is contained in:
Yair Morgenstern 2020-11-12 21:13:24 +02:00
parent 961579fd3d
commit 62c42851ed
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
View File

@ -15,6 +15,8 @@ import com.unciv.Constants
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.automation.BattleHelper import com.unciv.logic.automation.BattleHelper
import com.unciv.logic.automation.UnitAutomation import com.unciv.logic.automation.UnitAutomation
import com.unciv.logic.battle.Battle
import com.unciv.logic.battle.MapUnitCombatant
import com.unciv.logic.city.CityInfo import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.* import com.unciv.logic.map.*
@ -61,8 +63,22 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
val unit = worldScreen.bottomUnitTable.selectedUnit val unit = worldScreen.bottomUnitTable.selectedUnit
if (unit == null) return if (unit == null) return
thread { thread {
val canUnitReachTile = unit.movement.canReach(tileGroup.tileInfo) val tile = tileGroup.tileInfo
if (canUnitReachTile) moveUnitToTargetTile(listOf(unit), tileGroup.tileInfo)
val attackableTile = BattleHelper.getAttackableEnemies(unit, unit.movement.getDistanceToTiles())
.firstOrNull { it.tileToAttack == tileGroup.tileInfo }
if (unit.canAttack() && attackableTile != null) {
Battle.moveAndAttack(MapUnitCombatant(unit), attackableTile)
worldScreen.shouldUpdate=true
return@thread
}
val canUnitReachTile = unit.movement.canReach(tile)
if (canUnitReachTile) {
moveUnitToTargetTile(listOf(unit), tile)
return@thread
}
} }
} }
}) })