fix: better handling for multiple modifiers

javalent · May 3, 2023 · 6a866f6 · 6a866f6
1 parent b1e6b00
commit 6a866f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -97,7 +97,7 @@ export default class InitiativeTracker extends Plugin {
         }
         let dice = this.data.initiative;
         if (typeof modifier == "number") {
-            dice = dice.replace(/%mod\d?%/g, `(${modifier})`);
+            dice = dice.replace(/%mod\d?%/g, `${modifier}`);
         } else {
             for (let i = 0; i < modifier.length; i++) {
                 dice = dice.replace(`%mod${i + 1}%`, `${modifier[i]}`);

diff --git a/src/tracker/ui/create/Create.svelte b/src/tracker/ui/create/Create.svelte
@@ -28,6 +28,8 @@
         creature = c;
     });
 
+    let modifier = JSON.stringify(creature.modifier ?? 0);
+
     const saveButton = (node: HTMLElement) => {
         new ExtraButtonComponent(node)
             .setTooltip("Add Creature")
@@ -75,7 +77,6 @@
                 if (!creature.modifier) {
                     creature.modifier = 0;
                 }
-                creature.modifier = JSON.parse(`${creature.modifier}`);
                 if (
                     creature.initiative <= 0 ||
                     creature.initiative == null ||
@@ -146,6 +147,12 @@
             .setValue(creature.friendly)
             .onChange((v) => (creature.friendly = v));
     };
+
+    $: {
+        try {
+            creature.modifier = JSON.parse(`${modifier}`);
+        } catch (e) {}
+    }
 </script>
 
 <div class="initiative-tracker-editor">
@@ -208,7 +215,7 @@
         <div>
             <label for="add-mod">Modifier</label>
             <input
-                bind:value={creature.modifier}
+                bind:value={modifier}
                 id="add-mod"
                 type="text"
                 name="add-mod"

diff --git a/src/tracker/ui/create/Creator.svelte b/src/tracker/ui/create/Creator.svelte
@@ -42,8 +42,6 @@
                         creature.dirty_ac = false;
                     }
 
-                    creature.modifier = JSON.parse(`${creature.modifier}`);
-
                     tracker.replace(creature, $editing);
                 } else {
                     const creatures = $adding.flatMap(([creature, amount]) =>