Expand ghost structure multiplier controls

src/client/InputHandler.ts

@@ -1,5 +1,9 @@
 import { EventBus, GameEvent } from "../core/EventBus";
-import { PlayerBuildableUnitType, UnitType } from "../core/game/Game";
+import {
+  MAX_UPGRADE_AMOUNT,
+  PlayerBuildableUnitType,
+  UnitType,
+} from "../core/game/Game";
 import { UserSettings } from "../core/game/UserSettings";
 import { Platform } from "./Platform";
 import { UIState } from "./UIState";
@@ -456,6 +460,7 @@ export class InputHandler {
       (e) => {
         this.onScroll(e);
         this.onShiftScroll(e);
+        this.onAltScroll(e);
         e.preventDefault();
       },
       { passive: false },
@@ -579,6 +584,10 @@ export class InputHandler {
         return;
       }
 
+      if (e.altKey || e.code === this.keybinds.altKey) {
+        e.preventDefault();
+      }
+
       if (this.keybindMatchesEvent(e, this.keybinds.toggleView)) {
         e.preventDefault();
         if (!this.alternateView) {
@@ -696,6 +705,10 @@ export class InputHandler {
         return;
       }
 
+      if (e.altKey || e.code === this.keybinds.altKey) {
+        e.preventDefault();
+      }
+
       // When the meta (cmd) or ctrl key is released, any keys that were held
       // simultaneously will have had their keyup swallowed by the browser
       // (e.g. cmd+Plus for browser zoom). Clear zoom-related keys to
@@ -850,7 +863,9 @@ export class InputHandler {
     }
     if (this.activeKeys.has(this.keybinds.emojiMenuModifier)) {
       this.suppressNextTap = false;
+      if (this.uiState.ghostStructure === null) {
       this.eventBus.emit(new ShowEmojiMenuEvent(event.clientX, event.clientY));
+      }
       return;
     }
 
@@ -883,32 +898,33 @@ export class InputHandler {
   }
 
   private onScroll(event: WheelEvent) {
-    if (!event.shiftKey) {
-      const realCtrl =
-        this.activeKeys.has("ControlLeft") ||
-        this.activeKeys.has("ControlRight");
-      if (event.ctrlKey) {
-        if (!realCtrl) {
-          // Pinch-to-zoom gesture (trackpad): small deltas, amplify.
-          // Ignore large deltas — those are browser zoom shortcuts (cmd+/cmd-)
-          // which fire synthetic wheel events we don't want to handle.
-          if (Math.abs(event.deltaY) <= 10) {
-            this.eventBus.emit(
-              new ZoomEvent(event.x, event.y, event.deltaY * 10),
-            );
-          }
+    if (event.shiftKey || event.altKey){
+      return; // Shift/Alt scroll is handled separately
+    }
+    const realCtrl =
+      this.activeKeys.has("ControlLeft") ||
+      this.activeKeys.has("ControlRight");
+    if (event.ctrlKey) {
+      if (!realCtrl) {
+        // Pinch-to-zoom gesture (trackpad): small deltas, amplify.
+        // Ignore large deltas — those are browser zoom shortcuts (cmd+/cmd-)
+        // which fire synthetic wheel events we don't want to handle.
+        if (Math.abs(event.deltaY) <= 10) {
+          this.eventBus.emit(
+            new ZoomEvent(event.x, event.y, event.deltaY * 10),
+          );
         }
-        // Always return when ctrlKey is set — whether it's a real ctrl scroll,
-        // a pinch gesture, or a browser zoom event, none should reach the
-        // regular scroll path below.
-        return;
       }
-      // Regular scroll wheel: ignore tiny residual momentum events that macOS
-      // keeps sending after a gesture ends (especially after browser zoom changes
-      // devicePixelRatio, which can cause these to accumulate into runaway zoom).
-      if (Math.abs(event.deltaY) < 2) return;
-      this.eventBus.emit(new ZoomEvent(event.x, event.y, event.deltaY));
+      // Always return when ctrlKey is set — whether it's a real ctrl scroll,
+      // a pinch gesture, or a browser zoom event, none should reach the
+      // regular scroll path below.
+      return;
     }
+    // Regular scroll wheel: ignore tiny residual momentum events that macOS
+    // keeps sending after a gesture ends (especially after browser zoom changes
+    // devicePixelRatio, which can cause these to accumulate into runaway zoom).
+    if (Math.abs(event.deltaY) < 2) return;
+    this.eventBus.emit(new ZoomEvent(event.x, event.y, event.deltaY));
   }
 
   /**
@@ -943,6 +959,15 @@ export class InputHandler {
     }
   }
 
+  private onAltScroll(event: WheelEvent) {
+    if (event.altKey) {
+      const scrollValue = event.deltaY === 0 ? event.deltaX : event.deltaY;
+      this.setGhostStructure(this.uiState.ghostStructure,
+      scrollValue > 0 ? "decrease" : "increase");
+    }
+  }
+
+
   private onPointerMove(event: PointerEvent) {
     if (event.button === 1) {
       event.preventDefault();
@@ -1029,13 +1054,40 @@ export class InputHandler {
     this.eventBus.emit(new ContextMenuEvent(event.clientX, event.clientY));
   }
 
-  private setGhostStructure(ghostStructure: PlayerBuildableUnitType | null) {
-    if (
+  private setGhostStructure(
+    ghostStructure: PlayerBuildableUnitType | null,
+    source: "increase" | "decrease" | "hotkey" = "hotkey",
+    ) { if (
       this.uiState.ghostStructure === ghostStructure &&
       ghostStructure !== null
     ) {
-      this.uiState.upgradeMultiplier =
-        this.uiState.upgradeMultiplier === 1 ? 5 : 1;
+      const currentMultiplier = this.uiState.upgradeMultiplier ?? 1;
+      switch (source) {
+        case "hotkey":
+          this.uiState.upgradeMultiplier =
+            currentMultiplier === 1 ? 5 : currentMultiplier + 5;
+          break;
+        case "increase":
+          this.uiState.upgradeMultiplier = currentMultiplier + 1;
+          break;
+        case "decrease":
+          this.uiState.upgradeMultiplier =
+            currentMultiplier > 1 ? currentMultiplier - 1 : 1;
+          break;
+      }
+      if (this.uiState.upgradeMultiplier > MAX_UPGRADE_AMOUNT) {
+        if (source === "hotkey") {
+          // Reset to 1 if hotkey was used to exceed max, otherwise clamp to max
+          this.uiState.upgradeMultiplier = 1;
+        } else {
+          this.uiState.upgradeMultiplier = MAX_UPGRADE_AMOUNT;
+        }
+      }
+      if (source === "decrease"){
+        this.uiState.upgradeMultiplier =
+        currentMultiplier > 1 ? currentMultiplier - 1 : 1;
+      }
+
     } else {
       this.uiState.upgradeMultiplier = 1;
       this.uiState.ghostStructure = ghostStructure;

tests/InputHandler.test.ts

@@ -660,6 +660,20 @@ describe("InputHandler AutoUpgrade", () => {
     });
   });
 
+  describe("Alt key default prevention", () => {
+    test("prevents the browser's default action when Alt is pressed", () => {
+      const preventDefaultSpy = vi.spyOn(
+        KeyboardEvent.prototype,
+        "preventDefault",
+      );
+
+      window.dispatchEvent(new KeyboardEvent("keydown", { code: "AltLeft" }));
+
+      expect(preventDefaultSpy).toHaveBeenCalled();
+      preventDefaultSpy.mockRestore();
+    });
+  });
+
   describe("Numpad number keys for build keybinds", () => {
     beforeEach(() => {
       inputHandler.destroy();
@@ -708,6 +722,20 @@ describe("InputHandler AutoUpgrade", () => {
 
       expect(inputHandler["uiState"].ghostStructure).toBeNull();
     });
+
+    test("repeated taps increase the build multiplier by 5 each time", () => {
+      const uiState = inputHandler["uiState"];
+
+      inputHandler["setGhostStructure"](UnitType.AtomBomb);
+      expect(uiState.ghostStructure).toBe(UnitType.AtomBomb);
+      expect(uiState.upgradeMultiplier).toBe(1);
+
+      inputHandler["setGhostStructure"](UnitType.AtomBomb);
+      expect(uiState.upgradeMultiplier).toBe(5);
+
+      inputHandler["setGhostStructure"](UnitType.AtomBomb);
+      expect(uiState.upgradeMultiplier).toBe(10);
+    });
   });
 
   describe("Digit keys still set ghost structure when bound to Numpad", () => {