diff --git a/src/main/java/forge/control/KeyboardShortcuts.java b/src/main/java/forge/control/KeyboardShortcuts.java index 38b4bcc3e57..1b041e16f88 100644 --- a/src/main/java/forge/control/KeyboardShortcuts.java +++ b/src/main/java/forge/control/KeyboardShortcuts.java @@ -111,6 +111,24 @@ public class KeyboardShortcuts { } }; + /** Alpha Strike. */ + final Action actAllAttack = new AbstractAction() { + @Override + public void actionPerformed(final ActionEvent e) { + if (Singletons.getControl().getState() != 1) { return; } + CDock.SINGLETON_INSTANCE.alphaStrike(); + } + }; + + /** Targeting visualization overlay. */ + final Action actTgtOverlay = new AbstractAction() { + @Override + public void actionPerformed(final ActionEvent e) { + if (Singletons.getControl().getState() != 1) { return; } + CDock.SINGLETON_INSTANCE.toggleTargeting(); + } + }; + //========== Instantiate shortcut objects and add to list. list.add(new Shortcut(FPref.SHORTCUT_SHOWSTACK, "Match: show stack panel", actShowStack, am, im)); list.add(new Shortcut(FPref.SHORTCUT_SHOWCOMBAT, "Match: show combat panel", actShowCombat, am, im)); @@ -119,6 +137,8 @@ public class KeyboardShortcuts { list.add(new Shortcut(FPref.SHORTCUT_SHOWDEV, "Match: show dev panel", actShowDev, am, im)); list.add(new Shortcut(FPref.SHORTCUT_CONCEDE, "Match: concede game", actConcede, am, im)); list.add(new Shortcut(FPref.SHORTCUT_ENDTURN, "Match: pass priority until EOT or next stack event", actEndTurn, am, im)); + list.add(new Shortcut(FPref.SHORTCUT_ALPHASTRIKE, "Match: Alpha Strike (attack with all available)", actAllAttack, am, im)); + list.add(new Shortcut(FPref.SHORTCUT_SHOWTARGETING, "Match: toggle targeting visual overlay", actTgtOverlay, am, im)); return list; } // End initMatchShortcuts() diff --git a/src/main/java/forge/properties/ForgePreferences.java b/src/main/java/forge/properties/ForgePreferences.java index b0dc108eca5..ccdf9f99d09 100644 --- a/src/main/java/forge/properties/ForgePreferences.java +++ b/src/main/java/forge/properties/ForgePreferences.java @@ -121,7 +121,9 @@ public class ForgePreferences { SHORTCUT_SHOWPLAYERS ("80"), /** */ SHORTCUT_SHOWDEV ("68"), /** */ SHORTCUT_CONCEDE ("17"), /** */ - SHORTCUT_ENDTURN ("69"); + SHORTCUT_ENDTURN ("69"), /** */ + SHORTCUT_ALPHASTRIKE ("65"), /** */ + SHORTCUT_SHOWTARGETING ("84"); private final String strDefaultVal;