Fix: Missing binds in settings

resources/lang/en.json

@@ -741,6 +741,8 @@
     "view_options": "View Options",
     "toggle_view": "Toggle View",
     "toggle_view_desc": "Alternate view (terrain/countries)",
+    "reset_gfx": "Reset Graphics",
+    "reset_gfx_desc": "Reset / refresh the graphics renderer.",
     "build_controls": "Build Controls",
     "build_city": "Build City",
     "build_city_desc": "Build a City under your cursor.",
@@ -767,6 +769,8 @@
     "build_menu_modifier_desc": "Hold this key while clicking to open the build menu.",
     "emoji_menu_modifier": "Emoji Menu Modifier",
     "emoji_menu_modifier_desc": "Hold this key while clicking to open the emoji menu.",
+    "shift_key": "Warship Box Select",
+    "shift_key_desc": "Hold this key and drag to draw a selection box that selects all warships within it.",
     "pause_game": "Pause",
     "pause_game_desc": "Pause or resume the game (single player and custom games for host).",
     "game_speed_up": "Game Speed Up",
@@ -794,6 +798,8 @@
     "break_alliance_desc": "Break alliance with the player whose tile is under your cursor.",
     "swap_direction": "Swap Rocket Direction",
     "swap_direction_desc": "Toggle rocket launch direction (up/down).",
+    "select_all_warships": "Select All Warships",
+    "select_all_warships_desc": "Select all your warships at once.",
     "zoom_controls": "Zoom Controls",
     "zoom_out": "Zoom Out",
     "zoom_out_desc": "Zoom out the map",

src/client/InputHandler.ts

@@ -482,8 +482,7 @@ export class InputHandler {
         this.eventBus.emit(new AlternateViewEvent(false));
       }
 
-      const resetKey = this.keybinds.resetGfx ?? "KeyR";
-      if (e.code === resetKey && this.isAltKeyHeld(e)) {
+      if (this.keybindMatchesEvent(e, this.keybinds.resetGfx ?? "Alt+KeyR")) {
         e.preventDefault();
         this.eventBus.emit(new RefreshGraphicsEvent());
       }
@@ -854,24 +853,36 @@ export class InputHandler {
   }
 
   /**
-   * Parses a keybind value that may include a "Shift+" prefix.
-   * e.g. "Shift+KeyB" → { shift: true, code: "KeyB" }
-   *      "KeyB"       → { shift: false, code: "KeyB" }
+   * Parses a keybind value that may include a "Shift+" or "Alt+" prefix.
+   * e.g. "Shift+KeyB" → { shift: true, alt: false, code: "KeyB" }
+   *      "Alt+KeyR"   → { shift: false, alt: true, code: "KeyR" }
+   *      "KeyB"       → { shift: false, alt: false, code: "KeyB" }
    */
-  private parseKeybind(value: string): { shift: boolean; code: string } {
+  private parseKeybind(value: string): {
+    shift: boolean;
+    alt: boolean;
+    code: string;
+  } {
     if (value?.startsWith("Shift+")) {
-      return { shift: true, code: value.slice(6) };
+      return { shift: true, alt: false, code: value.slice(6) };
     }
-    return { shift: false, code: value };
+    if (value?.startsWith("Alt+")) {
+      return { shift: false, alt: true, code: value.slice(4) };
+    }
+    return { shift: false, alt: false, code: value };
   }
 
   /**
    * Returns true if the keyboard event matches the given keybind value,
-   * including optional Shift+ prefix support.
+   * including optional Shift+ and Alt+ prefix support.
    */
   private keybindMatchesEvent(e: KeyboardEvent, keybindValue: string): boolean {
     const parsed = this.parseKeybind(keybindValue);
-    return e.code === parsed.code && e.shiftKey === parsed.shift;
+    return (
+      e.code === parsed.code &&
+      e.shiftKey === parsed.shift &&
+      e.altKey === parsed.alt
+    );
   }
 
   /**

src/client/UserSettingModal.ts

@@ -91,7 +91,6 @@ export class UserSettingModal extends BaseModal {
         activeKeybinds[k] = normalizedValue;
       }
     }
-
     const values = Object.entries(activeKeybinds)
       .filter(([k]) => k !== action)
       .map(([, v]) => v);
@@ -401,6 +400,16 @@ export class UserSettingModal extends BaseModal {
         @change=${this.handleKeybindChange}
       ></setting-keybind>
 
+      <setting-keybind
+        action="resetGfx"
+        label=${translateText("user_setting.reset_gfx")}
+        description=${translateText("user_setting.reset_gfx_desc")}
+        .defaultKey=${this.defaultKeybinds.resetGfx}
+        .value=${this.getKeyValue("resetGfx")}
+        .display=${this.getKeyChar("resetGfx")}
+        @change=${this.handleKeybindChange}
+      ></setting-keybind>
+
       <h2
         class="text-blue-200 text-xl font-bold mt-8 mb-3 border-b border-white/10 pb-2"
       >
@@ -639,6 +648,26 @@ export class UserSettingModal extends BaseModal {
         @change=${this.handleKeybindChange}
       ></setting-keybind>
 
+      <setting-keybind
+        action="selectAllWarships"
+        label=${translateText("user_setting.select_all_warships")}
+        description=${translateText("user_setting.select_all_warships_desc")}
+        .defaultKey=${this.defaultKeybinds.selectAllWarships}
+        .value=${this.getKeyValue("selectAllWarships")}
+        .display=${this.getKeyChar("selectAllWarships")}
+        @change=${this.handleKeybindChange}
+      ></setting-keybind>
+
+      <setting-keybind
+        action="shiftKey"
+        label=${translateText("user_setting.shift_key")}
+        description=${translateText("user_setting.shift_key_desc")}
+        .defaultKey=${this.defaultKeybinds.shiftKey}
+        .value=${this.getKeyValue("shiftKey")}
+        .display=${this.getKeyChar("shiftKey")}
+        @change=${this.handleKeybindChange}
+      ></setting-keybind>
+
       <h2
         class="text-blue-200 text-xl font-bold mt-8 mb-3 border-b border-white/10 pb-2"
       >

src/client/Utils.ts

@@ -319,6 +319,11 @@ export function formatKeyForDisplay(value: string): string {
     return "Shift+" + formatKeyForDisplay(value.slice(6));
   }
 
+  // Handle Alt+ prefix: format as "Alt+X"
+  if (value.startsWith("Alt+")) {
+    return "Alt+" + formatKeyForDisplay(value.slice(4));
+  }
+
   // Handle space character or "Space" key
   if (value === " " || value === "Space") return "Space";
 

src/client/components/baseComponents/setting/SettingKeybind.ts

@@ -117,8 +117,18 @@ export class SettingKeybind extends LitElement {
     // Prevent default only for keys we're actually capturing
     e.preventDefault();
 
-    const code = e.shiftKey ? `Shift+${e.code}` : e.code;
-    const displayKey = e.shiftKey ? `Shift+${e.key.toUpperCase()}` : e.key;
+    let code: string;
+    let displayKey: string;
+    if (e.shiftKey) {
+      code = `Shift+${e.code}`;
+      displayKey = `Shift+${e.key.toUpperCase()}`;
+    } else if (e.altKey) {
+      code = `Alt+${e.code}`;
+      displayKey = code; // e.key would give special chars (e.g. ® for Alt+R); use code instead
+    } else {
+      code = e.code;
+      displayKey = e.key;
+    }
     const prevValue = this.value;
 
     // Temporarily set the value to the new code for validation in parent

src/core/game/UserSettings.ts

@@ -33,7 +33,7 @@ export function getDefaultKeybinds(isMac: boolean): Record<string, string> {
     modifierKey: isMac ? "MetaLeft" : "ControlLeft",
     altKey: "AltLeft",
     shiftKey: "ShiftLeft",
-    resetGfx: "KeyR",
+    resetGfx: "Alt+KeyR",
     selectAllWarships: "KeyF",
     pauseGame: "KeyP",
     gameSpeedUp: "Period",