Fix diagonal movement calculation

Closes #18

CHANGELOG

@@ -4,6 +4,7 @@
 - Prevent weapons from becoming unequipped when switching weapon sets
 - Only allow weapons with attack actions and attacks for weapon sets
 - Remove background skills from drawer when not active
+- Fix movement calculation for diagonals
 
 ## 0.9.4
 - Top-align portrait tooltips to avoid overlapping actual text

modules/argon/buttons/itemButton.mjs

@@ -257,7 +257,6 @@ export function itemButton(ARGON) {
                     })
                 }
 
-                console.log(action)
                 if (action.data.duration.value) {
                     details.push({
                         label: game.i18n.localize("PF1.Duration"),

modules/argon/movementHud.mjs

@@ -5,6 +5,7 @@ export function movementHud(ARGON) {
         constructor(props) {
             super(props);
             this.triggerCount = 0;
+            this.movedDiagonals = 0;
         }
 
         get isUnchained() {
@@ -20,6 +21,52 @@ export function movementHud(ARGON) {
             return Math.floor((isElevated ? flySpeed : landSpeed) / 5);
         }
 
+        onTokenUpdate(updates, context) {
+            if (updates.x === undefined && updates.y === undefined) return;
+            console.log(updates, context)
+            const dimensions = canvas.dimensions.distance;
+
+            const distanceX = Math.floor(canvas.grid.measureDistance({
+                x: this.token.x,
+                y: 0
+            }, {x: updates.x ?? this.token.x, y: 0}, {gridSpaces: true}) / dimensions);
+
+            const distanceY = Math.floor(canvas.grid.measureDistance({x: 0, y: this.token.y}, {
+                x: 0,
+                y: updates.y ?? this.token.y
+            }, {gridSpaces: true}) / dimensions);
+
+            const diagonals = Math.min(distanceX, distanceY);
+            const straights = Math.abs(distanceX - distanceY);
+            const diagonalRule = game.settings.get("pf1", "diagonalMovement");
+
+            let distance = straights;
+            switch(diagonalRule) {
+                case "555":
+                    distance += diagonals;
+                    break;
+
+                case "5105":
+                    const diagonalDistance = diagonals * 1.5;
+                    distance += !!(this.movedDiagonals % 2) === !!context?.isUndo ? Math.floor(diagonalDistance) : Math.ceil(diagonalDistance);
+                    break;
+
+                default:
+                    console.error("Movement rule not supported.");
+                    distance += diagonals;
+                    break;
+            }
+
+            if (context?.isUndo) {
+                this.movementUsed -= distance;
+                this.movedDiagonals -= diagonals;
+            } else {
+                this.movementUsed += distance;
+                this.movedDiagonals += diagonals;
+            }
+            this.updateMovement();
+        }
+
         updateMovement() {
             super.updateMovement();
 
@@ -66,11 +113,13 @@ export function movementHud(ARGON) {
         _onNewRound(combat) {
             super._onNewRound(combat);
             this.triggerCount = 0;
+            this.movedDiagonals = 0;
         }
 
         _onCombatEnd(combat) {
             super._onCombatEnd(combat);
             this.triggerCount = 0;
+            this.movedDiagonals = 0;
         }
 
     }