AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 07:21:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Solved "quantum tunneling" bug for new movement algorithm

Browse Source
This commit is contained in:
Yair Morgenstern 2021-02-06 19:41:51 +02:00
parent b0bf18afa0
commit 4d0f66e159
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,7 +299,8 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
val distanceToTiles = getDistanceToTiles() val distanceToTiles = getDistanceToTiles()
val pathToDestination = distanceToTiles.getPathToTile(destination) val pathToDestination = distanceToTiles.getPathToTile(destination)
val lastReachableTile = pathToDestination.last { canMoveTo(it) } val movableTiles = pathToDestination.takeWhile { canPassThrough(it) }
val lastReachableTile = movableTiles.last { canMoveTo(it) }
val pathToLastReachableTile = distanceToTiles.getPathToTile(lastReachableTile) val pathToLastReachableTile = distanceToTiles.getPathToTile(lastReachableTile)
if (!unit.civInfo.gameInfo.gameParameters.godMode) { if (!unit.civInfo.gameInfo.gameParameters.godMode) {
@ -419,7 +420,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
if (!canPassThrough(tile)) if (!canPassThrough(tile))
return false return false
if(tile.isCityCenter() && tile.getOwner()!=unit.civInfo) return false // even if they'll let us pass through, we can't enter their city if (tile.isCityCenter() && tile.getOwner() != unit.civInfo) return false // even if they'll let us pass through, we can't enter their city
if (unit.type.isCivilian()) if (unit.type.isCivilian())
return tile.civilianUnit == null && (tile.militaryUnit == null || tile.militaryUnit!!.owner == unit.owner) return tile.civilianUnit == null && (tile.militaryUnit == null || tile.militaryUnit!!.owner == unit.owner)