better menu controls

Author: rjoken

src/game/scenes/HighScoresScene.ts

@@ -36,12 +36,19 @@ export class HighScoresScene extends Phaser.Scene {
         .setOrigin(0.5);
     });
 
-    this.input.keyboard?.on("keydown-W", this.scrollUp, this);
-    this.input.keyboard?.on("keydown-S", this.scrollDown, this);
-
-    this.input.keyboard?.once("keydown-SPACE", () => {
-      this.scene.start("MenuScene");
-    });
+    this.input.keyboard?.on(
+      "keydown",
+      (event: KeyboardEvent) => {
+        if ([" ", "Enter"].includes(event.key)) {
+          this.scene.start("MenuScene");
+        } else if (["w", "ArrowUp"].includes(event.key)) {
+          this.scrollUp();
+        } else if (["s", "ArrowDown"].includes(event.key)) {
+          this.scrollDown();
+        }
+      },
+      this
+    );
   }
 
   renderScores() {

src/game/scenes/MenuScene.ts

@@ -71,21 +71,20 @@ export class MenuScene extends Phaser.Scene {
         .setOrigin(0.5, 0.75);
     });
 
-    this.input.keyboard?.on("keydown-W", () => {
-      this.selectedIndex =
-        (this.selectedIndex + this.options.length - 1) % this.options.length;
+    this.input.keyboard?.on("keydown", (event: KeyboardEvent) => {
+      console.log(event.key);
+      if ([" ", "Enter"].includes(event.key)) {
+        this.selectOption();
+      }
+      if (["w", "ArrowUp"].includes(event.key)) {
+        this.selectedIndex =
+          (this.selectedIndex + this.options.length - 1) % this.options.length;
+      } else if (["s", "ArrowDown"].includes(event.key)) {
+        this.selectedIndex =
+          (this.selectedIndex + this.options.length + 1) % this.options.length;
+      }
       this.updateCursor();
     });
-
-    this.input.keyboard?.on("keydown-S", () => {
-      this.selectedIndex =
-        (this.selectedIndex + this.options.length + 1) % this.options.length;
-      this.updateCursor();
-    });
-
-    this.input.keyboard?.on("keydown-SPACE", () => {
-      this.selectOption();
-    });
   }
 
   updateCursor() {

src/game/scenes/NameEntryScene.ts

@@ -54,10 +54,10 @@ export class NameEntryScene extends Phaser.Scene {
           this.enteredName += key.toUpperCase();
 
           this.updateNameDisplay();
-        } else if (event.key === "Backspace" && this.enteredName.length > 0) {
+        } else if (["Backspace"].includes(key) && this.enteredName.length > 0) {
           this.enteredName = this.enteredName.slice(0, -1);
           this.updateNameDisplay();
-        } else if (event.key === " ") {
+        } else if ([" ", "Enter"].includes(key)) {
           this.saveScore();
           this.scene.start("MenuScene");
         }
@@ -79,8 +79,10 @@ export class NameEntryScene extends Phaser.Scene {
     const stored = localStorage.getItem("switchy-hiscores");
     const scores = stored ? JSON.parse(stored) : [];
 
-    scores.push(newEntry);
-    scores.sort((a: any, b: any) => b.score - a.score);
+    if (newEntry.name.length > 0) {
+      scores.push(newEntry);
+      scores.sort((a: any, b: any) => b.score - a.score);
+    }
 
     localStorage.setItem("switchy-hiscores", JSON.stringify(scores));
   }

src/game/scenes/ScenarioScene.ts

@@ -60,8 +60,10 @@ export class ScenarioScene extends Phaser.Scene {
         .setWordWrapWidth(width);
     });
 
-    this.input.keyboard?.on("keydown-SPACE", () => {
-      this.scene.start("GameScene", { device: this.device });
+    this.input.keyboard?.on("keydown", (event: KeyboardEvent) => {
+      if ([" ", "Enter"].includes(event.key)) {
+        this.scene.start("GameScene", { device: this.device });
+      }
     });
 
     this.events.on("shutdown", this.cleanup, this);