From 074d2f5052d000e08c3edb34dc5933fbd02ce505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Thu, 17 Feb 2022 00:47:13 +0100 Subject: [PATCH] Disable pathfinding when the hotkey for moving tokens without pathfinding is enabled (fixes #158) --- js/keybindings.js | 10 ++++++++++ js/pathfinding.js | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/js/keybindings.js b/js/keybindings.js index b3ef09d..095ea09 100644 --- a/js/keybindings.js +++ b/js/keybindings.js @@ -113,6 +113,16 @@ function handleDisableSnap(event) { function handleMoveWithoutAnimation(event) { moveWithoutAnimation = !event.up; + + const ruler = canvas.controls.ruler; + if (!ruler?.isDragRuler) + return false; + if (ruler._state !== Ruler.STATES.MEASURING) + return false; + + ruler.measure(getMeasurePosition(), {snap: !disableSnap}); + ruler.dragRulerSendState(); + return false; } function handleTogglePathfinding(event) { diff --git a/js/pathfinding.js b/js/pathfinding.js index 46f683c..ed899c1 100644 --- a/js/pathfinding.js +++ b/js/pathfinding.js @@ -1,5 +1,5 @@ import {getGridPositionFromPixelsObj, getPixelsFromGridPositionObj} from "./foundry_fixes.js"; -import {togglePathfinding} from "./keybindings.js"; +import {moveWithoutAnimation, togglePathfinding} from "./keybindings.js"; import {debugGraphics} from "./main.js"; import {settingsKey} from "./settings.js"; import {getSnapPointForTokenObj, iterPairs} from "./util.js"; @@ -15,6 +15,8 @@ export function isPathfindingEnabled() { return false; if (!game.user.isGM && !game.settings.get(settingsKey, "allowPathfinding")) return false; + if (moveWithoutAnimation) + return false; return game.settings.get(settingsKey, "autoPathfinding") != togglePathfinding; }