diff --git a/src/client/HelpModal.ts b/src/client/HelpModal.ts
index 4087cc037..9acccd60a 100644
--- a/src/client/HelpModal.ts
+++ b/src/client/HelpModal.ts
@@ -232,7 +232,15 @@ export class HelpModal extends LitElement {
| Space |
- Alternate view |
+ Alternate view (terrain/countries) |
+
+
+ | Shift + left click |
+ Attack (when left click is set to open menu) |
+
+
+ | Ctrl + left click |
+ Open build menu |
| C |
@@ -306,7 +314,7 @@ export class HelpModal extends LitElement {
Pause/Unpause the game - Only available in single player mode.
Timer - Time passed since the start of the game.
Exit button.
- Settings - Open the settings menu. Inside you can toggle the Alternate View, Dark Mode, and Emojis.
+ Settings - Open the settings menu. Inside you can toggle the Alternate View, Dark Mode, Emojis and action on left click.
diff --git a/src/client/InputHandler.ts b/src/client/InputHandler.ts
index 53ebf045f..c589862e4 100644
--- a/src/client/InputHandler.ts
+++ b/src/client/InputHandler.ts
@@ -1,4 +1,5 @@
import { EventBus, GameEvent } from "../core/EventBus";
+import { UserSettings } from "../core/game/UserSettings";
export class MouseUpEvent implements GameEvent {
constructor(
@@ -87,6 +88,8 @@ export class InputHandler {
private readonly PAN_SPEED = 5;
private readonly ZOOM_SPEED = 10;
+ private userSettings: UserSettings = new UserSettings();
+
constructor(
private canvas: HTMLCanvasElement,
private eventBus: EventBus,
@@ -276,10 +279,12 @@ export class InputHandler {
if (dist < 10) {
if (event.pointerType == "touch") {
event.preventDefault();
- console.log("firing context menu event");
- this.eventBus.emit(new ContextMenuEvent(event.clientX, event.clientY));
- } else {
+ }
+
+ if (!this.userSettings.leftClickOpensMenu() || event.shiftKey) {
this.eventBus.emit(new MouseUpEvent(event.x, event.y));
+ } else {
+ this.eventBus.emit(new ContextMenuEvent(event.clientX, event.clientY));
}
}
}
diff --git a/src/client/graphics/layers/OptionsMenu.ts b/src/client/graphics/layers/OptionsMenu.ts
index e52772870..1c6d55c48 100644
--- a/src/client/graphics/layers/OptionsMenu.ts
+++ b/src/client/graphics/layers/OptionsMenu.ts
@@ -16,7 +16,7 @@ const button = ({
children,
}) => html`