From e85753403d639e059a05e47925f10a366e3c1d79 Mon Sep 17 00:00:00 2001
From: Ryan Barlow <ryanbarlow123@me.com>
Date: Sat, 3 Jan 2026 20:07:54 +0000
Subject: [PATCH] listen to ContextMenuEvent instead of MouseUpEvent when a
 locked bomb is active

---
 .../graphics/layers/StructureIconsLayer.ts    | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/client/graphics/layers/StructureIconsLayer.ts b/src/client/graphics/layers/StructureIconsLayer.ts
index 3fe7289ed..b0c32e51a 100644
--- a/src/client/graphics/layers/StructureIconsLayer.ts
+++ b/src/client/graphics/layers/StructureIconsLayer.ts
@@ -16,6 +16,7 @@ import { TileRef } from "../../../core/game/GameMap";
 import { GameUpdateType } from "../../../core/game/GameUpdates";
 import { GameView, UnitView } from "../../../core/game/GameView";
 import {
+  ContextMenuEvent,
   GhostStructureChangedEvent,
   MouseMoveEvent,
   MouseUpEvent,
@@ -179,6 +180,7 @@ export class StructureIconsLayer implements Layer {
     this.eventBus.on(MouseMoveEvent, (e) => this.moveGhost(e));
 
     this.eventBus.on(MouseUpEvent, (e) => this.createStructure(e));
+    this.eventBus.on(ContextMenuEvent, (e) => this.updateLockedBombTarget(e));
 
     window.addEventListener("resize", () => this.resizeCanvas());
     await this.setupRenderer();
@@ -407,19 +409,11 @@ export class StructureIconsLayer implements Layer {
   }
 
   private createStructure(e: MouseUpEvent) {
-    // When locked ghost is active, clicking changes the target location
+    // Ignore left clicks when locked bomb is active (use right-click instead)
     if (
       this.uiState.lockedGhostTile &&
       this.isLockableGhost(this.ghostUnit?.buildableUnit.type ?? null)
     ) {
-      const newTile = this.getTileFromMouseEvent(e);
-      if (newTile) {
-        this.uiState.lockedGhostTile = newTile;
-        // Force trajectory recalculation by clearing cached tile
-        this.eventBus.emit(
-          new GhostStructureChangedEvent(this.uiState.ghostStructure),
-        );
-      }
       return;
     }
 
@@ -436,6 +430,24 @@ export class StructureIconsLayer implements Layer {
     this.commitStructure(tileRef);
   }
 
+  private updateLockedBombTarget(e: ContextMenuEvent) {
+    // Only allow right-click to change bomb target when locked
+    if (
+      !this.uiState.lockedGhostTile ||
+      !this.isLockableGhost(this.ghostUnit?.buildableUnit.type ?? null)
+    ) {
+      return;
+    }
+    const newTile = this.getTileFromContextMenuEvent(e);
+    if (newTile) {
+      this.uiState.lockedGhostTile = newTile;
+      // Force trajectory recalculation
+      this.eventBus.emit(
+        new GhostStructureChangedEvent(this.uiState.ghostStructure),
+      );
+    }
+  }
+
   private moveGhost(e: MouseMoveEvent) {
     if (
       this.uiState.lockedGhostTile &&
@@ -546,6 +558,16 @@ export class StructureIconsLayer implements Layer {
     this.removeGhostStructure();
   }
 
+  private getTileFromContextMenuEvent(e: ContextMenuEvent): TileRef | null {
+    const rect = this.transformHandler.boundingRect();
+    if (!rect) return null;
+    const x = e.x - rect.left;
+    const y = e.y - rect.top;
+    const tile = this.transformHandler.screenToWorldCoordinates(x, y);
+    if (!this.game.isValidCoord(tile.x, tile.y)) return null;
+    return this.game.ref(tile.x, tile.y);
+  }
+
   private getTileFromMouseEvent(e: MouseUpEvent): TileRef | null {
     const rect = this.transformHandler.boundingRect();
     if (!rect) return null;