1 files changed, 29 insertions, 0 deletions

diff --git a/src/ch/epfl/xblast/client/KeyboardEventHandler.java b/src/ch/epfl/xblast/client/KeyboardEventHandler.java
index 2060959..ab64c80 100644
--- a/src/ch/epfl/xblast/client/KeyboardEventHandler.java
+++ b/src/ch/epfl/xblast/client/KeyboardEventHandler.java
@@ -5,6 +5,8 @@ import ch.epfl.xblast.PlayerAction;
 
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -17,6 +19,24 @@ import java.util.function.Consumer;
  */
 public class KeyboardEventHandler extends KeyAdapter {
 
+    /**
+     * The default key->action mapping.
+     */
+    private static final Map<Integer, PlayerAction> DEFAULT_KEY_MAP = buildDefaultKeyMap();
+
+    private static Map<Integer, PlayerAction> buildDefaultKeyMap() {
+        Map<Integer, PlayerAction> playerActionMap = new HashMap<>();
+
+        playerActionMap.put(KeyEvent.VK_UP, PlayerAction.MOVE_N);
+        playerActionMap.put(KeyEvent.VK_RIGHT, PlayerAction.MOVE_E);
+        playerActionMap.put(KeyEvent.VK_DOWN, PlayerAction.MOVE_S);
+        playerActionMap.put(KeyEvent.VK_LEFT, PlayerAction.MOVE_W);
+        playerActionMap.put(KeyEvent.VK_SPACE, PlayerAction.DROP_BOMB);
+        playerActionMap.put(KeyEvent.VK_SHIFT, PlayerAction.STOP);
+
+        return Collections.unmodifiableMap(playerActionMap);
+    }
+
     private final Map<Integer, PlayerAction> playerActionMap;
     private final Consumer<PlayerAction> consumer;
 
@@ -32,6 +52,15 @@ public class KeyboardEventHandler extends KeyAdapter {
     }
 
     /**
+     * Instantiates a new KeyboardEventHandler with the default key mapping.
+     *
+     * @param consumer consumer related to the EventHandler
+     */
+    public KeyboardEventHandler(Consumer<PlayerAction> consumer) {
+        this(DEFAULT_KEY_MAP, consumer);
+    }
+
+    /**
      * Executes the command related to the given key code.
      *
      * @param e event (pressed key)