fixing bugs

veevelder · Aug 17, 2024 · 4c9c3c2 · 4c9c3c2
1 parent 97d4a81
commit 4c9c3c2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/scripts/quick-combat.js b/scripts/quick-combat.js
@@ -690,7 +690,8 @@ Hooks.on("updateCombat", async (combat) => {
   }
 
   //if the user doesn't want to run include the combat markers'
-  if (!game.setting.get("quick-combat", "combatMarkers")) {
+  let combatMarkers = game.settings.get("quick-combat", "combatMarkers");
+  if (!combatMarkers) {
     return;
   }
 
@@ -748,7 +749,7 @@ Hooks.on("updateCombat", async (combat) => {
   ) {
     new Sequence("quick-combat")
       .effect()
-      .file(activeTurnFile)
+      .file(game.settings.get("quick-combat", "combatMarkers-activeTurn"))
       .attachTo(currentToken, { bindVisibility: true, bindAlpha: true })
       .scaleToObject(scale)
       .belowTokens()