Merge pull request #37 from Matt-Hurd/mhurd/minor_stuff

Minor stuff
totum-tools · Sep 14, 2023 · b9905c3 · b9905c3
2 parents 07a9fb7 + 3b3c8e6
commit b9905c3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/public/assets/default_routes.json b/public/assets/default_routes.json
@@ -11,6 +11,21 @@
         "name": "Centum v1.2",
         "gh": true,
         "path": "gh/Matt-Hurd/totk-speedrun-routes/hundo_centum_v1.2/"
+      },
+      {
+        "name": "Any% Scuffed",
+        "gh": true,
+        "path": "gh/Matt-Hurd/totk-speedrun-routes/any_scuffed_abahbob_1.0/"
+      },
+      {
+        "name": "AD Scuffed",
+        "gh": true,
+        "path": "gh/Matt-Hurd/totk-speedrun-routes/ad_scuffed_abahbob_1.0/"
+      },
+      {
+        "name": "AMQ Scuffed",
+        "gh": true,
+        "path": "gh/Matt-Hurd/totk-speedrun-routes/amq_scuffed_abahbob_1.0/"
       }
     ]
   }

diff --git a/src/models/Route.ts b/src/models/Route.ts
@@ -5,6 +5,7 @@ export default class Route {
   url: string;
   game: Game;
   version: string;
+  category: string = "";
   branches: Branch[] = [];
   things: Record<string, Thing> = {};
 

diff --git a/src/store/progressSlice.ts b/src/store/progressSlice.ts
@@ -2,7 +2,7 @@ import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
 import { RootState } from ".";
 import liveSplitService from "../services/LiveSplitWebSocket";
 
-interface ProgressState {
+export interface ProgressState {
   branchIndex: number;
   pointIndex: number;
 }
@@ -25,7 +25,14 @@ export const incrementProgress = createAsyncThunk("progress/increment", async (_
       ((thing.type === "Shrine" && point.action === "COMPLETE") || thing.type === "Lightroot")
     ) {
       const currentSplitName = await liveSplit.getCurrentSplitName();
-      if (currentSplitName.endsWith(thing.name)) {
+
+      const shrineName = thing.name.replace(" Shrine", "").replace(" Lightroot", "");
+
+      const sanitizedCurrentSplitName = currentSplitName.startsWith("-")
+        ? currentSplitName.substring(1)
+        : currentSplitName;
+
+      if (sanitizedCurrentSplitName === shrineName) {
         liveSplit.split();
       }
     }