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

When aa unit that was moving towards somewhere encounters an enemy unit within walking distance, it stops the movement that it had completely

Browse Source
This commit is contained in:
Yair Morgenstern
2018-07-01 17:10:52 +03:00
parent 4593bed7dc
commit 67b9b7ea7a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,10 @@ class MapUnit {
val enemyUnitsInWalkingDistance = getDistanceToTiles().keys val enemyUnitsInWalkingDistance = getDistanceToTiles().keys
.filter { it.militaryUnit!=null && it.militaryUnit!!.civInfo!=civInfo } .filter { it.militaryUnit!=null && it.militaryUnit!!.civInfo!=civInfo }
if(enemyUnitsInWalkingDistance.isNotEmpty()) return // Don't you dare move. if(enemyUnitsInWalkingDistance.isNotEmpty()) {
if (action != null && action!!.startsWith("moveTo")) action=null
return // Don't you dare move.
}
if (action != null && action!!.startsWith("moveTo")) { if (action != null && action!!.startsWith("moveTo")) {
val destination = action!!.replace("moveTo ", "").split(",").dropLastWhile { it.isEmpty() }.toTypedArray() val destination = action!!.replace("moveTo ", "").split(",").dropLastWhile { it.isEmpty() }.toTypedArray()