mirror of
https://github.com/yairm210/Unciv.git
synced 2025-01-07 14:02:48 +07:00
Automated air units no longer lose "automated" state after moving between cities
This commit is contained in:
parent
7748b3f358
commit
6be79671f3
@ -7,6 +7,7 @@ import com.unciv.logic.map.BFS
|
||||
import com.unciv.logic.map.HexMath.getDistance
|
||||
import com.unciv.logic.map.tile.RoadStatus
|
||||
import com.unciv.logic.map.tile.Tile
|
||||
import com.unciv.models.UnitActionType
|
||||
import com.unciv.models.helpers.UnitMovementMemoryType
|
||||
import com.unciv.models.ruleset.unique.StateForConditionals
|
||||
import com.unciv.models.ruleset.unique.UniqueType
|
||||
@ -528,7 +529,7 @@ class UnitMovement(val unit: MapUnit) {
|
||||
|
||||
|
||||
if (unit.baseUnit.movesLikeAirUnits()) { // air units move differently from all other units
|
||||
unit.action = null
|
||||
if (unit.action != UnitActionType.Automate.value) unit.action = null
|
||||
unit.removeFromTile()
|
||||
unit.isTransported = false // it has left the carrier by own means
|
||||
unit.putInTile(destination)
|
||||
|
Loading…
Reference in New Issue
Block a user