From 4f727df216c5119776156169ab09ed4a3e460cde Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 9 Aug 2018 21:04:25 +0300
Subject: [PATCH] Added crosshair image on attackable enemies

---
 android/assets/OtherIcons/Crosshair.png       | Bin 0 -> 4415 bytes
 .../unciv/logic/map/UnitMovementAlgorithms.kt |   2 +-
 core/src/com/unciv/ui/tilegroups/TileGroup.kt |  18 ++++++++++++++++++
 .../com/unciv/ui/worldscreen/TileMapHolder.kt |   7 +++++--
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 android/assets/OtherIcons/Crosshair.png

diff --git a/android/assets/OtherIcons/Crosshair.png b/android/assets/OtherIcons/Crosshair.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf35e244da73acddcb0cbfa991d244383bf3163f
GIT binary patch
literal 4415
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
V=ykg)X7YRkV5n=VQ>*2c@E<r6U+Mq=

literal 0
HcmV?d00001

diff --git a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
index 580ae49b8d..8471314e56 100644
--- a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
+++ b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
@@ -40,7 +40,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
                     val isOwnedByEnemy = neighborOwner!=null && neighborOwner!=unit.civInfo
                     if ((isOwnedByEnemy && neighbor.isCityCenter())// Enemy city,
                             || (neighbor.getUnits().isNotEmpty() && neighbor.getUnits().first().civInfo!=unit.civInfo) // Enemy unit
-                        || (isOwnedByEnemy && !unit.civInfo.canEnterTiles(neighborOwner!!))
+                        || (isOwnedByEnemy && !unit.civInfo.canEnterTiles(neighborOwner!!)) // enemyTile
                     )
                         totalDistanceToTile = unitMovement // Can't go here.
                     // The reason that we don't just "return" is so that when calculating how to reach an enemy,
diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
index 83e29772a0..db909bdc99 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
@@ -27,6 +27,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     protected var civilianUnitImage: Group? = null
     protected var militaryUnitImage: Group? = null
     private val circleImage = ImageGetter.getImage("OtherIcons/Circle.png") // for blue and red circles on the tile
+    private val crosshairImage = ImageGetter.getImage("OtherIcons/Crosshair.png") // for blue and red circles on the tile
     private val fogImage = ImageGetter.getImage("TerrainIcons/Fog.png")
     var yieldGroup = YieldGroup()
 
@@ -41,6 +42,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         addHexagon(groupSize)
         addCircleImage()
         addFogImage()
+        addCrosshairImage()
     }
 
     private fun addCircleImage() {
@@ -59,6 +61,19 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         addActor(fogImage)
     }
 
+    private fun addCrosshairImage(){
+        crosshairImage.width=70f
+        crosshairImage.height=70f
+        crosshairImage.center(this)
+        crosshairImage.isVisible=false
+        crosshairImage.color= Color.WHITE.cpy().apply { a=0.5f }
+        addActor(crosshairImage)
+    }
+
+    fun showCrosshair(){
+        crosshairImage.isVisible=true
+    }
+
     private fun addHexagon(groupSize: Float) {
         val imageScale = groupSize * 1.5f / hexagon.width
         hexagon.setScale(imageScale)
@@ -107,6 +122,9 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         updateRoadImages()
         updateBorderImages()
 
+        crosshairImage.toFront()
+        crosshairImage.isVisible=false
+
         fogImage.toFront()
         fogImage.isVisible=!(isViewable || UnCivGame.Current.viewEntireMapForDebug)
     }
diff --git a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
index ed4f10d66e..59b3cbb641 100644
--- a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
+++ b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
@@ -96,7 +96,7 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
             if((playerViewableTiles.contains(WG.tileInfo) || UnCivGame.Current.viewEntireMapForDebug)
                     && unitsInTile.isNotEmpty() && unitsInTile.first().civInfo!=civInfo)
                 WG.showCircle(Color.RED)
-        } // Display ALL viewable enemies ewith a red circle so that users don't need to go "hunting" for enemy units
+        } // Display ALL viewable enemies with a red circle so that users don't need to go "hunting" for enemy units
 
         if(worldScreen.bottomBar.unitTable.selectedUnit!=null){
             val unit = worldScreen.bottomBar.unitTable.selectedUnit!!
@@ -118,7 +118,10 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
                         && it.getUnits().first().owner != unit.owner
                         && (playerViewableTiles.contains(it) || UnCivGame.Current.viewEntireMapForDebug)}) {
                 if(unit.getBaseUnit().unitType== UnitType.Civilian) tileGroups[tile]!!.hideCircle()
-                else tileGroups[tile]!!.showCircle(colorFromRGB(237, 41, 57))
+                else {
+                    tileGroups[tile]!!.showCircle(colorFromRGB(237, 41, 57))
+                    tileGroups[tile]!!.showCrosshair()
+                }
             }
         }