fix treasure offset, address #96

data/fh/challenges.json

@@ -19,7 +19,8 @@
     },
     {
         "cardId": 1487,
-        "automation": "fully"
+        "automation": "fully",
+        "implemented": true
     },
     {
         "cardId": 1488,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gloomhavensecretariat",
-  "version": "0.101.0",
+  "version": "0.101.1",
   "license": "AGPL3",
   "description": "Gloomhaven Secretariat is a Gloomhaven/Frosthaven Companion app.",
   "homepage": "https://gloomhaven-secretariat.de",

src/app/game/businesslogic/ChallengesManager.ts

@@ -10,6 +10,7 @@ export class ChallengesManager {
 
     game: Game;
     available: boolean = false;
+    enabled: boolean = false;
 
     constructor(game: Game) {
         this.game = game;
@@ -78,7 +79,8 @@ export class ChallengesManager {
     }
 
     update() {
-        this.available = settingsManager.settings.fhChallenges && gameManager.fhRules() && this.game.party.buildings.find((buildingModel) => buildingModel.name == 'town-hall' && buildingModel.level && buildingModel.state != 'wrecked') != undefined
+        this.available = gameManager.fhRules() && this.game.party.buildings.find((buildingModel) => buildingModel.name == 'town-hall' && buildingModel.level && buildingModel.state != 'wrecked') != undefined;
+        this.enabled = settingsManager.settings.fhChallenges && this.available;
 
         if (this.available && this.game.edition) {
             // build challenge deck if not present

src/app/game/businesslogic/EntityManager.ts

@@ -381,7 +381,7 @@ export class EntityManager {
     entityCondition.highlight = false;
 
     // apply Challenge #1487
-    if (gameManager.challengesManager.available && gameManager.challengesManager.isActive(1487, 'fh') && entityCondition.types.indexOf(ConditionType.negative) && entityCondition.name != ConditionName.wound && entity instanceof Character && !this.isImmune(entity, entity, ConditionName.wound)) {
+    if (gameManager.challengesManager.enabled && gameManager.challengesManager.isActive(1487, 'fh') && entityCondition.types.indexOf(ConditionType.negative) && entityCondition.name != ConditionName.wound && entity instanceof Character && !this.isImmune(entity, entity, ConditionName.wound)) {
       this.addCondition(entity, new Condition(ConditionName.wound), active, off);
     }
 

src/app/game/model/data/Challenges.ts

@@ -7,6 +7,7 @@ export class ChallengeCard implements Editional {
     cardId: number = 0;
     edition: string = "";
     automation: "fully" | "partial" | undefined;
+    implemented: boolean = false;
 
 }
 

src/app/ui/figures/challenges/challenge-card.html

@@ -18,6 +18,9 @@
                 <div class="card-id">
                     <span *ngIf="challenge.cardId < 10">0</span>{{challenge.cardId}}
                 </div>
+                <div class="automation" *ngIf="challenge.implemented" [ghs-tooltip]="'challenges.automation.hint'">
+                    <img class="ghs-svg" src="./assets/images/automation.svg">
+                </div>
             </ng-container>
         </div>
     </div>

src/app/ui/figures/challenges/challenge-card.scss

@@ -67,6 +67,22 @@
                 filter: var(--ghs-filter-outline);
             }
 
+            .automation {
+                position: absolute;
+                bottom: 11%;
+                left: 14%;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+
+                .ghs-svg {
+                    width: 1.5em;
+                    height: auto;
+                    filter: var(--ghs-filter-darkgray);
+                }
+
+            }
+
         }
 
         .card-back {

src/app/ui/figures/party/party-sheet-dialog.ts

@@ -848,7 +848,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
         indexElement.classList.add('error');
         const editionData = gameManager.editionData.find((editionData) => editionData.edition == edition);
         if (editionData && editionData.treasures) {
-          const treasureIndex = +treasure - (editionData.treasureOffset || 0);
+          const treasureIndex = +treasure - (editionData.treasureOffset || 0) - 1;
           if (treasureIndex >= 0 && treasureIndex < editionData.treasures.length) {
             gameManager.stateManager.before("addTreasure", edition, treasure);
             this.party.treasures = this.party.treasures || [];

src/app/ui/footer/footer.html

@@ -60,7 +60,7 @@
 
   <div class="deck challenge-deck"
     [ngClass]="{'collapsed' : !gameManager.game.challengeDeck.active, 'initial' : gameManager.game.challengeDeck.active && gameManager.game.challengeDeck.current <= gameManager.game.challengeDeck.finished ,'partial' : gameManager.game.challengeDeck.current > gameManager.game.challengeDeck.finished,'partial-2' : gameManager.game.challengeDeck.current > gameManager.game.challengeDeck.finished + 1 , 'full' : gameManager.game.challengeDeck.active && gameManager.game.challengeDeck.current > gameManager.game.challengeDeck.finished + 2}"
-    *ngIf="settingsManager.settings.fhChallenges && gameManager.challengesManager.available">
+    *ngIf="settingsManager.settings.fhChallenges && gameManager.challengesManager.enabled">
     <ghs-challenge-deck [deck]="gameManager.game.challengeDeck" (before)="beforeChallengeDeck($event)"
       (after)="afterChallengeDeck($event)" [bottom]="true"></ghs-challenge-deck>
 

src/assets/locales/en.json

@@ -42,6 +42,9 @@
   "cancel": "Cancel",
   "challenges": {
     ".": "Challenges",
+    "automation": {
+      "hint": "Effect of this card is automatically applied!"
+    },
     "deck": {
       "clear": {
         ".": "Disgard drawn Challenge",