mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-03 14:15:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

Water units can no longer see over hills etc.

Browse Source
This commit is contained in:
Yair Morgenstern 2020-03-05 23:37:58 +02:00
parent 5117a498f9
commit 585ec2b723
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/automation/BattleHelper.kt
View File

@ -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 }

2
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -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
}

4
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -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)

5
core/src/com/unciv/logic/map/TileMap.kt
View File

@ -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()