@rian8337/osu-difficulty-calculator 4.0.0-beta.26 → 4.0.0-beta.28

package/dist/index.js

@@ -85,15 +85,14 @@ class DifficultyCalculator {
      * @returns The current instance.
      */
     calculate(options) {
-        var _a, _b;
+        var _a;
         this.mods = (_a = options === null || options === void 0 ? void 0 : options.mods) !== null && _a !== void 0 ? _a : [];
         const playableBeatmap = this.beatmap.createPlayableBeatmap({
             mode: this.mode,
             mods: this.mods,
             customSpeedMultiplier: options === null || options === void 0 ? void 0 : options.customSpeedMultiplier,
         });
-        const clockRate = osuBase.ModUtil.calculateRateWithMods(this.mods) *
-            ((_b = options === null || options === void 0 ? void 0 : options.customSpeedMultiplier) !== null && _b !== void 0 ? _b : 1);
+        const clockRate = this.calculateClockRate(options);
         this.populateDifficultyAttributes(playableBeatmap, clockRate);
         this._objects = this.generateDifficultyHitObjects(playableBeatmap, clockRate);
         this.calculateAll();
@@ -112,6 +111,17 @@ class DifficultyCalculator {
             }
         }
     }
+    /**
+     * Obtains the clock rate of the beatmap.
+     *
+     * @param options The options to obtain the clock rate with.
+     * @returns The clock rate of the beatmap.
+     */
+    calculateClockRate(options) {
+        var _a, _b;
+        return (osuBase.ModUtil.calculateRateWithMods((_a = options === null || options === void 0 ? void 0 : options.mods) !== null && _a !== void 0 ? _a : []) *
+            ((_b = options === null || options === void 0 ? void 0 : options.customSpeedMultiplier) !== null && _b !== void 0 ? _b : 1));
+    }
     /**
      * Populates the stored difficulty attributes with necessary data.
      *
@@ -1729,6 +1739,10 @@ class DroidDifficultyCalculator extends DifficultyCalculator {
     get cacheableAttributes() {
         return Object.assign(Object.assign({}, this.attributes), { mods: osuBase.ModUtil.modsToOsuString(this.attributes.mods) });
     }
+    // Override to use DroidDifficultyCalculationOptions
+    calculate(options) {
+        return super.calculate(options);
+    }
     /**
      * Calculates the aim star rating of the beatmap and stores it in this instance.
      */
@@ -1865,6 +1879,10 @@ class DroidDifficultyCalculator extends DifficultyCalculator {
             new DroidVisual(this.mods, false),
         ];
     }
+    calculateClockRate(options) {
+        var _a, _b;
+        return (osuBase.ModUtil.calculateRateWithMods((_a = options === null || options === void 0 ? void 0 : options.mods) !== null && _a !== void 0 ? _a : [], options === null || options === void 0 ? void 0 : options.oldStatistics) * ((_b = options === null || options === void 0 ? void 0 : options.customSpeedMultiplier) !== null && _b !== void 0 ? _b : 1));
+    }
     /**
      * Called after aim skill calculation.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-difficulty-calculator",
-    "version": "4.0.0-beta.26",
+    "version": "4.0.0-beta.28",
     "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.26"
+        "@rian8337/osu-base": "^4.0.0-beta.28"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "1c353ee9455d80a5ca8358762f107899d64f1d5e"
+    "gitHead": "c442670959e9f766fab6d2e6238d7bb0e40ef869"
 }

package/typings/index.d.ts

@@ -399,6 +399,13 @@ declare abstract class DifficultyCalculator<THitObject extends DifficultyHitObje
      * Creates skills to be calculated.
      */
     protected abstract createSkills(): Skill[];
+    /**
+     * Obtains the clock rate of the beatmap.
+     *
+     * @param options The options to obtain the clock rate with.
+     * @returns The clock rate of the beatmap.
+     */
+    protected calculateClockRate(options?: DifficultyCalculationOptions): number;
     /**
      * Populates the stored difficulty attributes with necessary data.
      *
@@ -828,6 +835,7 @@ declare class DroidDifficultyCalculator extends DifficultyCalculator<DroidDiffic
     get cacheableAttributes(): CacheableDifficultyAttributes<DroidDifficultyAttributes>;
     protected readonly difficultyMultiplier = 0.18;
     protected readonly mode = Modes.droid;
+    calculate(options?: DroidDifficultyCalculationOptions): this;
     /**
      * Calculates the aim star rating of the beatmap and stores it in this instance.
      */
@@ -853,6 +861,7 @@ declare class DroidDifficultyCalculator extends DifficultyCalculator<DroidDiffic
     toString(): string;
     protected generateDifficultyHitObjects(beatmap: Beatmap, clockRate: number): DroidDifficultyHitObject[];
     protected createSkills(): DroidSkill[];
+    protected calculateClockRate(options?: DroidDifficultyCalculationOptions): number;
     /**
      * Called after aim skill calculation.
      *