From 28d0ad4838e09f7ac4aa5c4912e94eb7589ccb56 Mon Sep 17 00:00:00 2001 From: HoneySkull Date: Thu, 11 Jan 2024 20:31:39 -0600 Subject: [PATCH 1/2] On aero evade button, automatically undo illegal before applying. --- megamek/src/megamek/client/ui/swing/MovementDisplay.java | 1 + 1 file changed, 1 insertion(+) diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java index 137d5af1c94..56330183b0e 100644 --- a/megamek/src/megamek/client/ui/swing/MovementDisplay.java +++ b/megamek/src/megamek/client/ui/swing/MovementDisplay.java @@ -5090,6 +5090,7 @@ public synchronized void actionPerformed(ActionEvent ev) { ready(); } } else if (actionCmd.equals(MoveCommand.MOVE_EVADE_AERO.getCmd())) { + removeIllegalSteps(); addStepToMovePath(MoveStepType.EVADE); setEvadeAeroEnabled(false); } else if (actionCmd.equals(MoveCommand.MOVE_ROLL.getCmd())) { From a4b93f92c678dba10c4480285158604533ab5936 Mon Sep 17 00:00:00 2001 From: HoneySkull Date: Thu, 11 Jan 2024 20:47:57 -0600 Subject: [PATCH 2/2] Add Ctrl-Backspace to Movement Phase keyboard shortcuts panel. --- .../megamek/client/ui/swing/boardview/KeyBindingsOverlay.java | 1 + 1 file changed, 1 insertion(+) diff --git a/megamek/src/megamek/client/ui/swing/boardview/KeyBindingsOverlay.java b/megamek/src/megamek/client/ui/swing/boardview/KeyBindingsOverlay.java index 67adf25cb57..2401d6fb5c9 100644 --- a/megamek/src/megamek/client/ui/swing/boardview/KeyBindingsOverlay.java +++ b/megamek/src/megamek/client/ui/swing/boardview/KeyBindingsOverlay.java @@ -47,6 +47,7 @@ public class KeyBindingsOverlay extends AbstractBoardViewOverlay { private static final List BINDS_MOVE = Arrays.asList( KeyCommandBind.TOGGLE_MOVEMODE, KeyCommandBind.UNDO_LAST_STEP, + KeyCommandBind.UNDO_ILLEGAL_STEPS, KeyCommandBind.TOGGLE_CONVERSIONMODE, KeyCommandBind.DONE_NO_ACTION );