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

Stop Exploration sets unit.action to null (#1613)

Browse Source 
* Stop Exploration sets unit.action to null

* UnitActions callback Fix #1614
This commit is contained in:
r3versi
2020-01-04 20:08:23 +01:00
committed by Yair Morgenstern
parent 2af847b3a6
commit 23cfab6001
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -25,7 +25,11 @@ class UnitActions {
val actionList = ArrayList<UnitAction>()
if (unit.action != null && unit.action!!.startsWith("moveTo")) {
actionList += UnitAction(name = "Stop movement", canAct = true)
actionList += UnitAction(
name = "Stop movement",
canAct = true,
action = { unit.action = null }
)
}
val workingOnImprovement = unit.hasUnique("Can build improvements on tiles") && unit.currentTile.hasImprovementInProgress()
@ -70,7 +74,11 @@ class UnitActions {
unit.action = Constants.unitActionExplore
})
} else {
actionList += UnitAction(name = "Stop exploration", canAct = true)
actionList += UnitAction(
name = "Stop exploration",
canAct = true,
action = { unit.action = null }
)
}
}
@ -167,7 +175,11 @@ class UnitActions {
})
if (Constants.unitActionAutomation == unit.action) {
actionList += UnitAction(name = "Stop automation", canAct = true)
actionList += UnitAction(
name = "Stop automation",
canAct = true,
action = { unit.action = null }
)
} else {
actionList += UnitAction(
name = "Automate",