From f27f036e28d501bed5c42403fdc6811e03d12051 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 14 Dec 2020 11:39:05 +0200
Subject: [PATCH] Resolved #3378 - AI no longer tries to heal units in
 dangerous tiles - by nob0dy73

---
 .../unciv/logic/automation/UnitAutomation.kt  | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt
index 50546fb204..20b4c4ef13 100644
--- a/core/src/com/unciv/logic/automation/UnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt
@@ -175,7 +175,6 @@ object UnitAutomation {
             return false // will heal anyway, and attacks don't hurt
 
         val unitDistanceToTiles = unit.movement.getDistanceToTiles()
-        val tilesInDistance = unitDistanceToTiles.keys.filter { unit.movement.canMoveTo(it) }
         if (unitDistanceToTiles.isEmpty()) return true // can't move, so...
 
 
@@ -183,10 +182,26 @@ object UnitAutomation {
 
         if (tryPillageImprovement(unit)) return true
 
-        val tilesByHealingRate = tilesInDistance.groupBy { unit.rankTileForHealing(it) }
+
+        val tilesWithRangedEnemyUnits = unit.currentTile.getTilesInDistance(3)
+                .flatMap { it.getUnits().filter { unit.civInfo.isAtWarWith(it.civInfo) } }
+
+        val tilesInRangeOfAttack = tilesWithRangedEnemyUnits
+                .flatMap { it.getTile().getTilesInDistance(it.getRange()) }
+
+        val tilesWithinBomardmentRange = unit.currentTile.getTilesInDistance(3)
+                .filter { it.isCityCenter() && it.getCity()!!.civInfo.isAtWarWith(unit.civInfo) }
+                .flatMap { it.getTilesInDistance(it.getCity()!!.range) }
+
+        val dangerousTiles = (tilesInRangeOfAttack + tilesWithinBomardmentRange).toHashSet()
+
+
+        val viableTilesForHealing = unitDistanceToTiles.keys
+                .filter { it !in dangerousTiles && unit.movement.canMoveTo(it) }
+        val tilesByHealingRate = viableTilesForHealing.groupBy { unit.rankTileForHealing(it) }
 
         if (tilesByHealingRate.keys.none { it != 0 }) { // We can't heal here at all! We're probably embarked
-            val reachableCityTile = unit.civInfo.cities.map { it.getCenterTile() }
+            val reachableCityTile = unit.civInfo.cities.asSequence().map { it.getCenterTile() }
                     .sortedBy { it.aerialDistanceTo(unit.currentTile) }
                     .firstOrNull { unit.movement.canReach(it) }
             if (reachableCityTile != null) unit.movement.headTowards(reachableCityTile)
@@ -194,13 +209,7 @@ object UnitAutomation {
             return true
         }
 
-        var bestTilesForHealing = tilesByHealingRate.maxBy { it.key }!!.value
-        // within the tiles with best healing rate (say 15), we'll prefer one which has the highest defensive bonuses
-        val bestTilesWithoutBombardableTiles = bestTilesForHealing.filterNot {
-            it.getTilesInDistance(2)
-                    .any { it.isCityCenter() && it.getOwner()!!.isAtWarWith(unit.civInfo) }
-        }
-        if (bestTilesWithoutBombardableTiles.any()) bestTilesForHealing = bestTilesWithoutBombardableTiles
+        val bestTilesForHealing = tilesByHealingRate.maxBy { it.key }!!.value
         val bestTileForHealing = bestTilesForHealing.maxBy { it.getDefensiveBonus() }!!
         val bestTileForHealingRank = unit.rankTileForHealing(bestTileForHealing)