Fix drag & drop reordering with new initiative ties code

When any creature is dragged in the initiative order, the current order of every
creature is stored. The order of all creatures is resolved in this order:
1. Initiative
2. Manual order
3. Initiative ties option
If a creature is dragged out of its current initiative, the initiative value is
updated, as previously. Manual ordering lets you reorder initiative to override
other settings, for example in Pathfinder where by default NPCs always come
before players on the same initiative, you can drag a player to come before an
NPC if they have the feat that allows this.

Manual ordering is wiped when initiative is rerolled. It isn't wiped if the
initiative ties setting is changed, because this might not be what the player
wants.

Author: Trantion897

src/tracker/stores/tracker.ts

@@ -96,7 +96,7 @@ function createTracker() {
         return data.descending;
     });
     let _settings: InitiativeTrackerData | null;
-
+    
     const condensed = derived(creatures, (values) => {
         if (_settings?.condense) {
             values.forEach((creature, _, arr) => {
@@ -117,24 +117,40 @@ function createTracker() {
     const ordered = derived([condensed, data], ([values, data]) => {
         const sort = [...values];
         sort.sort((a, b) => {
-            if (a.initiative == b.initiative) {
-                switch (_settings.resolveTies) {
-                    case RESOLVE_TIES.random:
-                        return Math.random() < 0.5 ? 1 : -1;
-                    case RESOLVE_TIES.playerFirst:
-                    case RESOLVE_TIES.npcFirst:
-                        const aPlayer = a.player ? 1 : 0;
-                        const bPlayer = b.player ? 1 : 0;
-                        if (_settings.resolveTies == RESOLVE_TIES.playerFirst) {
-                            return bPlayer - aPlayer
-                        } else {
-                            return aPlayer - bPlayer
-                        }
-                }
-            }
-            return data.descending
+            /* Order creatures in this order:
+               1. By initiative
+               2. By manual order (drag & drop)
+               3. According to the resolveTies setting */
+            if (a.initiative != b.initiative) {
+                return data.descending
                 ? b.initiative - a.initiative
                 : a.initiative - b.initiative;
+            }
+            
+            if (
+                a.manualOrder !== null && a.manualOrder !== undefined && 
+                b.manualOrder !== null && b.manualOrder !== undefined && 
+                a.manualOrder !== b.manualOrder
+            ) {
+                const aOrder = a.manualOrder || 0;
+                const bOrder = b.manualOrder || 0;
+                return aOrder - bOrder;
+            }
+            
+            switch (_settings.resolveTies) {
+                case RESOLVE_TIES.random:
+                    return Math.random() < 0.5 ? 1 : -1;
+                case RESOLVE_TIES.playerFirst:
+                case RESOLVE_TIES.npcFirst:
+                    const aPlayer = a.player ? 1 : 0;
+                    const bPlayer = b.player ? 1 : 0;
+                    if (_settings.resolveTies == RESOLVE_TIES.playerFirst) {
+                        return bPlayer - aPlayer
+                    } else {
+                        return aPlayer - bPlayer
+                    }
+            }
+            
         });
         current_order = sort;
         return sort;
@@ -352,6 +368,7 @@ function createTracker() {
                     creature.modifier
                 );
             }
+            creature.manualOrder = null;
         }
         return creatures;
     }

src/tracker/ui/creatures/Table.svelte

@@ -54,7 +54,10 @@
             tracker.logNewInitiative(dropped.creature);
         }
         items = e.detail.items;
-        $tracker = [...items.map(({ creature }) => creature)];
+        $tracker = [...items.map(({ creature }, i) => {
+            creature.manualOrder = i;
+            return creature;
+        })];
     }
 
     const diceIcon = (node: HTMLElement) => {

src/utils/creature.ts

@@ -35,6 +35,7 @@ export class Creature {
     status: Set<Condition> = new Set();
     marker: string;
     initiative: number;
+    manualOrder: number;
     static: boolean = false;
     source: string | string[];
     id: string;