From 4b047794631f591f0a30bdb36bb1faf3eaf52504 Mon Sep 17 00:00:00 2001
From: FatCatX <garretsimpson@yahoo.com>
Date: Fri, 4 Jun 2021 19:31:32 -0700
Subject: [PATCH] Revert "Filter out shifted key presses."

This reverts commit 7dfe867de5b6c482e0a02dd3d3a4d94ef054ec10.
---
 src/js/core/input_distributor.js     | 2 --
 src/js/core/modal_dialog_elements.js | 5 ++---
 src/js/game/key_action_mapper.js     | 8 +++-----
 src/js/states/keybindings.js         | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/js/core/input_distributor.js b/src/js/core/input_distributor.js
index 67fec90e..03ad8e0c 100644
--- a/src/js/core/input_distributor.js
+++ b/src/js/core/input_distributor.js
@@ -210,7 +210,6 @@ export class InputDistributor {
             this.forwardToReceiver("keydown", {
                 keyCode: keyCode,
                 shift: event.shiftKey,
-                ctrl: event.ctrlKey,
                 alt: event.altKey,
                 initial: isInitial,
                 event,
@@ -237,7 +236,6 @@ export class InputDistributor {
         this.forwardToReceiver("keyup", {
             keyCode: keyCode,
             shift: event.shiftKey,
-            ctrl: event.ctrlKey,
             alt: event.altKey,
         });
     }
diff --git a/src/js/core/modal_dialog_elements.js b/src/js/core/modal_dialog_elements.js
index 1d6d9e32..893cd223 100644
--- a/src/js/core/modal_dialog_elements.js
+++ b/src/js/core/modal_dialog_elements.js
@@ -89,10 +89,9 @@ export class Dialog {
      * @param {object} param0
      * @param {number} param0.keyCode
      * @param {boolean} param0.shift
-     * @param {boolean} param0.ctrl
      * @param {boolean} param0.alt
      */
-    handleKeydown({ keyCode, shift, ctrl, alt }) {
+    handleKeydown({ keyCode, shift, alt }) {
         if (keyCode === kbEnter && this.enterHandler) {
             this.internalButtonHandler(this.enterHandler);
             return STOP_PROPAGATION;
@@ -319,7 +318,7 @@ export class DialogOptionChooser extends Dialog {
                 <div class='option ${value === options.active ? "active" : ""} ${
                 iconPrefix ? "hasIcon" : ""
             }' data-optionvalue='${value}'>
-                    ${iconHtml}
+                    ${iconHtml}    
                     <span class='title'>${text}</span>
                     ${descHtml}
                 </div>
diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js
index acd66180..090b8b83 100644
--- a/src/js/game/key_action_mapper.js
+++ b/src/js/game/key_action_mapper.js
@@ -458,18 +458,17 @@ export class KeyActionMapper {
      * @param {object} param0
      * @param {number} param0.keyCode
      * @param {boolean} param0.shift
-     * @param {boolean} param0.ctrl
      * @param {boolean} param0.alt
      * @param {boolean=} param0.initial
      */
-    handleKeydown({ keyCode, shift, ctrl, alt, initial }) {
+    handleKeydown({ keyCode, shift, alt, initial }) {
         let stop = false;
 
         // Find mapping
         for (const key in this.keybindings) {
             /** @type {Keybinding} */
             const binding = this.keybindings[key];
-            if (binding.keyCode === keyCode && !shift && !ctrl && !alt && (initial || binding.repeated)) {
+            if (binding.keyCode === keyCode && (initial || binding.repeated)) {
                 /** @type {Signal} */
                 const signal = this.keybindings[key].signal;
                 if (signal.dispatch() === STOP_PROPAGATION) {
@@ -488,10 +487,9 @@ export class KeyActionMapper {
      * @param {object} param0
      * @param {number} param0.keyCode
      * @param {boolean} param0.shift
-     * @param {boolean} param0.ctrl
      * @param {boolean} param0.alt
      */
-    handleKeyup({ keyCode, shift, ctrl, alt }) {
+    handleKeyup({ keyCode, shift, alt }) {
         // Empty
     }
 
diff --git a/src/js/states/keybindings.js b/src/js/states/keybindings.js
index e049c0ae..a01629f1 100644
--- a/src/js/states/keybindings.js
+++ b/src/js/states/keybindings.js
@@ -19,7 +19,7 @@ export class KeybindingsState extends TextualGameState {
             <div class="topEntries">
                 <span class="hint">${T.keybindings.hint}</span>
                 <button class="styledButton resetBindings">${T.keybindings.resetKeybindings}</button>
-
+            
             </div>
 
             <div class="keybindings">
@@ -89,7 +89,7 @@ export class KeybindingsState extends TextualGameState {
             type: "info",
         });
 
-        dialog.inputReciever.keydown.add(({ keyCode, shift, ctrl, alt, event }) => {
+        dialog.inputReciever.keydown.add(({ keyCode, shift, alt, event }) => {
             if (keyCode === 27) {
                 this.dialogs.closeDialog(dialog);
                 return;