Arrow and vim keys support (#43)

accept arrows and hjkl as movement input too

Cnange opening text to mention these control options

Reviewed-on: #43
Co-authored-by: Kistaro Windrider <kistaro@gmail.com>
Co-committed-by: Kistaro Windrider <kistaro@gmail.com>

src/engine/internal/input.ts

@@ -111,6 +111,14 @@ class Input {
     return this.#mousePosition;
   }
 
+  isAnyKeyDown(...keys: string[]) : boolean {
+    for (const k of keys) {
+      if(this.isKeyDown(k)) {
+        return true
+      }
+    }
+    return false
+  }
   isKeyDown(key: string): boolean {
     return this.#keyDown[key];
   }

src/hotbar.ts

@@ -84,12 +84,12 @@ export class Hotbar {
 
   #offerSleep() {
     let bloodAmount = getPlayerProgress().getBlood();
-    let sleepText = "You're exhausted.";
+    let sleepText = "You're exhausted. Sleep and save your game?";
     if (bloodAmount > 100) {
       sleepText =
-        "You've got some energy left -- are you sure you want to sleep?";
+        "You've got some energy left -- are you sure you want to sleep and save your game?";
     } else if (bloodAmount > 2000) {
-      sleepText = "Are you sure you want to sleep? You have so much energy.";
+      sleepText = "Are you sure you want to sleep and save your game? You have so much energy.";
     }
 
     getCheckModal().show(

src/huntmode.ts

@@ -155,19 +155,19 @@ export class HuntMode {
 
     let mvdx = 0;
     let mvdy = 0;
-    if (I.isKeyDown("w")) {
+    if (I.isAnyKeyDown("w", "k", "ArrowUp")) {
       touched = true;
       mvdy -= amt;
     }
-    if (I.isKeyDown("s")) {
+    if (I.isAnyKeyDown("s", "j", "ArrowDown")) {
       touched = true;
       mvdy += amt;
     }
-    if (I.isKeyDown("a")) {
+    if (I.isAnyKeyDown("a", "h", "ArrowLeft")) {
       touched = true;
       mvdx -= amt;
     }
-    if (I.isKeyDown("d")) {
+    if (I.isAnyKeyDown("d", "l", "ArrowRight")) {
       touched = true;
       mvdx += amt;
     }

src/mapgen.ts

@@ -30,6 +30,8 @@ const NUM_ROOMS_DESIRED = 1;
 const EXTRA_CONNECTOR_CHANCE = 0.15;
 const WINDING_PERCENT = 50;
 
+const DEBUG = false;
+
 // This is an implementation of Nystrom's algorithm:
 // https://journal.stuffwithstuff.com/2014/12/21/rooms-and-mazes/
 class Knife {
@@ -98,7 +100,7 @@ class Knife {
   }
 
   showDebug(merged: Record<number, number>) {
-    if (true) {
+    if (DEBUG) {
       let out = "";
       let errors: string[] = [];
       const size = this.#regions.size;
@@ -110,7 +112,7 @@ class Knife {
               return this.#sealedWalls.get(loc) ? "◘" : "█";
             }
             let r = this.#regions.get(loc);
-            if (typeof r === "number") {
+            if (r !== null) {
               const resolved = merged[r];
               if (typeof resolved === "number") {
                 r = resolved;
@@ -755,7 +757,7 @@ function dedup(items: number[]): number[] {
 }
 
 function showDebug(grid: LoadedNewMap) {
-  if (true) {
+  if (DEBUG) {
     let out = "";
     for (let y = 0; y < grid.size.h; y++) {
       for (let x = 0; x < grid.size.w; x++) {

src/openingscene.ts

@@ -17,5 +17,5 @@ Your Progenitor
 
 
 
-PS: Left mouse + WASD. Like Quake!`,
+PS: Left mouse + WASD. Like Quake! Arrows or HJKL work too.`,
 ]);