@rian8337/osu-droid-replay-analyzer 4.0.0-beta.38 → 4.0.0-beta.39

package/dist/index.js

@@ -294,9 +294,6 @@ exports.HitResult = void 0;
  * Utility to check whether or not a beatmap is three-fingered for rebalance scores.
  */
 class RebalanceThreeFingerChecker {
-    get hitWindow50() {
-        return this.hitWindow.hitWindowFor50(this.isPrecise);
-    }
     /**
      * @param beatmap The beatmap to analyze.
      * @param data The data of the replay.
@@ -327,9 +324,10 @@ class RebalanceThreeFingerChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        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(beatmap.difficulty.od);
+        this.hitWindow = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise)
+            ? new osuBase.PreciseDroidHitWindow(beatmap.difficulty.od)
+            : new osuBase.DroidHitWindow(beatmap.difficulty.od);
     }
     /**
      * Checks whether a beatmap is eligible to be detected for 3-finger.
@@ -383,7 +381,7 @@ class RebalanceThreeFingerChecker {
                     timeBefore += objectBeforeData.accuracy;
                 }
                 else {
-                    timeBefore += this.hitWindow.hitWindowFor50(this.isPrecise);
+                    timeBefore += this.hitWindow.mehWindow;
                 }
             }
             const afterIndex = beforeIndex + 1;
@@ -413,31 +411,31 @@ class RebalanceThreeFingerChecker {
         const firstObject = objects[0];
         const lastObject = objects.at(-1);
         // For sliders, automatically set hit window length to be as lenient as possible.
-        let firstObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+        let firstObjectHitWindow = this.hitWindow.mehWindow;
         if (firstObject instanceof osuBase.Circle) {
             switch (firstObjectResult) {
                 case exports.HitResult.great:
-                    firstObjectHitWindow = this.hitWindow.hitWindowFor300(this.isPrecise);
+                    firstObjectHitWindow = this.hitWindow.greatWindow;
                     break;
                 case exports.HitResult.good:
-                    firstObjectHitWindow = this.hitWindow.hitWindowFor100(this.isPrecise);
+                    firstObjectHitWindow = this.hitWindow.okWindow;
                     break;
                 default:
-                    firstObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+                    firstObjectHitWindow = this.hitWindow.mehWindow;
             }
         }
         // For sliders, automatically set hit window length to be as lenient as possible.
-        let lastObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+        let lastObjectHitWindow = this.hitWindow.mehWindow;
         if (lastObject instanceof osuBase.Circle) {
             switch (lastObjectResult) {
                 case exports.HitResult.great:
-                    lastObjectHitWindow = this.hitWindow.hitWindowFor300(this.isPrecise);
+                    lastObjectHitWindow = this.hitWindow.greatWindow;
                     break;
                 case exports.HitResult.good:
-                    lastObjectHitWindow = this.hitWindow.hitWindowFor100(this.isPrecise);
+                    lastObjectHitWindow = this.hitWindow.okWindow;
                     break;
                 default:
-                    lastObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+                    lastObjectHitWindow = this.hitWindow.mehWindow;
             }
         }
         else if (lastObject instanceof osuBase.Slider) {
@@ -507,7 +505,9 @@ class RebalanceThreeFingerChecker {
         }
         // Check for sliderbreaks and treat them as misses.
         if (object instanceof osuBase.Slider &&
-            objectData.accuracy === Math.floor(this.hitWindow50) + 13) {
+            (-this.hitWindow.mehWindow > objectData.accuracy ||
+                objectData.accuracy >
+                    Math.min(this.hitWindow.mehWindow, object.duration))) {
             return -1;
         }
         const hitTime = object.startTime + objectData.accuracy;
@@ -593,7 +593,9 @@ class RebalanceThreeFingerChecker {
         }
         // Check for sliderbreaks and treat them as misses.
         if (object instanceof osuBase.Slider &&
-            objectData.accuracy === Math.floor(this.hitWindow50) + 13) {
+            (-this.hitWindow.mehWindow > objectData.accuracy ||
+                objectData.accuracy >
+                    Math.min(this.hitWindow.mehWindow, object.duration))) {
             return -1;
         }
         const hitTime = object.startTime + objectData.accuracy;
@@ -761,9 +763,6 @@ class ReplayData {
  * Utility to check whether or not a beatmap is three-fingered for rebalance scores.
  */
 class ThreeFingerChecker {
-    get hitWindow50() {
-        return this.hitWindow.hitWindowFor50(this.isPrecise);
-    }
     /**
      * @param beatmap The beatmap to analyze.
      * @param data The data of the replay.
@@ -794,9 +793,10 @@ class ThreeFingerChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        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(beatmap.difficulty.od);
+        this.hitWindow = difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise)
+            ? new osuBase.PreciseDroidHitWindow(beatmap.difficulty.od)
+            : new osuBase.DroidHitWindow(beatmap.difficulty.od);
     }
     /**
      * Checks whether a beatmap is eligible to be detected for 3-finger.
@@ -850,7 +850,7 @@ class ThreeFingerChecker {
                     timeBefore += objectBeforeData.accuracy;
                 }
                 else {
-                    timeBefore += this.hitWindow.hitWindowFor50(this.isPrecise);
+                    timeBefore += this.hitWindow.mehWindow;
                 }
             }
             const afterIndex = beforeIndex + 1;
@@ -880,31 +880,31 @@ class ThreeFingerChecker {
         const firstObject = objects[0];
         const lastObject = objects.at(-1);
         // For sliders, automatically set hit window length to be as lenient as possible.
-        let firstObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+        let firstObjectHitWindow = this.hitWindow.mehWindow;
         if (firstObject instanceof osuBase.Circle) {
             switch (firstObjectResult) {
                 case exports.HitResult.great:
-                    firstObjectHitWindow = this.hitWindow.hitWindowFor300(this.isPrecise);
+                    firstObjectHitWindow = this.hitWindow.greatWindow;
                     break;
                 case exports.HitResult.good:
-                    firstObjectHitWindow = this.hitWindow.hitWindowFor100(this.isPrecise);
+                    firstObjectHitWindow = this.hitWindow.okWindow;
                     break;
                 default:
-                    firstObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+                    firstObjectHitWindow = this.hitWindow.mehWindow;
             }
         }
         // For sliders, automatically set hit window length to be as lenient as possible.
-        let lastObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+        let lastObjectHitWindow = this.hitWindow.mehWindow;
         if (lastObject instanceof osuBase.Circle) {
             switch (lastObjectResult) {
                 case exports.HitResult.great:
-                    lastObjectHitWindow = this.hitWindow.hitWindowFor300(this.isPrecise);
+                    lastObjectHitWindow = this.hitWindow.greatWindow;
                     break;
                 case exports.HitResult.good:
-                    lastObjectHitWindow = this.hitWindow.hitWindowFor100(this.isPrecise);
+                    lastObjectHitWindow = this.hitWindow.okWindow;
                     break;
                 default:
-                    lastObjectHitWindow = this.hitWindow.hitWindowFor50(this.isPrecise);
+                    lastObjectHitWindow = this.hitWindow.mehWindow;
             }
         }
         else if (lastObject instanceof osuBase.Slider) {
@@ -974,7 +974,9 @@ class ThreeFingerChecker {
         }
         // Check for sliderbreaks and treat them as misses.
         if (object instanceof osuBase.Slider &&
-            objectData.accuracy === Math.floor(this.hitWindow50) + 13) {
+            (-this.hitWindow.mehWindow > objectData.accuracy ||
+                objectData.accuracy >
+                    Math.min(this.hitWindow.mehWindow, object.duration))) {
             return -1;
         }
         const hitTime = object.startTime + objectData.accuracy;
@@ -1060,7 +1062,9 @@ class ThreeFingerChecker {
         }
         // Check for sliderbreaks and treat them as misses.
         if (object instanceof osuBase.Slider &&
-            objectData.accuracy === Math.floor(this.hitWindow50) + 13) {
+            (-this.hitWindow.mehWindow > objectData.accuracy ||
+                objectData.accuracy >
+                    Math.min(this.hitWindow.mehWindow, object.duration))) {
             return -1;
         }
         const hitTime = object.startTime + objectData.accuracy;
@@ -1195,10 +1199,11 @@ class TwoHandChecker {
         this.indexedHitObjects = [];
         this.calculator = calculator;
         this.data = data;
-        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));
+        const greatWindow = new osuBase.OsuHitWindow(calculator.attributes.overallDifficulty)
+            .greatWindow * calculator.attributes.clockRate;
+        this.hitWindow = calculator.mods.some((m) => m instanceof osuBase.ModPrecise)
+            ? new osuBase.PreciseDroidHitWindow(osuBase.PreciseDroidHitWindow.greatWindowToOD(greatWindow))
+            : new osuBase.DroidHitWindow(osuBase.DroidHitWindow.greatWindowToOD(greatWindow));
         this.isHardRock = calculator.mods.some((m) => m instanceof osuBase.ModHardRock);
         // this.csvString = `Mods,${
         //     data.convertedMods.reduce((a, m) => a + m.acronym, "") || "NM"
@@ -1513,16 +1518,15 @@ class TwoHandChecker {
                 cursorTime: object.startTime,
             };
         }
-        let hitWindow = this.hitWindow50;
-        const isPrecise = this.calculator.mods.some((m) => m instanceof osuBase.ModPrecise);
+        let hitWindow = this.hitWindow.mehWindow;
         // For sliders, set the hit window to as lenient as possible.
         if (object instanceof osuBase.Circle) {
             switch (data.result) {
                 case exports.HitResult.great:
-                    hitWindow = this.hitWindow.hitWindowFor300(isPrecise);
+                    hitWindow = this.hitWindow.greatWindow;
                     break;
                 case exports.HitResult.good:
-                    hitWindow = this.hitWindow.hitWindowFor100(isPrecise);
+                    hitWindow = this.hitWindow.okWindow;
                     break;
             }
         }
@@ -1793,7 +1797,9 @@ class SliderCheeseChecker {
         this.beatmap = beatmap;
         this.data = data;
         this.difficultyAttributes = difficultyAttributes;
-        this.hitWindow50 = new osuBase.DroidHitWindow(beatmap.difficulty.od).hitWindowFor50(difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise));
+        this.hitWindow50 = difficultyAttributes.mods.some((m) => m instanceof 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);
     }
     /**
@@ -1829,13 +1835,15 @@ class SliderCheeseChecker {
             if (difficultSlider.index >= this.data.hitObjectData.length) {
                 continue;
             }
+            const object = objects[difficultSlider.index];
             const objectData = this.data.hitObjectData[difficultSlider.index];
             // If a miss or slider break occurs, we disregard the check for that slider.
             if (objectData.result === exports.HitResult.miss ||
-                objectData.accuracy === Math.floor(this.hitWindow50) + 13) {
+                -this.hitWindow50 > objectData.accuracy ||
+                objectData.accuracy >
+                    Math.min(this.hitWindow50, object.duration)) {
                 continue;
             }
-            const object = objects[difficultSlider.index];
             const objectStartPosition = object.getStackedPosition(osuBase.Modes.droid);
             // These time boundaries should consider the delta time between the previous and next
             // object as well as their hit accuracy. However, they are somewhat complicated to
@@ -2005,6 +2013,20 @@ class SliderCheeseChecker {
  * This is used when analyzing replays using replay analyzer.
  */
 class ReplayV3Data extends ReplayData {
+    /**
+     * The complete mod string of this replay (mods, speed multiplier, and forced difficulty statistics combined).
+     */
+    get completeModString() {
+        return this.modString;
+    }
+    /**
+     * The mod string of this replay (mods only).
+     */
+    get modString() {
+        return this.convertedMods.length > 0
+            ? this.convertedMods.map((v) => v.acronym).join("")
+            : "No Mod";
+    }
     constructor(values) {
         super(values);
         this.time = values.time;
@@ -2025,6 +2047,23 @@ class ReplayV3Data extends ReplayData {
  * This is used when analyzing replays using replay analyzer.
  */
 class ReplayV4Data extends ReplayV3Data {
+    get completeModString() {
+        let finalString = this.modString;
+        const customStats = [];
+        if (this.speedMultiplier !== 1) {
+            customStats.push(`${this.speedMultiplier}x`);
+        }
+        if (this.forceAR !== undefined) {
+            customStats.push(`AR${this.forceAR}`);
+        }
+        if (this.flashlightFollowDelay !== undefined) {
+            customStats.push(`FLD${this.flashlightFollowDelay}`);
+        }
+        if (customStats.length > 0) {
+            finalString += ` (${customStats.join(", ")})`;
+        }
+        return finalString;
+    }
     constructor(values) {
         var _a, _b;
         super(values);
@@ -2042,6 +2081,32 @@ class ReplayV4Data extends ReplayV3Data {
  * This is used when analyzing replays using replay analyzer.
  */
 class ReplayV5Data extends ReplayV4Data {
+    get completeModString() {
+        let finalString = this.modString;
+        const customStats = [];
+        if (this.speedMultiplier !== 1) {
+            customStats.push(`${this.speedMultiplier}x`);
+        }
+        if (this.forceAR !== undefined) {
+            customStats.push(`AR${this.forceAR}`);
+        }
+        if (this.forceOD !== undefined) {
+            customStats.push(`OD${this.forceOD}`);
+        }
+        if (this.forceCS !== undefined) {
+            customStats.push(`CS${this.forceCS}`);
+        }
+        if (this.forceHP !== undefined) {
+            customStats.push(`HP${this.forceHP}`);
+        }
+        if (this.flashlightFollowDelay !== undefined) {
+            customStats.push(`FLD${this.flashlightFollowDelay}`);
+        }
+        if (customStats.length > 0) {
+            finalString += ` (${customStats.join(", ")})`;
+        }
+        return finalString;
+    }
     constructor(values) {
         super(values);
         this.forceCS = values.forceCS;
@@ -2157,12 +2222,9 @@ class ReplayAnalyzer {
             : (_b = (_a = this.difficultyAttributes) === null || _a === void 0 ? void 0 : _a.mods.filter((m) => m.isApplicableToDroid())) !== null && _b !== void 0 ? _b : [];
         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
-        //
-        // In such cases, the slider is skipped.
-        const sliderbreakHitOffset = Math.floor(hitWindow50) + 13;
+        const mehWindow = mods.some((m) => m instanceof osuBase.ModPrecise)
+            ? new osuBase.PreciseDroidHitWindow(adjustedDifficulty.od).mehWindow
+            : new osuBase.DroidHitWindow(adjustedDifficulty.od).mehWindow;
         const accuracies = [];
         for (let i = 0; i < hitObjectData.length; ++i) {
             const v = hitObjectData[i];
@@ -2172,7 +2234,10 @@ class ReplayAnalyzer {
                 continue;
             }
             const { accuracy } = v;
-            if (o instanceof osuBase.Slider && accuracy === sliderbreakHitOffset) {
+            if (o instanceof osuBase.Slider &&
+                // Do not include slider breaks.
+                (-mehWindow > accuracy ||
+                    accuracy > Math.min(mehWindow, o.duration))) {
                 accuracies.push(0);
                 continue;
             }

package/package.json

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

package/typings/index.d.ts

@@ -595,6 +595,14 @@ declare class ReplayV3Data extends ReplayData {
      * Enabled modifications during the play that have been converted to their respective `Mod` instances.
      */
     readonly convertedMods: (Mod & IModApplicableToDroid)[];
+    /**
+     * The complete mod string of this replay (mods, speed multiplier, and forced difficulty statistics combined).
+     */
+    get completeModString(): string;
+    /**
+     * The mod string of this replay (mods only).
+     */
+    protected get modString(): string;
     constructor(values: ReplayInformation);
 }
 
@@ -618,6 +626,7 @@ declare class ReplayV4Data extends ReplayV3Data {
      * The follow delay set for the FL mod, in seconds.
      */
     readonly flashlightFollowDelay: number;
+    get completeModString(): string;
     constructor(values: ReplayInformation);
 }
 
@@ -641,6 +650,7 @@ declare class ReplayV5Data extends ReplayV4Data {
      * The force HP of the replay.
      */
     readonly forceHP?: number;
+    get completeModString(): string;
     constructor(values: ReplayInformation);
 }
 
@@ -772,9 +782,7 @@ declare class RebalanceThreeFingerChecker {
      * Nerf factors from all sections that were three-fingered.
      */
     private readonly nerfFactors;
-    private readonly isPrecise;
     private readonly isHardRock;
-    private get hitWindow50();
     /**
      * @param beatmap The beatmap to analyze.
      * @param data The data of the replay.
@@ -1099,9 +1107,7 @@ declare class ThreeFingerChecker {
      * Nerf factors from all sections that were three-fingered.
      */
     private readonly nerfFactors;
-    private readonly isPrecise;
     private readonly isHardRock;
-    private get hitWindow50();
     /**
      * @param beatmap The beatmap to analyze.
      * @param data The data of the replay.
@@ -1208,10 +1214,6 @@ declare class TwoHandChecker {
      * The osu!droid hitwindow of the analyzed beatmap.
      */
     private readonly hitWindow;
-    /**
-     * The 50 osu!droid hit window of the analyzed beatmap.
-     */
-    private readonly hitWindow50;
     private readonly isHardRock;
     /**
      * @param calculator The difficulty calculator to analyze.