Release Healer Man 0.1.29

src/game/uiLayout.ts

@@ -1,4 +1,5 @@
 import { normalizeHudPosition, type NormalizedHudPosition } from "./hudLayout";
+import { normalizeInputBinding, INPUT_ACTIONS, normalizeInputPreferences, type InputPreferences } from "../input/keybinds";
 
 export type UiDevice = "mobile" | "pc";
 export const UI_DEVICES: readonly UiDevice[] = ["mobile", "pc"];
@@ -31,6 +32,7 @@ export interface UiLayout {
 export interface UiTemplate { name: string; layout: UiLayout }
 export interface UiPreferences {
   version: 1;
+  keybinds: InputPreferences;
   current: Record<UiDevice, UiLayout>;
   slots: Record<UiDevice, (UiTemplate | null)[]>;
 }
@@ -58,7 +60,7 @@ function record(value: unknown): Record<string, unknown> {
 function bounded(value: unknown, fallback: number, min: number, max: number): number {
   return typeof value === "number" && Number.isFinite(value) ? Math.max(min, Math.min(max, value)) : fallback;
 }
-const KEY_CODE = /^(?:Key[A-Z]|Digit[0-9]|F(?:[1-9]|1[0-2])|Numpad(?:[0-9]|Add|Subtract|Multiply|Divide|Decimal|Enter)|Arrow(?:Up|Down|Left|Right)|Space|Tab|Enter|Backquote|Minus|Equal|BracketLeft|BracketRight|Backslash|Semicolon|Quote|Comma|Period|Slash|Insert|Home|End|PageUp|PageDown)$/;
+const KEY_CODE = /^(?:Key[A-Z]|Digit[0-9]|F(?:[1-9]|1[0-2])|Numpad(?:[0-9]|Add|Subtract|Multiply|Divide|Decimal|Enter)|Arrow(?:Up|Down|Left|Right)|Space|Tab|Enter|Escape|Backspace|Delete|Backquote|Minus|Equal|BracketLeft|BracketRight|Backslash|Semicolon|Quote|Comma|Period|Slash|Insert|Home|End|PageUp|PageDown)$/;
 export function normalizeActionKey(value: unknown): string | null {
   if (typeof value !== "string") return null;
   const parts = value.split("+");
@@ -112,6 +114,7 @@ export function normalizeUiPreferences(value: unknown): UiPreferences {
   const slots = record(source.slots);
   return {
     version: 1,
+    keybinds: normalizeInputPreferences(source.keybinds),
     current: { mobile: normalizeUiLayout(current.mobile), pc: normalizeUiLayout(current.pc) },
     slots: Object.fromEntries(UI_DEVICES.map((device) => [device, Array.from({ length: 3 }, (_, index) => {
       const slot = record(Array.isArray(slots[device]) ? slots[device][index] : null);
@@ -163,6 +166,18 @@ export function importUiPreferences(text: string): UiPreferences {
       }
     }
   };
+  if (source.keybinds !== undefined) {
+    if (!source.keybinds || typeof source.keybinds !== "object" || Array.isArray(source.keybinds)) throw new Error("Invalid keybind configuration.");
+    for (const device of ["pc", "controller"] as const) {
+      const raw = record(source.keybinds)[device];
+      if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new Error("Invalid keybind configuration.");
+      const bindings = record(record(source.keybinds)[device]);
+      for (const entry of INPUT_ACTIONS) {
+        const key = bindings[entry.id];
+        if (key !== undefined && key !== null && !normalizeInputBinding(device, key)) throw new Error("Invalid keybind configuration.");
+      }
+    }
+  }
   for (const device of UI_DEVICES) {
     validateLayout(record(source.current)[device]);
     const slots = record(source.slots)[device];