disable battel goal reminder for BB, fix round shortcut

derornos · Jun 4, 2024 · 65da4a7 · 65da4a7
1 parent 58764f2
commit 65da4a7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gloomhavensecretariat",
-  "version": "0.99.0",
+  "version": "0.99.1",
   "license": "AGPL3",
   "description": "Gloomhaven Secretariat is a Gloomhaven/Frosthaven Companion app.",
   "homepage": "https://gloomhaven-secretariat.de",

diff --git a/src/app/ui/footer/footer.ts b/src/app/ui/footer/footer.ts
@@ -232,7 +232,7 @@ export class FooterComponent implements OnInit {
   }
 
   battleGoals(): boolean {
-    return !this.missingInitiative() && settingsManager.settings.battleGoals && settingsManager.settings.battleGoalsReminder && gameManager.game.scenario != undefined && gameManager.roundManager.firstRound && !gameManager.game.figures.every((figure) => !(figure instanceof Character) || figure.battleGoal || figure.absent);
+    return !this.missingInitiative() && settingsManager.settings.battleGoals && settingsManager.settings.battleGoalsReminder && gameManager.game.scenario != undefined && gameManager.roundManager.firstRound && !gameManager.game.figures.every((figure) => !(figure instanceof Character) || figure.battleGoal || figure.absent) && !gameManager.bbRules();
   }
 
   activeHint(): boolean {

diff --git a/src/app/ui/footer/hint-dialog/hint-dialog.ts b/src/app/ui/footer/hint-dialog/hint-dialog.ts
@@ -1,5 +1,5 @@
 import { Dialog, DialogRef } from "@angular/cdk/dialog";
-import { Component } from "@angular/core";
+import { Component, HostListener } from "@angular/core";
 import { gameManager, GameManager } from "src/app/game/businesslogic/GameManager";
 import { settingsManager } from "src/app/game/businesslogic/SettingsManager";
 import { Character } from "src/app/game/model/Character";
@@ -95,7 +95,7 @@ export class HintDialogComponent {
     }
 
     battleGoals(): boolean {
-        return !this.missingInitiative() && settingsManager.settings.battleGoals && settingsManager.settings.battleGoalsReminder && gameManager.game.scenario != undefined && gameManager.roundManager.firstRound && !gameManager.game.figures.every((figure) => !(figure instanceof Character) || figure.battleGoal || figure.absent);
+        return !this.missingInitiative() && settingsManager.settings.battleGoals && settingsManager.settings.battleGoalsReminder && gameManager.game.scenario != undefined && gameManager.roundManager.firstRound && !gameManager.game.figures.every((figure) => !(figure instanceof Character) || figure.battleGoal || figure.absent) && !gameManager.bbRules();
     }
 
     finish(): boolean {
@@ -106,4 +106,21 @@ export class HintDialogComponent {
         return !this.active() && !this.empty() && gameManager.game.figures.some((figure) => figure instanceof Character) && gameManager.game.figures.every((figure) => !(figure instanceof Character) || figure instanceof Character && (!gameManager.entityManager.isAlive(figure) || figure.absent));
     }
 
+
+    @HostListener('document:keydown', ['$event'])
+    onKeyEnter(event: KeyboardEvent) {
+        if (event.key === 'Enter') {
+            if (this.active()) {
+                this.confirm();
+            } else if (this.finish()) {
+                this.finishScenario(true);
+            } else if (this.failed()) {
+                this.finishScenario(false);
+            } else if (this.battleGoals()) {
+                this.confirm();
+            }
+            event.preventDefault();
+            event.stopPropagation();
+        }
+    }
 }
diff --git a/src/app/ui/helper/keyboard-shortcuts.ts b/src/app/ui/helper/keyboard-shortcuts.ts
@@ -116,9 +116,7 @@ export class KeyboardShortcuts implements OnInit, OnDestroy {
                     document.body.style.setProperty('--ghs-factor', this.currentZoom + '');
                     event.preventDefault();
                 } else if ((!this.dialogOpen || this.allowed.indexOf('round') != -1) && this.footer && !event.ctrlKey && !event.shiftKey && !this.zoomInterval && event.key.toLowerCase() === 'n') {
-                    if (!this.footer.disabled()) {
-                        this.footer.next();
-                    }
+                    this.footer.next();
                 } else if ((!this.dialogOpen || this.allowed.indexOf('am') != -1) && !event.ctrlKey && !event.shiftKey && !this.zoomInterval && gameManager.game.state == GameState.next && (event.key.toLowerCase() === 'm' || settingsManager.settings.amAdvantage && (event.key.toLowerCase() === 'a' || event.key.toLowerCase() === 'd'))) {
                     const activeFigure = gameManager.game.figures.find((figure) => figure.active);
                     let deck: AttackModifierDeck | undefined = undefined;