fix: Fixes issue with Dice Roller integration (close #232)

javalent · Oct 12, 2023 · 3888416 · 3888416
1 parent 396238c
commit 3888416
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/api/api.ts b/src/api/api.ts
@@ -15,7 +15,6 @@ export class API {
         creatures: HomebrewCreature[],
         rollHP: boolean = this.plugin.data.rollHP
     ) {
-        console.log("🚀 ~ file: api.ts:18 ~ creatures:", creatures);
         if (!creatures || !Array.isArray(creatures) || !creatures.length) {
             throw new Error("Creatures must be an array.");
         }

diff --git a/src/encounter/ui/Encounter.svelte b/src/encounter/ui/Encounter.svelte
@@ -37,7 +37,7 @@
                 creatureMap = creatureMap;
             });
             rollerMap.set(creature, roller);
-            roller.roll();
+            roller.rollSync();
         } else {
             creatureMap.set(creature, number);
         }

diff --git a/src/encounter/ui/EncounterLine.svelte b/src/encounter/ui/EncounterLine.svelte
@@ -26,7 +26,7 @@
                 creatureMap.set(creature, roller.result);
             });
             rollerMap.set(creature, roller);
-            roller.roll();
+            roller.rollSync();
         } else {
             creatureMap.set(creature, number);
         }
@@ -156,7 +156,7 @@
 
 <style>
     .creature-name {
-         cursor: pointer;
+        cursor: pointer;
     }
     .encounter-line {
         display: flex;

diff --git a/src/encounter/ui/EncounterRow.svelte b/src/encounter/ui/EncounterRow.svelte
@@ -35,7 +35,7 @@
                 creatureMap = creatureMap;
             });
             rollerMap.set(creature, roller);
-            roller.roll();
+            roller.rollSync();
         } else {
             creatureMap.set(creature, number);
         }

diff --git a/src/main.ts b/src/main.ts
@@ -35,7 +35,7 @@ import BuilderView from "./builder/view";
 import PlayerView from "./tracker/player-view";
 import { tracker } from "./tracker/stores/tracker";
 import { EncounterSuggester } from "./encounter/editor-suggestor";
-import { API } from "./api/api"
+import { API } from "./api/api";
 declare module "obsidian" {
     interface App {
         plugins: {
@@ -99,8 +99,10 @@ export default class InitiativeTracker extends Plugin {
                 dice = dice.replace(`%mod${i + 1}%`, `${modifier[i]}`);
             }
         }
+        console.log("🚀 ~ file: main.ts:103 ~ dice:", dice);
         const roller = this.getRoller(dice);
         const initiative = roller.rollSync();
+        console.log("🚀 ~ file: main.ts:104 ~ initiative:", initiative);
         if (isNaN(initiative)) return defaultIfNoResult;
         return initiative;
     }