add setting to disable HP/Damage shortcut; Cheers Nerdhaven

derornos · Jun 11, 2024 · 92ebd75 · 92ebd75
1 parent c6421e6
commit 92ebd75
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 19 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.6",
+  "version": "0.99.7",
   "license": "AGPL3",
   "description": "Gloomhaven Secretariat is a Gloomhaven/Frosthaven Companion app.",
   "homepage": "https://gloomhaven-secretariat.de",
@@ -104,7 +104,7 @@
     "@types/jasmine": "~5.1.4",
     "@types/leaflet": "^1.9.12",
     "@types/uuid": "^9.0.8",
-    "electron": "^30.1.0",
+    "electron": "^31.0.0",
     "electron-builder": "^24.13.3",
     "http-server": "^14.1.1",
     "husky": "^9.0.11",

diff --git a/src/app/game/model/Settings.ts b/src/app/game/model/Settings.ts
@@ -81,6 +81,7 @@ export class Settings {
   combineInteractiveAbilities: boolean = true;
   combineSummonAction: boolean = true;
   damageHP: boolean = false;
+  damageHPToggle: boolean = true;
   debugEditWorldMap: boolean = false;
   debugRightClick: boolean = false;
   disableAnimations: boolean = false;
@@ -171,5 +172,5 @@ export class Settings {
 }
 
 export const localSettings: string[] = [
-  "animations", "artwork", "automaticAttackModifierFullscreen", "autoBackup", "autoBackupFinish", "autoBackupUrl", "automaticGameClock", "automaticTheme", "autoscroll", "barsize", "backupHint", "browserNavigation", "buildingEffectsVisible", "buildingInteractionsVisible", "calendarLocked", "characterAttackModifierAnimate", "characterAttackModifierDeckPermanent", "characterAttackModifierDeckPermanentActive", "characterItemsPermanent", "characterItemsPermanentActive", "characterItemsPermanentEquipped", "characterItemsPermanentSorted", "characterItemsPermanentZoom", "characterCompact", "characterSheetCompact", "characterSheetLocked", "columns", "columnsForce", "debugEditWorldMap", "debugRightClick", "disableAnimations", "disableArtwork", "disableColumns", "disableDragFigures", "disablePinchZoom", "disableWakeLock", "dragFigures", "dragValues", "errata", "fhStyle", "fontsize", "gameClock", "globalFontsize", "globalMapHighlighting", "feedbackErrors", "feedbackErrorsIgnore", "fullscreen", "hideCharacterHP", "hideCharacterLoot", "hideCharacterXP", "hints", "logServerMessages", "pinchZoom", "portraitMode", "pressDoubleClick", "serverAutoconnect", "serverCode", "serverPassword", "serverPing", "serverPort", "serverSettings", "serverUrl", "serverWss", "showAllSections", "showBossMonster", "showHiddenMonster", "showOnlyUnfinishedScenarios", "statAnimations", "theme", "tooltips", "wakeLock", "zoom"
+  "animations", "artwork", "automaticAttackModifierFullscreen", "autoBackup", "autoBackupFinish", "autoBackupUrl", "automaticGameClock", "automaticTheme", "autoscroll", "barsize", "backupHint", "browserNavigation", "buildingEffectsVisible", "buildingInteractionsVisible", "calendarLocked", "characterAttackModifierAnimate", "characterAttackModifierDeckPermanent", "characterAttackModifierDeckPermanentActive", "characterItemsPermanent", "characterItemsPermanentActive", "characterItemsPermanentEquipped", "characterItemsPermanentSorted", "characterItemsPermanentZoom", "characterCompact", "characterSheetCompact", "characterSheetLocked", "columns", "columnsForce", "damageHPToggle", "debugEditWorldMap", "debugRightClick", "disableAnimations", "disableArtwork", "disableColumns", "disableDragFigures", "disablePinchZoom", "disableWakeLock", "dragFigures", "dragValues", "errata", "fhStyle", "fontsize", "gameClock", "globalFontsize", "globalMapHighlighting", "feedbackErrors", "feedbackErrorsIgnore", "fullscreen", "hideCharacterHP", "hideCharacterLoot", "hideCharacterXP", "hints", "logServerMessages", "pinchZoom", "portraitMode", "pressDoubleClick", "serverAutoconnect", "serverCode", "serverPassword", "serverPing", "serverPort", "serverSettings", "serverUrl", "serverWss", "showAllSections", "showBossMonster", "showHiddenMonster", "showOnlyUnfinishedScenarios", "statAnimations", "theme", "tooltips", "wakeLock", "zoom"
 ];
diff --git a/src/app/ui/figures/character/character.ts b/src/app/ui/figures/character/character.ts
@@ -333,7 +333,7 @@ export class CharacterComponent implements OnInit, OnDestroy {
   toggleDamageHP() {
     if (this.compact) {
       this.openCharacterSheet();
-    } else {
+    } else if (settingsManager.settings.damageHPToggle) {
       settingsManager.toggle('damageHP');
     }
   }

diff --git a/src/app/ui/header/menu/settings/settings.html b/src/app/ui/header/menu/settings/settings.html
@@ -289,6 +289,7 @@
     </div>
     <div class="line" ghs-setting-menu="characterItemsPermanentActive"
       [disabled]="!settingsManager.settings.characterItems || !settingsManager.settings.characterItemsPermanent"></div>
+    <div class="line" ghs-setting-menu="damageHPToggle"></div>
   </div>
 
   <div class="separator"></div>

diff --git a/src/assets/locales/de.json b/src/assets/locales/de.json
@@ -1811,6 +1811,10 @@
       ".": "Schaden statt TP",
       "hint": "Zeige den erleideten Schaden statt der verbleibenden Trefferpunkte an."
     },
+    "damageHPToggle": {
+      ".": "Schaden statt TP auf Charakterboard umschalten",
+      "hint": "Schalte zwischen Schaden statt TP mit Doppelklick auf TP vom Charakterboard."
+    },
     "debug": {
       ".": "Debug Einstellung/Werkzeuge",
       "hint": "",

diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
@@ -1972,6 +1972,10 @@
       ".": "Damage instead of HP",
       "hint": "Show damage dealed instead of hitpoints left"
     },
+    "damageHPToggle": {
+      ".": "Toggle Damage/HP on character board",
+      "hint": "Shortcut by double clicking the HP display on a character board to switch between Damage and HP."
+    },
     "debug": {
       ".": "Debug Settings/Tools",
       "rightClick": "Always enable Right-Click",