Release v1.7.4

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.7.4
+### Bugfixes
+- Fixed a bug where the ruler would wrongly snap to the grid center for other players when dragging a measurement template
+
+### Compatibility
+- Drag Ruler is now compatiblie with the "Monk's Active Tile Triggers" module
+- Drag Ruler's Generic Speed Provider is now aware of good default values for the D&D 3.5 game system
+- Drag Ruler is now compatible with Foundry 0.8.7
+
+## 1.7.3
+### Compatibility
+- Drag Ruler is now compatible with Foundry 0.8.5
+
+
 ## 1.7.2
 ### Bugfixes
 - Fixed a bug that prevented waypoints for measurement templates from snapping to any other point than a grid cell corner (or grid cell center on hex)

module.json

@@ -2,9 +2,9 @@
 	"name": "drag-ruler",
 	"title": "Drag Ruler",
 	"description": "When dragging a token displays a ruler showing how far you've moved that token.",
-	"version": "1.7.2",
-	"minimumCoreVersion" : "0.7.9",
-	"compatibleCoreVersion" : "0.7.9",
+	"version": "1.7.4",
+	"minimumCoreVersion" : "0.8.5",
+	"compatibleCoreVersion" : "0.8.7",
 	"authors": [
 		{
 			"name": "Manuel Vögele",
@@ -49,7 +49,7 @@
 	],
 	"socket": true,
 	"url": "https://github.com/manuelVo/foundryvtt-drag-ruler",
-	"download": "https://github.com/manuelVo/foundryvtt-drag-ruler/archive/v1.7.2.zip",
+	"download": "https://github.com/manuelVo/foundryvtt-drag-ruler/archive/v1.7.4.zip",
 	"manifest": "https://raw.githubusercontent.com/manuelVo/foundryvtt-drag-ruler/master/module.json",
 	"readme": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/README.md",
 	"changelog": "https://github.com/manuelVo/foundryvtt-drag-ruler/blob/master/CHANGELOG.md",

src/foundry_imports.js

@@ -72,6 +72,10 @@ async function animateEntities(entities, draggedEntity, draggedRays, wasPaused)
 	const isToken = draggedEntity instanceof Token;
 	const animate = isToken && !game.keyboard.isDown("Alt");
 	const startWaypoint = animate ? 0 : entityAnimationData[0].rays.length - 1;
+
+	// This is a flag of the "Monk's Active Tile Triggers" module that signals that the movement should be cancelled early
+	this.cancelMovement = false;
+
 	for (let i = startWaypoint;i < entityAnimationData[0].rays.length; i++) {
 		if (!wasPaused && game.paused) break;
 		const entityPaths = entityAnimationData.map(({entity, rays, dx, dy}) => {
@@ -83,9 +87,15 @@ async function animateEntities(entities, draggedEntity, draggedRays, wasPaused)
 		const updates = entityPaths.map(({entity, path}) => {
 			return {x: path.B.x, y: path.B.y, _id: entity.id};
 		});
-		await draggedEntity.scene.updateEmbeddedEntity(draggedEntity.constructor.embeddedName, updates, {animate});
+		await draggedEntity.scene.updateEmbeddedDocuments(draggedEntity.constructor.embeddedName, updates, {animate});
 		if (animate)
 			await Promise.all(entityPaths.map(({entity, path}) => entity.animateMovement(path)));
+
+		// This is a flag of the "Monk's Active Tile Triggers" module that signals that the movement should be cancelled early
+		if (this.cancelMovement) {
+			entityAnimationData.forEach(ead => ead.rays = ead.rays.slice(0, i + 1));
+			break;
+		}
 	}
 	if (isToken)
 		trackRays(entities, entityAnimationData.map(({rays}) => rays)).then(() => recalculate(entities));

src/main.js

@@ -50,7 +50,7 @@ Hooks.on("getCombatTrackerEntryContext", function (html, menu) {
 	const entry = {
 		name: "drag-ruler.resetMovementHistory",
 		icon: '<i class="fas fa-undo-alt"></i>',
-		callback: li => resetMovementHistory(ui.combat.combat, li.data('combatant-id')),
+		callback: li => resetMovementHistory(ui.combat.viewed, li.data('combatant-id')),
 	};
 	menu.splice(1, 0, entry);
 });

src/movement_tracking.js

@@ -4,19 +4,19 @@ import {getTokenShape, zip} from "./util.js";
 
 function initTrackingFlag(combatant) {
 	const initialFlag = {passedWaypoints: [], trackedRound: 0};
-	let dragRulerFlag = combatant.flags?.dragRuler;
+	let dragRulerFlag = combatant.data.flags.dragRuler;
 	if (dragRulerFlag) {
 		if (isNaN(dragRulerFlag.trackedRound)) {
 			mergeObject(dragRulerFlag, initialFlag);
 		}
 	}
 	else {
-		combatant.flags.dragRuler = initialFlag;
+		combatant.data.flags.dragRuler = initialFlag;
 	}
 }
 
 function getInitializedCombatant(token, combat) {
-	const combatant = combat.getCombatantByToken(token.data._id);
+	const combatant = combat.getCombatantByToken(token.id);
 	if (!combatant)
 		return undefined;
 	initTrackingFlag(combatant);
@@ -43,14 +43,14 @@ function calculateUpdate(combat, token, rays) {
 		return;
 
 	// Check if we have entered a new round. If so, remove the currently stored path
-	if (combat.data.round > combatant.flags.dragRuler.trackedRound) {
-		combatant.flags.dragRuler.passedWaypoints = [];
-		combatant.flags.dragRuler.trackedRound = combat.data.round;
+	if (combat.data.round > combatant.data.flags.dragRuler.trackedRound) {
+		combatant.data.flags.dragRuler.passedWaypoints = [];
+		combatant.data.flags.dragRuler.trackedRound = combat.data.round;
 	}
 
 	// Add the passed waypoints to the combatant
 	const terrainRulerAvailable = game.modules.get("terrain-ruler")?.active && (!game.modules.get("TerrainLayer")?.active || canvas.grid.type !== CONST.GRID_TYPES.GRIDLESS);
-	const dragRulerFlags = combatant.flags.dragRuler;
+	const dragRulerFlags = combatant.data.flags.dragRuler;
 	const waypoints = dragRulerFlags.passedWaypoints;
 	for (const ray of rays) {
 		// Ignore rays that have the same start and end coordinates
@@ -63,17 +63,17 @@ function calculateUpdate(combat, token, rays) {
 			waypoints.push(ray.A);
 		}
 	}
-	return {_id: combatant._id, dragRulerFlags};
+	return {_id: combatant.id, dragRulerFlags};
 }
 
 export function getMovementHistory(token) {
 	const combat = game.combat;
 	if (!combat)
 		return [];
-	const combatant = combat.getCombatantByToken(token.data._id);
+	const combatant = combat.getCombatantByToken(token.id);
 	if (!combatant)
 		return [];
-	const dragRulerFlags = combatant.flags.dragRuler;
+	const dragRulerFlags = combatant.data.flags.dragRuler;
 	if (!dragRulerFlags)
 		return [];
 	if (combat.data.round > dragRulerFlags.trackedRound)
@@ -82,8 +82,8 @@ export function getMovementHistory(token) {
 }
 
 export async function resetMovementHistory(combat, combatantId) {
-	const combatant = combat.getCombatant(combatantId);
-	const dragRulerFlags = combatant.flags.dragRuler;
+	const combatant = combat.combatants.get(combatantId);
+	const dragRulerFlags = combatant.data.flags.dragRuler;
 	if (!dragRulerFlags)
 		return;
 	dragRulerFlags.passedWaypoints = null;

src/ruler.js

@@ -33,8 +33,11 @@ export class DragRulerRuler extends Ruler {
 
 	toJSON() {
 		const json = super.toJSON();
-		if (this.draggedEntity)
-			json["draggedEntity"] = this.draggedEntity.data._id;
+		if (this.draggedEntity) {
+			const isToken = this.draggedEntity instanceof Token;
+			json["draggedEntityIsToken"] = isToken;
+			json["draggedEntity"] = this.draggedEntity.id;
+		}
 		return json;
 	}
 
@@ -44,7 +47,10 @@ export class DragRulerRuler extends Ruler {
 			return;
 
 		if (data.draggedEntity) {
+			if (data.draggedEntityIsToken)
 				this.draggedEntity = canvas.tokens.get(data.draggedEntity);
+			else
+				this.draggedEntity = canvas.templates.get(data.draggedEntity);
 		}
 		super.update(data);
 	}

src/socket.js

@@ -12,7 +12,7 @@ export function updateCombatantDragRulerFlags(combat, updates) {
 	const combatId = combat.id;
 	// TODO Check if canvas.tokens.get is still neccessary in future foundry versions
 	return socket.executeAsGM(_socketUpdateCombatantDragRulerFlags, combatId, updates)
-	             .then(() => currentSpeedProvider.onMovementHistoryUpdate(updates.map(update => canvas.tokens.get(combat.getCombatant(update._id).token._id))));
+	             .then(() => currentSpeedProvider.onMovementHistoryUpdate(updates.map(update => canvas.tokens.get(combat.combatants.get(update._id).token.id))));
 }
 
 async function _socketUpdateCombatantDragRulerFlags(combatId, updates) {
@@ -20,10 +20,10 @@ async function _socketUpdateCombatantDragRulerFlags(combatId, updates) {
 	const combat = game.combats.get(combatId);
 	const requestedUpdates = updates.length;
 	updates = updates.filter(update => {
-		const actor = combat.getCombatant(update._id).actor;
+		const actor = combat.combatants.get(update._id).actor;
 		if (!actor)
 			return false;
-		return actor.hasPerm(user, "OWNER");
+		return actor.testUserPermission(user, "OWNER");
 	});
 	if (updates.length !== requestedUpdates) {
 		console.warn(`Some of the movement history updates requested by user '${game.users.get(this.socketdata.userId).name}' were not performed because the user lacks owner permissions for those tokens`);
@@ -31,7 +31,7 @@ async function _socketUpdateCombatantDragRulerFlags(combatId, updates) {
 	updates = updates.map(update => {
 		return {_id: update._id, flags: {dragRuler: update.dragRulerFlags}};
 	});
-	await combat.updateEmbeddedEntity("Combatant", updates, {diff: false});
+	await combat.updateEmbeddedDocuments("Combatant", updates, {diff: false});
 }
 
 export function recalculate(tokens) {

src/systems.js

@@ -8,6 +8,7 @@ export function getDefaultSpeedAttribute() {
 		case "lancer":
 			return "actor.data.data.mech.speed"
 		case "pf1":
+		case "D35E":
 			return "actor.data.data.attributes.speed.land.total"		
 		case "sfrpg":
 			return "actor.data.data.attributes.speed.value";
@@ -27,6 +28,7 @@ export function getDefaultDashMultiplier() {
 		case "dnd5e":
 		case "lancer":
 		case "pf1":
+		case "D35E":
 		case "sfrpg":
 		case "shadowrun5e":
 			return 2