@rian8337/osu-droid-replay-analyzer 4.0.0-beta.25 → 4.0.0-beta.26

package/dist/index.js

@@ -327,14 +327,9 @@ class RebalanceThreeFingerChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        const od = osuBase.calculateDroidDifficultyStatistics({
-            overallDifficulty: beatmap.difficulty.od,
-            mods: osuBase.ModUtil.removeSpeedChangingMods(difficultyAttributes.mods),
-            convertOverallDifficulty: false,
-        }).overallDifficulty;
         this.isPrecise = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise);
         this.isHardRock = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHardRock);
-        this.hitWindow = new osuBase.DroidHitWindow(od);
+        this.hitWindow = new osuBase.DroidHitWindow(beatmap.difficulty.od);
     }
     /**
      * Checks whether a beatmap is eligible to be detected for 3-finger.
@@ -799,14 +794,9 @@ class ThreeFingerChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        const od = osuBase.calculateDroidDifficultyStatistics({
-            overallDifficulty: beatmap.difficulty.od,
-            mods: osuBase.ModUtil.removeSpeedChangingMods(difficultyAttributes.mods),
-            convertOverallDifficulty: false,
-        }).overallDifficulty;
         this.isPrecise = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise);
         this.isHardRock = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHardRock);
-        this.hitWindow = new osuBase.DroidHitWindow(od);
+        this.hitWindow = new osuBase.DroidHitWindow(beatmap.difficulty.od);
     }
     /**
      * Checks whether a beatmap is eligible to be detected for 3-finger.
@@ -1205,12 +1195,9 @@ class TwoHandChecker {
         this.indexedHitObjects = [];
         this.calculator = calculator;
         this.data = data;
-        const od = osuBase.calculateDroidDifficultyStatistics({
-            overallDifficulty: calculator.beatmap.difficulty.od,
-            mods: osuBase.ModUtil.removeSpeedChangingMods(calculator.mods),
-            convertOverallDifficulty: false,
-        }).overallDifficulty;
-        this.hitWindow = new osuBase.DroidHitWindow(od);
+        const greatWindow = new osuBase.OsuHitWindow(calculator.attributes.overallDifficulty).hitWindowFor300() * calculator.attributes.clockRate;
+        const isPrecise = calculator.mods.some((m) => m instanceof osuBase.ModPrecise);
+        this.hitWindow = new osuBase.DroidHitWindow(osuBase.DroidHitWindow.hitWindow300ToOD(greatWindow, isPrecise));
         this.hitWindow50 = this.hitWindow.hitWindowFor50(calculator.mods.some((m) => m instanceof osuBase.ModPrecise));
         this.isHardRock = calculator.mods.some((m) => m instanceof osuBase.ModHardRock);
         // this.csvString = `Mods,${
@@ -1806,12 +1793,7 @@ class SliderCheeseChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        const od = osuBase.calculateDroidDifficultyStatistics({
-            overallDifficulty: beatmap.difficulty.od,
-            mods: osuBase.ModUtil.removeSpeedChangingMods(difficultyAttributes.mods),
-            convertOverallDifficulty: false,
-        }).overallDifficulty;
-        this.hitWindow50 = new osuBase.DroidHitWindow(od).hitWindowFor50(difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise));
+        this.hitWindow50 = new osuBase.DroidHitWindow(beatmap.difficulty.od).hitWindowFor50(difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise));
         this.isHardRock = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHardRock);
     }
     /**
@@ -2173,11 +2155,9 @@ class ReplayAnalyzer {
         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 : [];
-        const od = osuBase.calculateDroidDifficultyStatistics({
-            overallDifficulty: beatmap.difficulty.od,
-            mods: osuBase.ModUtil.removeSpeedChangingMods(mods),
-        }).overallDifficulty;
-        const hitWindow50 = new osuBase.DroidHitWindow(od).hitWindowFor50(mods.some((m) => m instanceof osuBase.ModPrecise));
+        const adjustedDifficulty = new osuBase.BeatmapDifficulty(beatmap.difficulty);
+        osuBase.ModUtil.applyModsToBeatmapDifficulty(adjustedDifficulty, osuBase.Modes.droid, mods, this.data.isReplayV4() ? this.data.speedMultiplier : 1);
+        const hitWindow50 = new osuBase.DroidHitWindow(adjustedDifficulty.od).hitWindowFor50(mods.some((m) => m instanceof osuBase.ModPrecise));
         // The accuracy of sliders is set to (50 hit window)ms + 13ms if their head was not hit:
         // https://github.com/osudroid/osu-droid/blob/6306c68e3ffaf671eac794bf45cc95c0f3313a82/src/ru/nsu/ccfit/zuev/osu/game/Slider.java#L821
         //
@@ -2337,26 +2317,24 @@ class ReplayAnalyzer {
             isFullCombo: false,
             maxCombo: 0,
             playerName: "",
-            rawMods: "",
+            rawMods: [],
             score: 0,
             time: new Date(0),
         };
         if (resultObject.replayVersion >= 3) {
-            resultObject.time = new Date(Number(rawObject[4].readBigUInt64BE(0)));
+            resultObject.time.setTime(Number(rawObject[4].readBigUInt64BE(0)));
             resultObject.hit300k = rawObject[4].readInt32BE(8);
+            resultObject.accuracy.n300 = rawObject[4].readInt32BE(12);
             resultObject.hit100k = rawObject[4].readInt32BE(16);
+            resultObject.accuracy.n100 = rawObject[4].readInt32BE(20);
+            resultObject.accuracy.n50 = rawObject[4].readInt32BE(24);
+            resultObject.accuracy.nmiss = rawObject[4].readInt32BE(28);
             resultObject.score = rawObject[4].readInt32BE(32);
             resultObject.maxCombo = rawObject[4].readInt32BE(36);
-            resultObject.accuracy = new osuBase.Accuracy({
-                n300: rawObject[4].readInt32BE(12),
-                n100: rawObject[4].readInt32BE(20),
-                n50: rawObject[4].readInt32BE(24),
-                nmiss: rawObject[4].readInt32BE(28),
-            });
             resultObject.isFullCombo = !!rawObject[4][44];
             resultObject.playerName = rawObject[5];
-            resultObject.rawMods = rawObject[6].elements;
-            resultObject.convertedMods = osuBase.ModUtil.droidStringToMods(this.convertDroidMods(rawObject[6].elements));
+            resultObject.rawMods = Object.values(rawObject[6].elements);
+            resultObject.convertedMods = osuBase.ModUtil.droidStringToMods(this.convertDroidMods(resultObject.rawMods));
             resultObject.rank = this.calculateRank(resultObject);
         }
         if (resultObject.replayVersion >= 4) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-droid-replay-analyzer",
-    "version": "4.0.0-beta.25",
+    "version": "4.0.0-beta.26",
     "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.25",
-        "@rian8337/osu-difficulty-calculator": "^4.0.0-beta.25",
-        "@rian8337/osu-rebalance-difficulty-calculator": "^4.0.0-beta.25",
+        "@rian8337/osu-base": "^4.0.0-beta.26",
+        "@rian8337/osu-difficulty-calculator": "^4.0.0-beta.26",
+        "@rian8337/osu-rebalance-difficulty-calculator": "^4.0.0-beta.26",
         "java-deserialization": "^0.1.0",
         "unzipper": "^0.10.11"
     },
@@ -46,5 +46,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "2d6271ea24c787caad1d24c3d20dbeeaf450359e"
+    "gitHead": "1c353ee9455d80a5ca8358762f107899d64f1d5e"
 }

package/typings/index.d.ts

@@ -415,7 +415,7 @@ interface ReplayInformation {
      *
      * Only available in replay v3 or later.
      */
-    rawMods: string;
+    rawMods: string[];
     /**
      * The achieved rank in the play.
      */
@@ -503,7 +503,7 @@ declare class ReplayV3Data extends ReplayData {
     /**
      * Enabled modifications during the play in raw Java object format.
      */
-    readonly rawMods: string;
+    readonly rawMods: string[];
     /**
      * Enabled modifications during the play that have been converted to their respective `Mod` instances.
      */