feat: Can now sort initiatives by descendig or ascending (#68)

javalent · Aug 16, 2023 · 079b59c · 079b59c
1 parent fefe218
commit 079b59c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/index.ts b/index.ts
@@ -123,7 +123,7 @@ export interface InitiativeTrackerData {
     diplayPlayerHPValues: boolean;
     rollHP: boolean;
     builder: BuilderState;
-
+    descending: boolean;
     version: number[];
 }
 

diff --git a/src/tracker/stores/tracker.ts b/src/tracker/stores/tracker.ts
@@ -80,6 +80,9 @@ function createTracker() {
     const $party = writable<string | null>();
 
     const data = writable<InitiativeTrackerData>();
+    const descending = derived(data, (data) => {
+        return data.descending;
+    });
     let _settings: InitiativeTrackerData;
 
     const condensed = derived(creatures, (values) => {
@@ -96,10 +99,12 @@ function createTracker() {
     });
 
     let current_order: Creature[] = [];
-    const ordered = derived(condensed, (values) => {
+    const ordered = derived([condensed, data], ([values, data]) => {
         const sort = [...values];
         sort.sort((a, b) => {
-            return b.initiative - a.initiative;
+            return data.descending
+                ? b.initiative - a.initiative
+                : a.initiative - b.initiative;
         });
         current_order = sort;
         return sort;
@@ -504,6 +509,8 @@ function createTracker() {
 
         name: $name,
 
+        sort: descending,
+
         party: $party,
         setParty: (party: string, plugin: InitiativeTracker) =>
             updateAndSave((creatures) => {

diff --git a/src/tracker/ui/Controls.svelte b/src/tracker/ui/Controls.svelte
@@ -20,7 +20,7 @@
 
     import { tracker } from "../stores/tracker";
 
-    const { state, data, logFile } = tracker;
+    const { state, data, logFile, sort } = tracker;
 
     const desktop = Platform.isDesktop;
 
@@ -116,6 +116,19 @@
                     );
                 });
         });
+        menu.addItem((item) => {
+            item.setTitle($sort ? "Sort Ascending" : "Sort Descending").onClick(
+                async () => {
+                    plugin.data.descending = !plugin.data.descending;
+                    await plugin.saveSettings();
+                    item.setTitle(
+                        plugin.data.descending
+                            ? "Sort Ascending"
+                            : "Sort Descending"
+                    );
+                }
+            );
+        });
 
         menu.addSeparator();
         menu.addItem((item) => {

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -56,14 +56,14 @@ export const DEFAULT_SETTINGS: InitiativeTrackerData = {
     useLegacy: false,
     diplayPlayerHPValues: true,
     rollHP: false,
+    descending: true,
     builder: {
         showParty: true,
         showXP: true,
         sidebarIcon: true
-    },
+    }
 };
 
-
 export const OVERFLOW_TYPE: { [key: string]: string } = {
     ignore: "ignore",
     current: "current",
@@ -77,5 +77,5 @@ export const DECIMAL_TO_VULGAR_FRACTION: Record<string, string> = {
     0.5: "½",
     0.625: "⅝",
     0.75: "¾",
-    0.875: "⅞",
+    0.875: "⅞"
 } as const;