@rian8337/osu-difficulty-calculator 4.0.0-beta.32 → 4.0.0-beta.39

package/dist/index.js

@@ -138,13 +138,20 @@ class DifficultyCalculator {
         let greatWindow;
         switch (this.mode) {
             case osuBase.Modes.droid:
-                greatWindow = new osuBase.DroidHitWindow(beatmap.difficulty.od).hitWindowFor300(this.mods.some((m) => m instanceof osuBase.ModPrecise));
+                if (this.mods.some((m) => m instanceof osuBase.ModPrecise)) {
+                    greatWindow = new osuBase.PreciseDroidHitWindow(beatmap.difficulty.od).greatWindow;
+                }
+                else {
+                    greatWindow = new osuBase.DroidHitWindow(beatmap.difficulty.od)
+                        .greatWindow;
+                }
                 break;
             case osuBase.Modes.osu:
-                greatWindow = new osuBase.OsuHitWindow(beatmap.difficulty.od).hitWindowFor300();
+                greatWindow = new osuBase.OsuHitWindow(beatmap.difficulty.od)
+                    .greatWindow;
                 break;
         }
-        this.attributes.overallDifficulty = osuBase.OsuHitWindow.hitWindow300ToOD(greatWindow / clockRate);
+        this.attributes.overallDifficulty = osuBase.OsuHitWindow.greatWindowToOD(greatWindow / clockRate);
     }
     /**
      * Calculates the star rating value of a difficulty.
@@ -177,9 +184,9 @@ class DifficultyHitObject {
      * @param lastLastObject The hitobject before the last hitobject.
      * @param difficultyHitObjects All difficulty hitobjects in the processed beatmap.
      * @param clockRate The clock rate of the beatmap.
-     * @param greatWindow The great window of the hitobject.
      */
-    constructor(object, lastObject, lastLastObject, difficultyHitObjects, clockRate, greatWindow) {
+    constructor(object, lastObject, lastLastObject, difficultyHitObjects, clockRate) {
+        var _a, _b, _c, _d;
         /**
          * The aim strain generated by the hitobject if sliders are considered.
          */
@@ -236,7 +243,14 @@ class DifficultyHitObject {
         this.lastObject = lastObject;
         this.lastLastObject = lastLastObject;
         this.hitObjects = difficultyHitObjects;
-        this.fullGreatWindow = greatWindow * 2;
+        if (object instanceof osuBase.Slider) {
+            this.fullGreatWindow =
+                ((_b = (_a = object.head.hitWindow) === null || _a === void 0 ? void 0 : _a.greatWindow) !== null && _b !== void 0 ? _b : 1200) * 2;
+        }
+        else {
+            this.fullGreatWindow = ((_d = (_c = object.hitWindow) === null || _c === void 0 ? void 0 : _c.greatWindow) !== null && _d !== void 0 ? _d : 1200) * 2;
+        }
+        this.fullGreatWindow /= clockRate;
         this.index = difficultyHitObjects.length - 1;
         // Capped to 25ms to prevent difficulty calculation breaking from simultaneous objects.
         this.startTime = object.startTime / clockRate;
@@ -1493,10 +1507,9 @@ class DroidDifficultyHitObject extends DifficultyHitObject {
      * @param lastLastObject The hitobject before the last hitobject.
      * @param difficultyHitObjects All difficulty hitobjects in the processed beatmap.
      * @param clockRate The clock rate of the beatmap.
-     * @param greatWindow The great window of the hitobject.
      */
-    constructor(object, lastObject, lastLastObject, difficultyHitObjects, clockRate, greatWindow) {
-        super(object, lastObject, lastLastObject, difficultyHitObjects, clockRate, greatWindow);
+    constructor(object, lastObject, lastLastObject, difficultyHitObjects, clockRate) {
+        super(object, lastObject, lastLastObject, difficultyHitObjects, clockRate);
         /**
          * The tap strain generated by the hitobject.
          */
@@ -1852,10 +1865,8 @@ class DroidDifficultyCalculator extends DifficultyCalculator {
         var _a, _b;
         const difficultyObjects = [];
         const { objects } = beatmap.hitObjects;
-        const isPrecise = this.mods.some((m) => m instanceof osuBase.ModPrecise);
-        const greatWindow = new osuBase.DroidHitWindow(beatmap.difficulty.od).hitWindowFor300(isPrecise) / clockRate;
         for (let i = 0; i < objects.length; ++i) {
-            const difficultyObject = new DroidDifficultyHitObject(objects[i], (_a = objects[i - 1]) !== null && _a !== void 0 ? _a : null, (_b = objects[i - 2]) !== null && _b !== void 0 ? _b : null, difficultyObjects, clockRate, greatWindow);
+            const difficultyObject = new DroidDifficultyHitObject(objects[i], (_a = objects[i - 1]) !== null && _a !== void 0 ? _a : null, (_b = objects[i - 2]) !== null && _b !== void 0 ? _b : null, difficultyObjects, clockRate);
             difficultyObject.computeProperties(clockRate, objects);
             difficultyObjects.push(difficultyObject);
         }
@@ -2628,14 +2639,11 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
         if (this.totalSuccessfulHits === 0) {
             return Number.POSITIVE_INFINITY;
         }
-        const hitWindow300 = new osuBase.OsuHitWindow(this.difficultyAttributes.overallDifficulty).hitWindowFor300();
-        // Obtain the 50 and 100 hit window for droid.
-        const isPrecise = this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise);
-        const droidHitWindow = new osuBase.DroidHitWindow(osuBase.DroidHitWindow.hitWindow300ToOD(hitWindow300 * this.difficultyAttributes.clockRate, isPrecise));
-        const hitWindow50 = droidHitWindow.hitWindowFor50(isPrecise) /
-            this.difficultyAttributes.clockRate;
-        const hitWindow100 = droidHitWindow.hitWindowFor100(isPrecise) /
-            this.difficultyAttributes.clockRate;
+        const { clockRate } = this.difficultyAttributes;
+        const hitWindow = this.getConvertedHitWindow();
+        const hitWindow300 = hitWindow.greatWindow / clockRate;
+        const hitWindow100 = hitWindow.okWindow / clockRate;
+        const hitWindow50 = hitWindow.mehWindow / clockRate;
         const { n100, n50, nmiss } = this.computedAccuracy;
         const circleCount = this.difficultyAttributes.hitCircleCount;
         const missCountCircles = Math.min(nmiss, circleCount);
@@ -2699,13 +2707,11 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
         if (this.totalSuccessfulHits === 0) {
             return Number.POSITIVE_INFINITY;
         }
-        const { speedNoteCount, clockRate, overallDifficulty } = this.difficultyAttributes;
-        const hitWindow300 = new osuBase.OsuHitWindow(overallDifficulty).hitWindowFor300();
-        // Obtain the 50 and 100 hit window for droid.
-        const isPrecise = this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise);
-        const droidHitWindow = new osuBase.DroidHitWindow(osuBase.DroidHitWindow.hitWindow300ToOD(hitWindow300 * clockRate, isPrecise));
-        const hitWindow50 = droidHitWindow.hitWindowFor50(isPrecise) / clockRate;
-        const hitWindow100 = droidHitWindow.hitWindowFor100(isPrecise) / clockRate;
+        const { speedNoteCount, clockRate } = this.difficultyAttributes;
+        const hitWindow = this.getConvertedHitWindow();
+        const hitWindow300 = hitWindow.greatWindow / clockRate;
+        const hitWindow100 = hitWindow.okWindow / clockRate;
+        const hitWindow50 = hitWindow.mehWindow / clockRate;
         const { n100, n50, nmiss } = this.computedAccuracy;
         // Assume a fixed ratio of non-300s hit in speed notes based on speed note count ratio and OD.
         // Graph: https://www.desmos.com/calculator/iskvgjkxr4
@@ -2753,6 +2759,15 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
         }
         return Number.POSITIVE_INFINITY;
     }
+    getConvertedHitWindow() {
+        const hitWindow300 = new osuBase.OsuHitWindow(this.difficultyAttributes.overallDifficulty).greatWindow;
+        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise)) {
+            return new osuBase.PreciseDroidHitWindow(osuBase.PreciseDroidHitWindow.greatWindowToOD(hitWindow300 * this.difficultyAttributes.clockRate));
+        }
+        else {
+            return new osuBase.DroidHitWindow(osuBase.DroidHitWindow.greatWindowToOD(hitWindow300 * this.difficultyAttributes.clockRate));
+        }
+    }
     toString() {
         return (this.total.toFixed(2) +
             " pp (" +
@@ -3482,10 +3497,8 @@ class OsuDifficultyCalculator extends DifficultyCalculator {
         var _a, _b;
         const difficultyObjects = [];
         const { objects } = beatmap.hitObjects;
-        const greatWindow = new osuBase.OsuHitWindow(beatmap.difficulty.od).hitWindowFor300() /
-            clockRate;
         for (let i = 0; i < objects.length; ++i) {
-            const difficultyObject = new OsuDifficultyHitObject(objects[i], (_a = objects[i - 1]) !== null && _a !== void 0 ? _a : null, (_b = objects[i - 2]) !== null && _b !== void 0 ? _b : null, difficultyObjects, clockRate, greatWindow);
+            const difficultyObject = new OsuDifficultyHitObject(objects[i], (_a = objects[i - 1]) !== null && _a !== void 0 ? _a : null, (_b = objects[i - 2]) !== null && _b !== void 0 ? _b : null, difficultyObjects, clockRate);
             difficultyObject.computeProperties(clockRate, objects);
             difficultyObjects.push(difficultyObject);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-difficulty-calculator",
-    "version": "4.0.0-beta.32",
+    "version": "4.0.0-beta.39",
     "description": "A module for calculating osu!standard beatmap difficulty and performance value with respect to the current difficulty and performance algorithm.",
     "keywords": [
         "osu",
@@ -33,10 +33,10 @@
         "url": "https://github.com/Rian8337/osu-droid-module/issues"
     },
     "dependencies": {
-        "@rian8337/osu-base": "^4.0.0-beta.31"
+        "@rian8337/osu-base": "^4.0.0-beta.39"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "dd164dcc63fea94501959236d310eccf5a7cda6a"
+    "gitHead": "6039ff691d968464d4b111e0b5a88775fb055281"
 }

package/typings/index.d.ts

@@ -216,9 +216,8 @@ declare abstract class DifficultyHitObject {
      * @param lastLastObject The hitobject before the last hitobject.
      * @param difficultyHitObjects All difficulty hitobjects in the processed beatmap.
      * @param clockRate The clock rate of the beatmap.
-     * @param greatWindow The great window of the hitobject.
      */
-    constructor(object: PlaceableHitObject, lastObject: PlaceableHitObject | null, lastLastObject: PlaceableHitObject | null, difficultyHitObjects: readonly DifficultyHitObject[], clockRate: number, greatWindow: number);
+    constructor(object: PlaceableHitObject, lastObject: PlaceableHitObject | null, lastLastObject: PlaceableHitObject | null, difficultyHitObjects: readonly DifficultyHitObject[], clockRate: number);
     /**
      * Computes the properties of this hitobject.
      *
@@ -617,9 +616,8 @@ declare class DroidDifficultyHitObject extends DifficultyHitObject {
      * @param lastLastObject The hitobject before the last hitobject.
      * @param difficultyHitObjects All difficulty hitobjects in the processed beatmap.
      * @param clockRate The clock rate of the beatmap.
-     * @param greatWindow The great window of the hitobject.
      */
-    constructor(object: PlaceableHitObject, lastObject: PlaceableHitObject | null, lastLastObject: PlaceableHitObject | null, difficultyHitObjects: readonly DifficultyHitObject[], clockRate: number, greatWindow: number);
+    constructor(object: PlaceableHitObject, lastObject: PlaceableHitObject | null, lastLastObject: PlaceableHitObject | null, difficultyHitObjects: readonly DifficultyHitObject[], clockRate: number);
     computeProperties(clockRate: number, hitObjects: readonly PlaceableHitObject[]): void;
     /**
      * Determines whether this hitobject is considered overlapping with the hitobject before it.
@@ -1244,6 +1242,7 @@ declare class DroidPerformanceCalculator extends PerformanceCalculator<DroidDiff
      * This is fine though, since this method is only used to scale tap pp.
      */
     private calculateTapDeviation;
+    private getConvertedHitWindow;
     toString(): string;
 }