address Lurkars#580, Lurkars#581, Lurkars#582

derornos · Jun 18, 2024 · ba093e4 · ba093e4
1 parent 0814179
commit ba093e4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 44 deletions.
diff --git a/data/fh/sections/157-3.json b/data/fh/sections/157-3.json
@@ -5,6 +5,7 @@
   "conclusion": true,
   "named": true,
   "unlocks": [
-    "93"
+    "93A",
+    "93B"
   ]
 }
diff --git a/data/toa/character/three-eyes.json b/data/toa/character/three-eyes.json
@@ -185,7 +185,7 @@
             "effects": [
               {
                 "type": "custom",
-                "value": "%game.coloredToken.c7386a.toa-ritualist%: %game.condition.enfeeble% / %game.coloredToken.336fa2.toa-conquerer%: %game.condition.enfeeble%",
+                "value": "%game.coloredToken.c7386a.toa-ritualist%: %game.condition.enfeeble% / %game.coloredToken.336fa2.toa-conquerer%: %game.condition.empower%",
                 "effects": [
                   {
                     "type": "specialTarget",
@@ -245,7 +245,7 @@
             "effects": [
               {
                 "type": "custom",
-                "value": "%game.coloredToken.5cac66.toa-reaver%: %game.condition.rupture% / %game.coloredToken.c7386a.toa-ritualist%: %game.condition.empower%",
+                "value": "%game.coloredToken.5cac66.toa-reaver%: %game.condition.rupture% / %game.coloredToken.c7386a.toa-ritualist%: %game.condition.enfeeble%",
                 "effects": [
                   {
                     "type": "specialTarget",

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

diff --git a/src/app/game/businesslogic/GameManager.ts b/src/app/game/businesslogic/GameManager.ts
@@ -370,13 +370,9 @@ export class GameManager {
           return this.sortFiguresByTypeAndName(a, b);
         }
         return a.getInitiative() - b.getInitiative();
-      } else if (a.getInitiative() > 0) {
-        return 1;
-      } else if (b.getInitiative() > 0) {
-        return -1;
       }
 
-      return this.sortFiguresByTypeAndName(a, b);
+      return 0;
     });
   }
 

diff --git a/src/app/ui/figures/ability/abilities-dialog.ts b/src/app/ui/figures/ability/abilities-dialog.ts
@@ -66,13 +66,15 @@ export class AbiltiesDialogComponent implements OnInit {
   shuffle(upcoming: boolean = false) {
     gameManager.stateManager.before("shuffleAbilityDeck" + (upcoming ? "Upcoming" : ""), "data.monster." + this.monster.name);
     gameManager.monsterManager.shuffleAbilities(this.monster, upcoming);
+    gameManager.sortFigures();
     gameManager.stateManager.after();
     this.update();
   }
 
   draw() {
     gameManager.stateManager.before("drawAbility", "data.monster." + this.monster.name);
     gameManager.monsterManager.drawAbility(this.monster);
+    gameManager.sortFigures();
     gameManager.stateManager.after();
     this.update();
   }
@@ -89,6 +91,7 @@ export class AbiltiesDialogComponent implements OnInit {
       if (gameManager.game.state == GameState.next) {
         gameManager.monsterManager.drawExtra(this.monster);
       }
+      gameManager.sortFigures();
       gameManager.stateManager.after();
     }
     this.update();
@@ -125,6 +128,7 @@ export class AbiltiesDialogComponent implements OnInit {
     if (sameDeckMonster) {
       gameManager.monsterManager.applySameDeck(sameDeckMonster);
     }
+    gameManager.sortFigures();
     gameManager.stateManager.after();
     this.update();
   }