@rian8337/osu-droid-replay-analyzer 4.0.0-beta.56 → 4.0.0-beta.58

package/dist/index.js

@@ -349,8 +349,8 @@ class RebalanceThreeFingerChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        this.isHardRock = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHardRock);
-        this.hitWindow = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise)
+        this.isHardRock = difficultyAttributes.mods.has(osuBase.ModHardRock);
+        this.hitWindow = difficultyAttributes.mods.has(osuBase.ModPrecise)
             ? new osuBase.PreciseDroidHitWindow(beatmap.difficulty.od)
             : new osuBase.DroidHitWindow(beatmap.difficulty.od);
     }
@@ -757,10 +757,10 @@ class SliderCheeseChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        this.hitWindow50 = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise)
+        this.hitWindow50 = difficultyAttributes.mods.has(osuBase.ModPrecise)
             ? new osuBase.PreciseDroidHitWindow(beatmap.difficulty.od).mehWindow
             : new osuBase.DroidHitWindow(beatmap.difficulty.od).mehWindow;
-        this.isHardRock = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHardRock);
+        this.isHardRock = difficultyAttributes.mods.has(osuBase.ModHardRock);
     }
     /**
      * Checks if relevant sliders in the given beatmap was cheesed.
@@ -999,8 +999,8 @@ class ThreeFingerChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        this.isHardRock = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHardRock);
-        this.hitWindow = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise)
+        this.isHardRock = difficultyAttributes.mods.has(osuBase.ModHardRock);
+        this.hitWindow = difficultyAttributes.mods.has(osuBase.ModPrecise)
             ? new osuBase.PreciseDroidHitWindow(beatmap.difficulty.od)
             : new osuBase.DroidHitWindow(beatmap.difficulty.od);
     }
@@ -1409,10 +1409,10 @@ class TwoHandChecker {
         this.data = data;
         const greatWindow = new osuBase.OsuHitWindow(attributes.overallDifficulty).greatWindow *
             attributes.clockRate;
-        this.hitWindow = attributes.mods.some((m) => m instanceof osuBase.ModPrecise)
+        this.hitWindow = attributes.mods.has(osuBase.ModPrecise)
             ? new osuBase.PreciseDroidHitWindow(osuBase.PreciseDroidHitWindow.greatWindowToOD(greatWindow))
             : new osuBase.DroidHitWindow(osuBase.DroidHitWindow.greatWindowToOD(greatWindow));
-        this.isHardRock = attributes.mods.some((m) => m instanceof osuBase.ModHardRock);
+        this.isHardRock = attributes.mods.has(osuBase.ModHardRock);
         // this.csvString = `Mods,${
         //     data.convertedMods.reduce((a, m) => a + m.acronym, "") || "NM"
         // }\nCombo,${data.maxCombo}\nAccuracy,"${(
@@ -2147,10 +2147,10 @@ class ReplayAnalyzer {
         const { objects } = this.beatmap.hitObjects;
         const mods = this.data.isReplayV3()
             ? this.data.convertedMods
-            : (_b = (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods.filter((m) => m.isApplicableToDroid())) !== null && _b !== void 0 ? _b : [];
+            : (_b = (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods) !== null && _b !== void 0 ? _b : new osuBase.ModMap();
         const adjustedDifficulty = new osuBase.BeatmapDifficulty(this.beatmap.difficulty);
         osuBase.ModUtil.applyModsToBeatmapDifficulty(adjustedDifficulty, osuBase.Modes.droid, mods);
-        const mehWindow = mods.some((m) => m instanceof osuBase.ModPrecise)
+        const mehWindow = mods.has(osuBase.ModPrecise)
             ? new osuBase.PreciseDroidHitWindow(adjustedDifficulty.od).mehWindow
             : new osuBase.DroidHitWindow(adjustedDifficulty.od).mehWindow;
         const accuracies = [];
@@ -2305,7 +2305,7 @@ class ReplayAnalyzer {
             hitObjectData: [],
             accuracy: new osuBase.Accuracy({ n300: 0 }),
             rank: "D",
-            convertedMods: [],
+            convertedMods: new osuBase.ModMap(),
             hit100k: 0,
             hit300k: 0,
             isFullCombo: false,
@@ -2381,42 +2381,42 @@ class ReplayAnalyzer {
      */
     convertDroidMods(replayVersion, replayMods) {
         const replayModsConstants = {
-            MOD_AUTO: new osuBase.ModAuto(),
-            MOD_AUTOPILOT: new osuBase.ModAutopilot(),
-            MOD_NOFAIL: new osuBase.ModNoFail(),
-            MOD_EASY: new osuBase.ModEasy(),
-            MOD_HIDDEN: new osuBase.ModHidden(),
-            MOD_TRACEABLE: new osuBase.ModTraceable(),
-            MOD_HARDROCK: new osuBase.ModHardRock(),
-            MOD_DOUBLETIME: new osuBase.ModDoubleTime(),
-            MOD_HALFTIME: new osuBase.ModHalfTime(),
-            MOD_NIGHTCORE: new osuBase.ModNightCore(),
-            MOD_PRECISE: new osuBase.ModPrecise(),
-            MOD_SMALLCIRCLE: new osuBase.ModSmallCircle(),
-            MOD_REALLYEASY: new osuBase.ModReallyEasy(),
-            MOD_RELAX: new osuBase.ModRelax(),
-            MOD_PERFECT: new osuBase.ModPerfect(),
-            MOD_SUDDENDEATH: new osuBase.ModSuddenDeath(),
-            MOD_SCOREV2: new osuBase.ModScoreV2(),
-            MOD_FLASHLIGHT: new osuBase.ModFlashlight(),
+            MOD_AUTO: osuBase.ModAuto,
+            MOD_AUTOPILOT: osuBase.ModAutopilot,
+            MOD_NOFAIL: osuBase.ModNoFail,
+            MOD_EASY: osuBase.ModEasy,
+            MOD_HIDDEN: osuBase.ModHidden,
+            MOD_TRACEABLE: osuBase.ModTraceable,
+            MOD_HARDROCK: osuBase.ModHardRock,
+            MOD_DOUBLETIME: osuBase.ModDoubleTime,
+            MOD_HALFTIME: osuBase.ModHalfTime,
+            MOD_NIGHTCORE: osuBase.ModNightCore,
+            MOD_PRECISE: osuBase.ModPrecise,
+            MOD_SMALLCIRCLE: osuBase.ModSmallCircle,
+            MOD_REALLYEASY: osuBase.ModReallyEasy,
+            MOD_RELAX: osuBase.ModRelax,
+            MOD_PERFECT: osuBase.ModPerfect,
+            MOD_SUDDENDEATH: osuBase.ModSuddenDeath,
+            MOD_SCOREV2: osuBase.ModScoreV2,
+            MOD_FLASHLIGHT: osuBase.ModFlashlight,
         };
-        const mods = [];
+        const map = new osuBase.ModMap();
         for (const mod of replayMods) {
-            for (const property in replayModsConstants) {
+            for (const property in Object(replayModsConstants)) {
                 if (!mod.includes(property)) {
                     continue;
                 }
                 if (replayVersion <= 3 && mod === "MOD_NIGHTCORE") {
                     // In replay v3, the NightCore mod is bugged. See ModOldNightCore's description.
-                    mods.push(new osuBase.ModOldNightCore());
+                    map.set(new osuBase.ModOldNightCore());
                 }
                 else {
-                    mods.push(replayModsConstants[property]);
+                    map.set(replayModsConstants[property]);
                 }
                 break;
             }
         }
-        return mods;
+        return map;
     }
     parseMovementData(resultObject, replayDataBuffer) {
         resultObject.cursorMovement.length = 0;
@@ -2532,12 +2532,13 @@ class ReplayAnalyzer {
         resultObject.rank = this.calculateRank(resultObject);
     }
     calculateRank(resultObject) {
-        var _a, _b;
+        var _a, _b, _c;
         const totalHits = resultObject.accuracy.n300 +
             resultObject.accuracy.n100 +
             resultObject.accuracy.n50 +
             resultObject.accuracy.nmiss;
-        const isHidden = (_b = (_a = resultObject.convertedMods) === null || _a === void 0 ? void 0 : _a.some((m) => m instanceof osuBase.ModHidden || m instanceof osuBase.ModFlashlight)) !== null && _b !== void 0 ? _b : false;
+        const isHidden = (_c = (((_a = resultObject.convertedMods) === null || _a === void 0 ? void 0 : _a.has(osuBase.ModHidden)) ||
+            ((_b = resultObject.convertedMods) === null || _b === void 0 ? void 0 : _b.has(osuBase.ModFlashlight)))) !== null && _c !== void 0 ? _c : false;
         const hit300Ratio = resultObject.accuracy.n300 / totalHits;
         switch (true) {
             case resultObject.accuracy.value() === 1:
@@ -2559,7 +2560,7 @@ class ReplayAnalyzer {
         }
     }
     constructPlayableBeatmap() {
-        var _a, _b;
+        var _a;
         if (this.beatmap instanceof osuBase.DroidPlayableBeatmap) {
             return this.beatmap;
         }
@@ -2568,7 +2569,7 @@ class ReplayAnalyzer {
         }
         const mods = this.data.isReplayV3()
             ? this.data.convertedMods
-            : (_b = (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods) !== null && _b !== void 0 ? _b : [];
+            : (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods;
         return this.beatmap.createDroidPlayableBeatmap(mods);
     }
     readByte(buffer) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-droid-replay-analyzer",
-    "version": "4.0.0-beta.56",
+    "version": "4.0.0-beta.58",
     "description": "A replay analyzer for analyzing osu!droid replay files.",
     "keywords": [
         "osu",
@@ -34,9 +34,9 @@
         "url": "https://github.com/Rian8337/osu-droid-module/issues"
     },
     "dependencies": {
-        "@rian8337/osu-base": "^4.0.0-beta.56",
-        "@rian8337/osu-difficulty-calculator": "^4.0.0-beta.56",
-        "@rian8337/osu-rebalance-difficulty-calculator": "^4.0.0-beta.56",
+        "@rian8337/osu-base": "^4.0.0-beta.58",
+        "@rian8337/osu-difficulty-calculator": "^4.0.0-beta.58",
+        "@rian8337/osu-rebalance-difficulty-calculator": "^4.0.0-beta.58",
         "java-deserialization": "^0.1.0",
         "unzipper": "^0.10.11"
     },
@@ -46,5 +46,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "330ca82968253d60fd3cb8ed0d769718028a8688"
+    "gitHead": "4a5f36a02a668f15fa22b558eeeeb13237105212"
 }

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-import { Vector2, Accuracy, ScoreRank, Mod, IModApplicableToDroid, DroidPlayableBeatmap, Beatmap } from '@rian8337/osu-base';
+import { Vector2, Accuracy, ScoreRank, ModMap, DroidPlayableBeatmap, Beatmap } from '@rian8337/osu-base';
 import { IExtendedDroidDifficultyAttributes as IExtendedDroidDifficultyAttributes$1 } from '@rian8337/osu-difficulty-calculator';
 import { IExtendedDroidDifficultyAttributes } from '@rian8337/osu-rebalance-difficulty-calculator';
 
@@ -453,7 +453,7 @@ interface ReplayInformation {
      *
      * Only available in replay v3 or later.
      */
-    convertedMods: (Mod & IModApplicableToDroid)[];
+    convertedMods: ModMap;
     /**
      * The cursor movement data of the replay.
      */
@@ -495,7 +495,7 @@ declare class ReplayV3Data extends ReplayData {
     /**
      * Enabled modifications during the play that have been converted to their respective `Mod` instances.
      */
-    readonly convertedMods: (Mod & IModApplicableToDroid)[];
+    readonly convertedMods: ModMap;
     constructor(values: ReplayInformation);
 }