hotfix broken undo history, adress #596, #597

Lurkars · Jul 15, 2024 · 314f895 · 314f895
1 parent 350d57a
commit 314f895
Show file tree

Hide file tree

Showing 10 changed files with 42 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.15",
+  "version": "0.99.16",
   "license": "AGPL3",
   "description": "Gloomhaven Secretariat is a Gloomhaven/Frosthaven Companion app.",
   "homepage": "https://gloomhaven-secretariat.de",

diff --git a/src/app/game/businesslogic/StorageManager.ts b/src/app/game/businesslogic/StorageManager.ts
@@ -219,8 +219,8 @@ export class StorageManager {
         for (let index = 0; index < objects.length; index++) {
           const object = objects[index];
           await this.write(store, undefined, object).catch(() => reject());
-          resolve();
         };
+        resolve();
       } else {
         try {
           localStorage.setItem("ghs-" + store, JSON.stringify(objects));

diff --git a/src/app/ui/figures/character/character.html b/src/app/ui/figures/character/character.html
@@ -294,6 +294,8 @@
     </div>
 
     <div class="special-actions" *ngIf="character.specialActions">
+      <div class="entity-menu-container" ghs-pointer-input (singleClick)="openEntityMenu($event)"
+        (doubleClick)="compact && openCharacterSheet()"></div>
       <ng-container *ngFor="let specialAction of character.specialActions">
         <span *ngIf="character.tags.indexOf(specialAction.name) != -1" class="special-tag text-white"
           [ghs-label]="'data.character.' + character.name + '.' + specialAction.name" ghs-pointer-input

diff --git a/src/app/ui/figures/entity-menu/entity-menu-dialog.html b/src/app/ui/figures/entity-menu/entity-menu-dialog.html
@@ -424,6 +424,16 @@
         </span>
       </ng-container>
 
+      <div class="identities-container"
+        *ngIf="data.entity && gameManager.isCharacter(data.entity) && settingsManager.settings.characterIdentities && gameManager.toCharacter(data.entity).identities && gameManager.toCharacter(data.entity).identities.length > 1">
+        <a class="item" *ngFor="let identity of [] | ghsRange:gameManager.toCharacter(data.entity).identities.length"
+          (click)="setIdentity(identity)"
+          [ghs-tooltip]="'data.character.' + gameManager.toCharacter(data.entity).name + '.' +  gameManager.toCharacter(data.entity).identities[identity]" [ngClass]="{'disabled': gameManager.toCharacter(data.entity).identity == identity}">
+          <img
+            [src]="gameManager.characterManager.characterIdentityIcon(gameManager.toCharacter(data.entity).name, identity)" />
+        </a>
+      </div>
+
       <ng-container *ngIf="data.entity && gameManager.isSummon(data.entity)">
         <span class="item" [ghs-label]="'game.dead'" [ghs-label-attribute]="'title'">
           <a class="button" tabclick (click)="toggleDead()">

diff --git a/src/app/ui/figures/entity-menu/entity-menu-dialog.scss b/src/app/ui/figures/entity-menu/entity-menu-dialog.scss
@@ -320,7 +320,8 @@
   }
 
 
-  .marker-container {
+  .marker-container,
+  .identities-container {
     display: grid;
     grid-template-columns: repeat(3, calc(var(--ghs-unit) * 7 * var(--ghs-dialog-factor)));
     row-gap: calc(var(--ghs-unit) * 1 * var(--ghs-dialog-factor));
@@ -330,7 +331,6 @@
     grid-column: 1 / span 3;
 
     .item {
-
       position: relative;
       display: flex;
       align-items: center;
@@ -349,6 +349,11 @@
         border-radius: 100%;
       }
 
+      &.disabled img {
+        filter: grayscale(0.7);
+        opacity: 0.7;
+      }
+
     }
   }
 

diff --git a/src/app/ui/figures/entity-menu/entity-menu-dialog.ts b/src/app/ui/figures/entity-menu/entity-menu-dialog.ts
@@ -6,6 +6,7 @@ import { SettingsManager, settingsManager } from "src/app/game/businesslogic/Set
 import { Character } from "src/app/game/model/Character";
 import { Entity, EntityValueFunction } from "src/app/game/model/Entity";
 import { Figure } from "src/app/game/model/Figure";
+import { GameState } from "src/app/game/model/Game";
 import { Monster } from "src/app/game/model/Monster";
 import { MonsterEntity } from "src/app/game/model/MonsterEntity";
 import { OBJECTIV_MARKERS, ObjectiveContainer } from "src/app/game/model/ObjectiveContainer";
@@ -837,9 +838,20 @@ export class EntityMenuDialogComponent {
     this.titles[index] = event.target.value;
   }
 
+  setIdentity(index: number) {
+    if (this.data.entity instanceof Character && index != this.data.entity.identity) {
+      let timeTokens = this.data.entity.tags.find((tag) => tag === 'time_tokens') && this.data.entity.primaryToken == 0;
+      if ((gameManager.game.state == GameState.next || gameManager.game.state == GameState.draw && this.data.entity.identity == 0 && this.data.entity.tokenValues[0] == 0) && timeTokens) {
+        return;
+      }
+
+      gameManager.stateManager.before("setIdentity", gameManager.characterManager.characterName(this.data.entity, false, false, false), this.data.entity.name, this.data.entity.identities[index]);
+      this.data.entity.identity = index;
+      gameManager.stateManager.after();
+    }
+  }
+
   close(): void {
-    this.closeConditions();
-    this.closeAMs();
     if (this.data.entity instanceof Character) {
       this.closeCharacter();
     } else if (this.data.figure instanceof Monster) {
@@ -851,6 +863,8 @@ export class EntityMenuDialogComponent {
     } else if (this.data.figure instanceof ObjectiveContainer) {
       this.closeObjectiveContainer();
     }
+    this.closeAMs();
+    this.closeConditions();
   }
 
   closeCharacter(): void {

diff --git a/src/app/ui/tools/error-handler.ts b/src/app/ui/tools/error-handler.ts
@@ -22,7 +22,7 @@ export class GhsErrorHandler extends ErrorHandler {
             window.document.body.classList.remove('server-sync');
 
             const errorId = error.message + (error.stack ? error.stack.split('\n')[0] : '');
-            if (!FILTER_ERRORS.some((msg) => error.message.startsWith(msg)) && (!settingsManager.settings.feedbackErrorsIgnore || settingsManager.settings.feedbackErrorsIgnore.indexOf(errorId) == -1)) {
+            if (error.message && error.message.trim() && !FILTER_ERRORS.some((msg) => error.message.startsWith(msg)) && (!settingsManager.settings.feedbackErrorsIgnore || settingsManager.settings.feedbackErrorsIgnore.indexOf(errorId) == -1)) {
                 this.dialog.open(FeedbackDialogComponent, {
                     panelClass: ['dialog'],
                     data: error

diff --git a/src/assets/locales/de.json b/src/assets/locales/de.json
@@ -2476,6 +2476,7 @@
       "setEntitySummonState": "Beschwörung {3} für {1} Aufsteller {2} von {0}",
       "setExhausted": "{0} erschöpft",
       "setGold": "Gold {1} für {0}",
+      "setIdentity": "Setze Form auf %data.character.{1}.{2}% für {0}",
       "setInitiative": "Initiative {1} für {0}",
       "setLevel": "Level {1} für {0}",
       "setNotes": "Notizen \"{1}\" für {0} ",

diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
@@ -2686,6 +2686,7 @@
       "setEntitySummonState": "Set summon {3} for {1} standee {2} of {0}",
       "setExhausted": "{0} exhausted",
       "setGold": "Gold {1} for {0}",
+      "setIdentity": "Set form of {0} to %data.character.{1}.{2}%",
       "setInitiative": "Initiative {1} for {0}",
       "setLevel": "Level {1} for {0}",
       "setNotes": "Notes \"{1}\" for {0}",