From 585ec2b7230c012903ad683e40efc74faf99884d Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 5 Mar 2020 23:37:58 +0200
Subject: [PATCH] Water units can no longer see over hills etc.

---
 core/src/com/unciv/logic/automation/BattleHelper.kt | 2 +-
 core/src/com/unciv/logic/map/MapUnit.kt             | 2 +-
 core/src/com/unciv/logic/map/TileInfo.kt            | 4 ++--
 core/src/com/unciv/logic/map/TileMap.kt             | 5 +----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/src/com/unciv/logic/automation/BattleHelper.kt b/core/src/com/unciv/logic/automation/BattleHelper.kt
index 91e2cca579..ed6046b75e 100644
--- a/core/src/com/unciv/logic/automation/BattleHelper.kt
+++ b/core/src/com/unciv/logic/automation/BattleHelper.kt
@@ -63,7 +63,7 @@ class BattleHelper {
             val tilesInAttackRange =
                     if (unit.hasUnique("Ranged attacks may be performed over obstacles") || unit.type.isAirUnit())
                         reachableTile.getTilesInDistance(rangeOfAttack)
-                    else reachableTile.getViewableTilesList(rangeOfAttack, unit.type.isWaterUnit())
+                    else reachableTile.getViewableTilesList(rangeOfAttack)
                             .asSequence()
 
             attackableTiles += tilesInAttackRange.filter { it in tilesWithEnemies }
diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt
index 2c5de0e1a1..031506c258 100644
--- a/core/src/com/unciv/logic/map/MapUnit.kt
+++ b/core/src/com/unciv/logic/map/MapUnit.kt
@@ -161,7 +161,7 @@ class MapUnit {
             val tile = getTile()
             if (tile.baseTerrain == Constants.hill && type.isLandUnit()) visibilityRange += 1
 
-            viewableTiles = tile.getViewableTilesList(visibilityRange, type.isWaterUnit())
+            viewableTiles = tile.getViewableTilesList(visibilityRange)
         }
         civInfo.updateViewableTiles() // for the civ
     }
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
index 9743b8ad79..ec424af8e1 100644
--- a/core/src/com/unciv/logic/map/TileInfo.kt
+++ b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -262,8 +262,8 @@ open class TileInfo {
     fun hasViewableResource(civInfo: CivilizationInfo): Boolean =
             resource != null && (getTileResource().revealedBy == null || civInfo.tech.isResearched(getTileResource().revealedBy!!))
 
-    fun getViewableTilesList(distance:Int, ignoreCurrentTileHeight: Boolean): List<TileInfo> =
-            tileMap.getViewableTiles(position, distance, ignoreCurrentTileHeight)
+    fun getViewableTilesList(distance:Int): List<TileInfo> =
+            tileMap.getViewableTiles(position, distance)
 
     fun getTilesInDistance(distance: Int): Sequence<TileInfo> =
             tileMap.getTilesInDistance(position,distance)
diff --git a/core/src/com/unciv/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt
index 48977a7600..b97ff99f3c 100644
--- a/core/src/com/unciv/logic/map/TileMap.kt
+++ b/core/src/com/unciv/logic/map/TileMap.kt
@@ -177,10 +177,7 @@ class TileMap {
     }
 
 
-    fun getViewableTiles(position: Vector2, sightDistance: Int, ignoreCurrentTileHeight: Boolean)
-            : List<TileInfo> {
-        if (ignoreCurrentTileHeight) return getTilesInDistance(position, sightDistance).toList()
-
+    fun getViewableTiles(position: Vector2, sightDistance: Int): List<TileInfo> {
         val viewableTiles = getTilesInDistance(position, 1).toMutableList()
         val currentTileHeight = get(position).getHeight()