address #242, #420, #508, add envelope building unlocks, items and bu…

…ildings relationship, improve buildings, add and improve label, add FH summon color, keyboard shortcuts for hand size and traits
Lurkars · Feb 22, 2024 · 3fe3161 · 3fe3161
1 parent a7548e8
commit 3fe3161
Show file tree

Hide file tree

Showing 78 changed files with 883 additions and 444 deletions.
diff --git a/data/fh/personal-quests.json b/data/fh/personal-quests.json
@@ -9,7 +9,7 @@
                 "autotrack": "differentHerbs"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 24<br>(alt: %game.fhIcon:envelope% 42)"
+        "openEnvelope": "24:42"
     },
     {
         "cardId": "582",
@@ -29,7 +29,7 @@
                 ]
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 24<br>(alt: %game.fhIcon:envelope% 42)"
+        "openEnvelope": "24:42"
     },
     {
         "cardId": "583",
@@ -61,7 +61,7 @@
                 "autotrack": "itemType:small"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 37<br>(alt: %game.fhIcon:envelope% 74)"
+        "openEnvelope": "37:74"
     },
     {
         "cardId": "584",
@@ -73,7 +73,7 @@
                 "autotrack": "gold"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 37<br>(alt: %game.fhIcon:envelope% 74)"
+        "openEnvelope": "37:74"
     },
     {
         "cardId": "585",
@@ -85,7 +85,7 @@
                 "autotrack": "buildings"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 85<br>(alt: %game.fhIcon:envelope% 21)"
+        "openEnvelope": "85:21"
     },
     {
         "cardId": "586",
@@ -96,7 +96,7 @@
                 "counter": 8
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 85<br>(alt: %game.fhIcon:envelope% 21)"
+        "openEnvelope": "85:21"
     },
     {
         "cardId": "587",
@@ -108,7 +108,7 @@
                 "autotrack": "scenario:65|66"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 44<br>(alt: %game.fhIcon:envelope% 88)"
+        "openEnvelope": "44:88"
     },
     {
         "cardId": "588",
@@ -127,7 +127,7 @@
                 "counter": 2
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 44<br>(alt: %game.fhIcon:envelope% 88)"
+        "openEnvelope": "44:88"
     },
     {
         "cardId": "589",
@@ -139,7 +139,7 @@
                 "autotrack": "abilityXP"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 90<br>(alt: %game.fhIcon:envelope% 83)"
+        "openEnvelope": "90:83"
     },
     {
         "cardId": "590",
@@ -151,7 +151,7 @@
                 "autotrack": "scenarioRequirements:board|climbing-gear|sled"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 90<br>(alt: %game.fhIcon:envelope% 83)"
+        "openEnvelope": "90:83"
     },
     {
         "cardId": "505",
@@ -163,7 +163,7 @@
                 "autotrack": "craftableItems"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 39<br>(alt: %game.fhIcon:envelope% 72)"
+        "openEnvelope": "39:72"
     },
     {
         "cardId": "509",
@@ -175,7 +175,7 @@
                 "autotrack": "scenario:71|72"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 90<br>(alt: %game.fhIcon:envelope% 42)"
+        "openEnvelope": "90:42"
     },
     {
         "cardId": "514",
@@ -186,7 +186,7 @@
                 "counter": 15
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 44<br>(alt: %game.fhIcon:envelope% 74)"
+        "openEnvelope": "44:74"
     },
     {
         "cardId": "519",
@@ -213,7 +213,7 @@
                 "counter": 1
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 37<br>(alt: %game.fhIcon:envelope% 72)"
+        "openEnvelope": "37:72"
     },
     {
         "cardId": "523",
@@ -225,7 +225,7 @@
                 "autotrack": "donatedGold"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 65<br>(alt: %game.fhIcon:envelope% 85)"
+        "openEnvelope": "65:85"
     },
     {
         "cardId": "527",
@@ -236,7 +236,7 @@
                 "counter": 5
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 85<br>(alt: %game.fhIcon:envelope% 88)"
+        "openEnvelope": "85:88"
     },
     {
         "cardId": "538",
@@ -248,7 +248,7 @@
                 "autotrack": "battleGoals"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 81<br>(alt: %game.fhIcon:envelope% 67)"
+        "openEnvelope": "81:67"
     },
     {
         "cardId": "542",
@@ -260,7 +260,7 @@
                 "autotrack": "scenario:65|66"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 44<br>(alt: %game.fhIcon:envelope% 67)"
+        "openEnvelope": "44:67"
     },
     {
         "cardId": "545",
@@ -279,7 +279,7 @@
                 ]
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 81<br>(alt: %game.fhIcon:envelope% 67)"
+        "openEnvelope": "81:67"
     },
     {
         "cardId": "549",
@@ -290,7 +290,7 @@
                 "counter": 15
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 24<br>(alt: %game.fhIcon:envelope% 21)"
+        "openEnvelope": "24:21"
     },
     {
         "cardId": "552",
@@ -301,7 +301,7 @@
                 "counter": 8
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 39<br>(alt: %game.fhIcon:envelope% 72)"
+        "openEnvelope": "39:72"
     },
     {
         "cardId": "557",
@@ -312,7 +312,7 @@
                 "counter": 12
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% 37<br>(alt: %game.fhIcon:envelope% 83)"
+        "openEnvelope": "37:83"
     },
     {
         "cardId": "543",
@@ -325,6 +325,6 @@
                 "autotrack": "exchaustedChars"
             }
         ],
-        "openEnvelope": "%game.fhIcon:envelope% A"
+        "openEnvelope": "A"
     }
 ]
diff --git a/data/toa/character/three-eyes.json b/data/toa/character/three-eyes.json
@@ -290,7 +290,7 @@
     {
       "type": "custom",
       "count": 1,
-      "custom": "Each time you short rest, Refresh %game.card.recover% one spent %game.items.slots.onehand% item into each scenario"
+      "custom": "Each time you short rest, Refresh %game.card.recover% one spent %game.items.slots.onehand%"
     },
     {
       "type": "remove",

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.89.3",
+  "version": "0.89.4",
   "license": "AGPL3",
   "description": "Gloomhaven Secretariat is a Gloomhaven/Frosthaven Companion app.",
   "homepage": "https://gloomhaven-secretariat.de",

diff --git a/resources/keyboard-shortcuts.md b/resources/keyboard-shortcuts.md
@@ -3,7 +3,7 @@
 The following keyboard shortcuts are currently implemented:
 
 - <kbd>CTRL</kbd> + <kbd>z</kbd>: Undo
-- <kbd>CTRL</kbd> + <kbd>y</kbd> | <kbd>CTRL</kbd> + <kbd>SHIFT</kbd> + <kbd>z</kbd>: Redo
+- <kbd>CTRL</kbd> + <kbd>y</kbd> | <kbd>CTRL</kbd> + <kbd>SHIFT</kbd> + <kbd>Z</kbd>: Redo
 - <kbd>ESC</kbd>: open main menu
 - <kbd>↑</kbd> | <kbd>+</kbd>: Zoom-In
 - <kbd>↓</kbd> | <kbd>-</kbd>: Zoom-Out
@@ -19,15 +19,17 @@ The following keyboard shortcuts are currently implemented:
 - <kbd>e</kbd>: scenario effects menu
 - <kbd>f</kbd>: (finish) scenario menu
 - <kbd>p</kbd>: open party sheet
+- <kbd>SHIFT</kbd> + <kbd>H</kbd>: toggle *Display hand size and level*
+- <kbd>t</kbd>: toggle *Display traits*
 
 On any open figure/standee menu, those shortcuts are disabled, currently shortcuts available in figure/standee:
 - <kbd>←</kbd>: dec. current HP
 - <kbd>→</kbd>: inc. current HP
 - <kbd>0</kbd>-<kbd>9</kbd>: toggle condition/condition modifier
 - <kbd>b</kbd>: inc. Bless
-- <kbd>SHIFT</kbd> + <kbd>b</kbd>: dec. Bless
+- <kbd>SHIFT</kbd> + <kbd>B</kbd>: dec. Bless
 - <kbd>c</kbd>: inc. Curse
-- <kbd>SHIFT</kbd> + <kbd>c</kbd>: dec. Curse
+- <kbd>SHIFT</kbd> + <kbd>C</kbd>: dec. Curse
 - <kbd>k</kbd> | <kbd>d</kbd>: kill/exhaust
 - <kbd>↑</kbd>: inc. max. HP
 - <kbd>↓</kbd>: dec. max. HP

diff --git a/src/app/app.component.scss b/src/app/app.component.scss
@@ -4,15 +4,15 @@
   max-width: 100vw;
   height: 100vh;
   max-height: 100vh;
-  background-image: url('~/src/assets/images/bg.jpg');
+  background-image: url('/assets/images/bg.jpg');
   background-size: cover;
   overflow: auto;
 
   &.fh {
-    background-image: url('~/src/assets/images/fh/bg.jpg');
+    background-image: url('/assets/images/fh/bg.jpg');
   }
 
   &.modern {
-    background-image: url('~/src/assets/images/modern/bg.jpg');
+    background-image: url('/assets/images/modern/bg.jpg');
   }
 }
diff --git a/src/app/game/businesslogic/ItemManager.ts b/src/app/game/businesslogic/ItemManager.ts
@@ -110,14 +110,22 @@ export class ItemManager {
     }
 
     canBuy(item: ItemData, character: Character, cost: number = 0): boolean {
-        if (gameManager.game.party.campaignMode && gameManager.fhRules() && character.tags.indexOf('new-character') == -1 && (!this.game.party.buildings || !this.game.party.buildings.find((buildingModel) => buildingModel.name == "trading-post" && buildingModel.level >= 1 && buildingModel.state != 'wrecked'))) {
+        if (character.tags.indexOf('new-character') == -1 && this.buyingDisabled()) {
             return false;
         }
 
         return item.cost && (item.cost + this.pricerModifier() + cost) <= character.progress.gold && this.canAdd(item, character) || false;
     }
 
+    buyingDisabled(): boolean {
+        return gameManager.fhRules() && gameManager.game.party.campaignMode && gameManager.game.party.buildings.find((buildingModel) => buildingModel.name == 'trading-post' && buildingModel.level > 0 && buildingModel.state == "wrecked") != undefined;
+    }
+
     canCraft(item: ItemData, character: Character, resources: Partial<Record<LootType, number>> = {}): boolean {
+        if (this.craftingDisabled()) {
+            return false;
+        }
+
         let isCraftItem = false;
         let canCraft = true;
         if (item.resources) {
@@ -154,6 +162,14 @@ export class ItemManager {
         return canCraft && isCraftItem;
     }
 
+    craftingDisabled(): boolean {
+        return gameManager.fhRules() && gameManager.game.party.campaignMode && gameManager.game.party.buildings.find((buildingModel) => buildingModel.name == 'craftsman' && buildingModel.level > 0 && buildingModel.state == "wrecked") != undefined;
+    }
+
+    brewingDisabled(): boolean {
+        return gameManager.fhRules() && gameManager.game.party.campaignMode && gameManager.game.party.buildings.find((buildingModel) => buildingModel.name == 'alchemist' && buildingModel.level > 0 && buildingModel.state == "wrecked") != undefined;
+    }
+
     itemSellValue(itemData: ItemData): number {
         if (itemData.cost) {
             return Math.floor(itemData.cost / 2);