fix: Fixes issue where switching a party in the tracker wouldn't allo…

…w parties to be loaded from encounters
javalent · Mar 3, 2022 · 9940382 · 9940382
1 parent 9567f16
commit 9940382
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/encounter/ui/Encounter.svelte b/src/encounter/ui/Encounter.svelte
@@ -73,6 +73,7 @@
             .flat();
 
         view?.newEncounter({
+            party,
             name,
             players,
             creatures,

diff --git a/src/svelte/App.svelte b/src/svelte/App.svelte
@@ -231,7 +231,6 @@
                     }}
                     on:save={(evt) => {
                         const creature = evt.detail;
-                        console.log(creature.display);
                         const newCreature = new Creature(
                             {
                                 name: creature.name,

diff --git a/src/view.ts b/src/view.ts
@@ -259,17 +259,22 @@ export default class TrackerView extends ItemView {
 
     async newEncounter({
         name,
+        party = this.party,
         players = true,
         creatures = [],
         roll = true,
         xp = null
     }: {
+        party?: string;
         name?: string;
         players?: boolean | string[];
         creatures?: Creature[];
         roll?: boolean;
         xp?: number;
     } = {}) {
+        if (party && party != this.party) {
+            this.party = party;
+        }
         if (players instanceof Array && players.length) {
             this.creatures = [
                 ...this.players.filter((p) => players.includes(p.name))
@@ -284,6 +289,7 @@ export default class TrackerView extends ItemView {
         this.name = name;
         this.round = 1;
         this.setAppState({
+            party: this.party,
             name: this.name,
             round: this.round,
             xp