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

Resolved #1230 - sleeping units wake up if there's an enemy nearby

Browse Source
This commit is contained in:
Yair Morgenstern
2019-10-26 21:18:17 +03:00
parent 8151476806
commit ba33e2266d
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,6 +384,13 @@ class MapUnit {
currentMovement = getMaxMovement().toFloat() currentMovement = getMaxMovement().toFloat()
attacksThisTurn=0 attacksThisTurn=0
due = true due = true
// Wake sleeping units if there's an enemy nearby
if(action==Constants.unitActionSleep && currentTile.getTilesInDistance(2).any {
it.militaryUnit!=null && it.militaryUnit!!.civInfo.isAtWarWith(civInfo)
})
action=null
val tileOwner = getTile().getOwner() val tileOwner = getTile().getOwner()
if(tileOwner!=null && !civInfo.canEnterTiles(tileOwner) && !tileOwner.isCityState()) // if an enemy city expanded onto this tile while I was in it if(tileOwner!=null && !civInfo.canEnterTiles(tileOwner) && !tileOwner.isCityState()) // if an enemy city expanded onto this tile while I was in it
movement.teleportToClosestMoveableTile() movement.teleportToClosestMoveableTile()