chore: Fix mods order

tosuapp · Nov 20, 2024 · ed6cd11 · ed6cd11
1 parent 4032911
commit ed6cd11
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/packages/tosu/src/memory/lazer.ts b/packages/tosu/src/memory/lazer.ts
@@ -400,7 +400,7 @@ export class LazerMemory extends AbstractMemory<LazerPatternData> {
 
         const modAcronyms = JSON.parse(jsonString) as Mod[];
 
-        let mods = calculateMods(modAcronyms);
+        let mods = calculateMods(modAcronyms, true);
         if (mods instanceof Error)
             mods = Object.assign({}, defaultCalculatedMods);
 
@@ -1774,7 +1774,7 @@ export class LazerMemory extends AbstractMemory<LazerPatternData> {
                 }
             }
 
-            let mods = calculateMods(modList);
+            let mods = calculateMods(modList, true);
             if (mods instanceof Error)
                 mods = Object.assign({}, defaultCalculatedMods);
 

diff --git a/packages/tosu/src/memory/stable.ts b/packages/tosu/src/memory/stable.ts
@@ -412,7 +412,7 @@ export class StableMemory extends AbstractMemory<OsuPatternData> {
                 this.process.readInt(resultScreenBase + 0xa0)
             ).toISOString();
 
-            let mods = calculateMods(modsInt);
+            let mods = calculateMods(modsInt, true);
             if (mods instanceof Error)
                 mods = Object.assign({}, defaultCalculatedMods);
 
@@ -529,7 +529,7 @@ export class StableMemory extends AbstractMemory<OsuPatternData> {
                 maxCombo = this.process.readShort(scoreBase + 0x68);
             }
 
-            let mods = calculateMods(modsInt);
+            let mods = calculateMods(modsInt, true);
             if (mods instanceof Error)
                 mods = Object.assign({}, defaultCalculatedMods);
 
@@ -738,7 +738,7 @@ export class StableMemory extends AbstractMemory<OsuPatternData> {
                 );
             }
 
-            let mods = calculateMods(menuMods);
+            let mods = calculateMods(menuMods, true);
             if (mods instanceof Error)
                 mods = Object.assign({}, defaultCalculatedMods);
 
@@ -1140,7 +1140,7 @@ export class StableMemory extends AbstractMemory<OsuPatternData> {
 
         const modsInt = modsXor1 ^ modsXor2;
 
-        let mods = calculateMods(modsInt);
+        let mods = calculateMods(modsInt, true);
         if (mods instanceof Error)
             mods = Object.assign({}, defaultCalculatedMods);
 

diff --git a/packages/tosu/src/utils/osuMods.ts b/packages/tosu/src/utils/osuMods.ts
@@ -31,7 +31,9 @@ export const modsName = (modsNumber: number, order?: boolean): string => {
         }
 
         convertedParts.sort(
-            (a, b) => ModsOrder[a.toLowerCase()] - ModsOrder[b.toLowerCase()]
+            (a, b) =>
+                (ModsOrder[a.toLowerCase()] || 99) -
+                (ModsOrder[b.toLowerCase()] || 99)
         );
 
         const converted = convertedParts