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

Better order of unit actions

Browse Source
This commit is contained in:
Yair Morgenstern
2023-03-05 11:03:58 +02:00
parent cc8bfa605f
commit c049721531
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt
View File

@ -41,23 +41,6 @@ object UnitActions {
val tile = unit.getTile() val tile = unit.getTile()
val actionList = ArrayList<UnitAction>() val actionList = ArrayList<UnitAction>()
if (unit.isMoving())
actionList += UnitAction(UnitActionType.StopMovement) { unit.action = null }
if (unit.isExploring())
actionList += UnitAction(UnitActionType.StopExploration) { unit.action = null }
if (unit.isAutomated())
actionList += UnitAction(UnitActionType.StopAutomation) { unit.action = null }
addSleepActions(actionList, unit, false)
addFortifyActions(actionList, unit, false)
addPromoteAction(unit, actionList)
UnitActionsUpgrade.addUnitUpgradeAction(unit, actionList)
UnitActionsPillage.addPillageAction(unit, actionList)
addExplorationActions(unit, actionList)
addWaitAction(unit, actionList)
addToggleActionsAction(unit, actionList)
// Determined by unit uniques // Determined by unit uniques
addTransformAction(unit, actionList) addTransformAction(unit, actionList)
addParadropAction(unit, actionList) addParadropAction(unit, actionList)
@ -76,6 +59,26 @@ object UnitActions {
addTriggerUniqueActions(unit, actionList) addTriggerUniqueActions(unit, actionList)
addAddInCapitalAction(unit, actionList, tile) addAddInCapitalAction(unit, actionList, tile)
if (unit.isMoving())
actionList += UnitAction(UnitActionType.StopMovement) { unit.action = null }
if (unit.isExploring())
actionList += UnitAction(UnitActionType.StopExploration) { unit.action = null }
if (unit.isAutomated())
actionList += UnitAction(UnitActionType.StopAutomation) { unit.action = null }
addPromoteAction(unit, actionList)
UnitActionsUpgrade.addUnitUpgradeAction(unit, actionList)
UnitActionsPillage.addPillageAction(unit, actionList)
addSleepActions(actionList, unit, false)
addFortifyActions(actionList, unit, false)
if (unit.isMilitary()) addExplorationActions(unit, actionList)
addWaitAction(unit, actionList)
addToggleActionsAction(unit, actionList)
return actionList return actionList
} }
@ -89,6 +92,7 @@ object UnitActions {
addSwapAction(unit, actionList) addSwapAction(unit, actionList)
addDisbandAction(actionList, unit) addDisbandAction(actionList, unit)
addGiftAction(unit, actionList, tile) addGiftAction(unit, actionList, tile)
if (unit.isCivilian()) addExplorationActions(unit, actionList)
addToggleActionsAction(unit, actionList) addToggleActionsAction(unit, actionList)