From 48350fc6a37034cc10c99c0e1b89aed190ab99a7 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Fri, 3 Jul 2020 01:04:34 +0800 Subject: [PATCH] Mark red for air unit attack range. (#2786) Ya know what, sure why not --- core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt b/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt index 3d8a8de614..5cbf70b33a 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt @@ -255,7 +255,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap val isAirUnit = unit.type.isAirUnit() val tilesInMoveRange = if (isAirUnit) - unit.getTile().getTilesInDistance(unit.getRange()*2) + unit.getTile().getTilesInDistanceRange(IntRange(unit.getRange(), unit.getRange() * 2)) else unit.movement.getDistanceToTiles().keys.asSequence() @@ -268,6 +268,15 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap if (UncivGame.Current.settings.singleTapMove || isAirUnit) 0.7f else 0.3f) } + // Mark tiles in air units attack range as RED + if (isAirUnit) { + val tilesInAirAttackRange = unit.getTile().getTilesInDistance(unit.getRange()) + for (tile in tilesInAirAttackRange) { + val tileToColor = tileGroups.getValue(tile) + tileToColor.showCircle(Color.RED, 0.3f) + } + } + val attackableTiles: List = if (unit.type.isCivilian()) listOf() else { BattleHelper.getAttackableEnemies(unit, unit.movement.getDistanceToTiles())