diff --git a/scripts/quick-combat.js b/scripts/quick-combat.js index ffe110a..99f20c9 100644 --- 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()