cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-03-07 06:26:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue with overlapping tokens

Browse source
This commit is contained in:
Carlos Fernandez 2026-02-24 02:56:59 -05:00
parent 5dfc678561
commit c0451ee023
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
module/canvas/placeables/token.mjs
View file

@ -54,11 +54,12 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
if (this === target) return 0; if (this === target) return 0;
const originPoint = this.center; const originPoint = this.center;
const destinationPoint = target.center; const targetPoint = target.center;
const thisBounds = this.bounds; const thisBounds = this.bounds;
const targetBounds = target.bounds; const targetBounds = target.bounds;
// Figure out the elevation difference // Figure out the elevation difference.
// This intends to return "grid distance" for adjacent ones, so we add that number if not overlapping.
const sizePerUnit = canvas.grid.size / canvas.grid.distance; const sizePerUnit = canvas.grid.size / canvas.grid.distance;
const thisHeight = Math.max(thisBounds.width, thisBounds.height) / sizePerUnit; const thisHeight = Math.max(thisBounds.width, thisBounds.height) / sizePerUnit;
const targetHeight = Math.max(targetBounds.width, targetBounds.height) / sizePerUnit; const targetHeight = Math.max(targetBounds.width, targetBounds.height) / sizePerUnit;
@ -68,7 +69,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
thisElevation[0] < targetElevation[1] && // bottom of this must be at or below the top of target thisElevation[0] < targetElevation[1] && // bottom of this must be at or below the top of target
thisElevation[1] > targetElevation[0]; // top of this must be at or above the bottom of target thisElevation[1] > targetElevation[0]; // top of this must be at or above the bottom of target
const [lower, higher] = [targetElevation, thisElevation].sort((a, b) => a[1] - b[1]); const [lower, higher] = [targetElevation, thisElevation].sort((a, b) => a[1] - b[1]);
const elevation = isSameAltitude ? 0 : higher[0] - lower[1] + 5; const elevation = isSameAltitude ? 0 : higher[0] - lower[1] + canvas.grid.distance;
// Compute for gridless. This version returns circular edge to edge + grid distance, // Compute for gridless. This version returns circular edge to edge + grid distance,
// so that tokens that are touching return 5. // so that tokens that are touching return 5.
@ -78,22 +79,26 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
const targetRadius = (targetBounds.width * boundsCorrection) / 2; const targetRadius = (targetBounds.width * boundsCorrection) / 2;
const distance = canvas.grid.measurePath([ const distance = canvas.grid.measurePath([
{ ...originPoint, elevation: 0 }, { ...originPoint, elevation: 0 },
{ ...destinationPoint, elevation } { ...targetPoint, elevation }
]).distance; ]).distance;
return Math.floor(distance - originRadius - targetRadius + canvas.grid.distance); return Math.floor(distance - originRadius - targetRadius + canvas.grid.distance);
} }
// Compute what the closest grid space of each token is, then compute that distance // Compute what the closest grid space of each token is, then compute that distance
const originEdge = this.#getEdgeBoundary(thisBounds, originPoint, destinationPoint); const originEdge = this.#getEdgeBoundary(thisBounds, originPoint, targetPoint);
const targetEdge = this.#getEdgeBoundary(targetBounds, originPoint, destinationPoint); const targetEdge = this.#getEdgeBoundary(targetBounds, originPoint, targetPoint);
const adjustedOriginPoint = canvas.grid.getTopLeftPoint({ const adjustedOriginPoint = originEdge
x: originEdge.x + Math.sign(originPoint.x - originEdge.x), ? canvas.grid.getTopLeftPoint({
y: originEdge.y + Math.sign(originPoint.y - originEdge.y) x: originEdge.x + Math.sign(originPoint.x - originEdge.x),
}); y: originEdge.y + Math.sign(originPoint.y - originEdge.y)
const adjustDestinationPoint = canvas.grid.getTopLeftPoint({ })
x: targetEdge.x + Math.sign(destinationPoint.x - targetEdge.x), : originPoint;
y: targetEdge.y + Math.sign(destinationPoint.y - targetEdge.y) const adjustDestinationPoint = targetEdge
}); ? canvas.grid.getTopLeftPoint({
x: targetEdge.x + Math.sign(targetPoint.x - targetEdge.x),
y: targetEdge.y + Math.sign(targetPoint.y - targetEdge.y)
})
: targetPoint;
return canvas.grid.measurePath([ return canvas.grid.measurePath([
{ ...adjustedOriginPoint, elevation: 0 }, { ...adjustedOriginPoint, elevation: 0 },
{ ...adjustDestinationPoint, elevation } { ...adjustDestinationPoint, elevation }