Merge pull request #54 from NewHappyRabbit/attack-hotkeys

Decrease power by 10% with hotkey '1', increase by 10% with hotkey '2'

src/client/InputHandler.ts

@@ -57,6 +57,10 @@ export class ShowBuildMenuEvent implements GameEvent {
   ) {}
 }
 
+export class AttackRatioEvent implements GameEvent {
+  constructor(public readonly attackRatio: number) {}
+}
+
 export class InputHandler {
   private lastPointerX: number = 0;
   private lastPointerY: number = 0;
@@ -160,6 +164,8 @@ export class InputHandler {
           "Equal",
           "KeyE",
           "KeyQ",
+          "Digit1",
+          "Digit2",
         ].includes(e.code)
       ) {
         this.activeKeys.add(e.code);
@@ -177,6 +183,14 @@ export class InputHandler {
         this.eventBus.emit(new RefreshGraphicsEvent());
       }
 
+      if (e.code === "Digit1") {
+        this.eventBus.emit(new AttackRatioEvent(-10));
+      }
+
+      if (e.code === "Digit2") {
+        this.eventBus.emit(new AttackRatioEvent(10));
+      }
+
       // Remove all movement keys from activeKeys
       if (
         [
@@ -192,6 +206,8 @@ export class InputHandler {
           "Equal",
           "KeyE",
           "KeyQ",
+          "Digit1",
+          "Digit2",
         ].includes(e.code)
       ) {
         this.activeKeys.delete(e.code);

src/client/graphics/layers/ControlPanel.ts

@@ -8,6 +8,7 @@ import { EventBus } from "../../../core/EventBus";
 import { UIState } from "../UIState";
 import { SendSetTargetTroopRatioEvent } from "../../Transport";
 import { GameView } from "../../../core/game/GameView";
+import { AttackRatioEvent } from "../../InputHandler";
 
 @customElement("control-panel")
 export class ControlPanel extends LitElement implements Layer {
@@ -60,6 +61,30 @@ export class ControlPanel extends LitElement implements Layer {
     this.attackRatio = 0.2;
     this.uiState.attackRatio = this.attackRatio;
     this.currentTroopRatio = this.targetTroopRatio;
+    this.eventBus.on(AttackRatioEvent, (event) => {
+      let newAttackRatio =
+        (parseInt(
+          (document.getElementById("attack-ratio") as HTMLInputElement).value,
+        ) +
+          event.attackRatio) /
+        100;
+
+      if (newAttackRatio < 0.01) {
+        newAttackRatio = 0.01;
+      }
+
+      if (newAttackRatio > 1) {
+        newAttackRatio = 1;
+      }
+
+      if (newAttackRatio == 0.11 && this.attackRatio == 0.01) {
+        // If we're changing the ratio from 1%, then set it to 10% instead of 11% to keep a consistency
+        newAttackRatio = 0.1;
+      }
+
+      this.attackRatio = newAttackRatio;
+      this.onAttackRatioChange(this.attackRatio);
+    });
   }
 
   tick() {
@@ -239,6 +264,7 @@ export class ControlPanel extends LitElement implements Layer {
             ></div>
             <!-- Range input - exactly overlaying the visual elements -->
             <input
+              id="attack-ratio"
               type="range"
               min="1"
               max="100"