@rian8337/osu-base 4.0.0-beta.26 → 4.0.0-beta.28

package/dist/index.js

@@ -7700,7 +7700,7 @@ class Mod {
      * Whether this `Mod`s can be applied to a track's playback rate.
      */
     isApplicableToTrackRate() {
-        return "trackRateMultiplier" in this;
+        return "applyToRate" in this;
     }
 }
 
@@ -7755,7 +7755,9 @@ class ModDoubleTime extends Mod {
         this.pcRanked = true;
         this.pcScoreMultiplier = 1.12;
         this.bitwise = 1 << 6;
-        this.trackRateMultiplier = 1.5;
+    }
+    applyToRate(rate) {
+        return rate * 1.5;
     }
 }
 
@@ -7824,7 +7826,9 @@ class ModHalfTime extends Mod {
         this.pcRanked = true;
         this.pcScoreMultiplier = 0.3;
         this.bitwise = 1 << 8;
-        this.trackRateMultiplier = 0.75;
+    }
+    applyToRate(rate) {
+        return rate * 0.75;
     }
 }
 
@@ -7943,7 +7947,9 @@ class ModNightCore extends Mod {
         this.pcRanked = true;
         this.pcScoreMultiplier = 1.12;
         this.bitwise = 1 << 9;
-        this.trackRateMultiplier = 1.5;
+    }
+    applyToRate(rate, oldStatistics) {
+        return rate * (oldStatistics ? 1.39 : 1.5);
     }
 }
 
@@ -8119,6 +8125,9 @@ class ModSpeedUp extends Mod {
         this.isDroidLegacyMod = true;
         this.trackRateMultiplier = 1.25;
     }
+    applyToRate(rate) {
+        return rate * 1.25;
+    }
 }
 
 /**
@@ -8280,30 +8289,58 @@ class ModUtil {
      * @param mode The game mode to apply the `Mod`s for.
      * @param mods The selected `Mod`s.
      * @param customSpeedMultiplier The custom speed multiplier to apply.
+     * @param withRateChange Whether to apply rate changes.
+     * @param oldStatistics Whether to enforce old statistics. Some `Mod`s behave differently with this flag.
      */
-    static applyModsToBeatmapDifficulty(difficulty, mode, mods, customSpeedMultiplier = 1) {
+    static applyModsToBeatmapDifficulty(difficulty, mode, mods, customSpeedMultiplier = 1, withRateChange = false, oldStatistics = false) {
         for (const mod of mods) {
             if (mod.isApplicableToDifficulty()) {
                 mod.applyToDifficulty(mode, difficulty);
             }
         }
+        let rate = 1;
         for (const mod of mods) {
             if (mod.isApplicableToDifficultyWithSettings()) {
                 mod.applyToDifficultyWithSettings(mode, difficulty, mods, customSpeedMultiplier);
             }
+            if (mod.isApplicableToTrackRate()) {
+                rate = mod.applyToRate(rate, oldStatistics);
+            }
+        }
+        if (!withRateChange) {
+            return;
+        }
+        // Apply rate adjustments
+        const preempt = BeatmapDifficulty.difficultyRange(difficulty.ar, HitObject.preemptMax, HitObject.preemptMid, HitObject.preemptMin) / rate;
+        difficulty.ar = BeatmapDifficulty.inverseDifficultyRange(preempt, HitObject.preemptMax, HitObject.preemptMin, HitObject.preemptMin);
+        switch (mode) {
+            case exports.Modes.droid: {
+                const isPrecise = mods.some((m) => m instanceof ModPrecise);
+                const hitWindow = new DroidHitWindow(difficulty.od);
+                const greatWindow = hitWindow.hitWindowFor300(isPrecise) / rate;
+                difficulty.od = DroidHitWindow.hitWindow300ToOD(greatWindow, isPrecise);
+                break;
+            }
+            case exports.Modes.osu: {
+                const hitWindow = new OsuHitWindow(difficulty.od);
+                const greatWindow = hitWindow.hitWindowFor300() / rate;
+                difficulty.od = OsuHitWindow.hitWindow300ToOD(greatWindow);
+                break;
+            }
         }
     }
     /**
      * Calculates the rate for the track with the selected `Mod`s.
      *
      * @param mods The list of selected `Mod`s.
+     * @param oldStatistics Whether to enforce old statistics. Some `Mod`s behave differently with this flag.
      * @returns The rate with `Mod`s.
      */
-    static calculateRateWithMods(mods) {
+    static calculateRateWithMods(mods, oldStatistics) {
         let rate = 1;
         for (const mod of mods) {
             if (mod.isApplicableToTrackRate()) {
-                rate *= mod.trackRateMultiplier;
+                rate = mod.applyToRate(rate, oldStatistics);
             }
         }
         return rate;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-base",
-    "version": "4.0.0-beta.26",
+    "version": "4.0.0-beta.28",
     "description": "Base module for all osu! related modules.",
     "keywords": [
         "osu",
@@ -42,5 +42,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "1c353ee9455d80a5ca8358762f107899d64f1d5e"
+    "gitHead": "c442670959e9f766fab6d2e6238d7bb0e40ef869"
 }

package/typings/index.d.ts

@@ -888,9 +888,13 @@ interface IModApplicableToOsu {
  */
 interface IModApplicableToTrackRate {
     /**
-     * The multiplier to apply to the track's playback rate.
+     * Returns the playback rate with this `Mod` applied.
+     *
+     * @param rate The playback rate before applying this `Mod`.
+     * @param oldStatistics Whether to enforce old statistics. Some `Mod`s behave differently with this flag.
+     * For example, `ModNightCore` would apply a 1.39 rate multiplier instead of 1.5 with this flag.
      */
-    readonly trackRateMultiplier: number;
+    applyToRate(rate: number, oldStatistics?: boolean): number;
 }
 
 /**
@@ -3774,7 +3778,7 @@ declare class ModDoubleTime extends Mod implements IModApplicableToDroid, IModAp
     readonly pcRanked = true;
     readonly pcScoreMultiplier = 1.12;
     readonly bitwise: number;
-    readonly trackRateMultiplier = 1.5;
+    applyToRate(rate: number): number;
 }
 
 /**
@@ -3821,7 +3825,7 @@ declare class ModHalfTime extends Mod implements IModApplicableToDroid, IModAppl
     readonly pcRanked = true;
     readonly pcScoreMultiplier = 0.3;
     readonly bitwise: number;
-    readonly trackRateMultiplier = 0.75;
+    applyToRate(rate: number): number;
 }
 
 /**
@@ -3875,7 +3879,7 @@ declare class ModNightCore extends Mod implements IModApplicableToDroid, IModApp
     readonly pcRanked = true;
     readonly pcScoreMultiplier = 1.12;
     readonly bitwise: number;
-    readonly trackRateMultiplier = 1.5;
+    applyToRate(rate: number, oldStatistics?: boolean): number;
 }
 
 /**
@@ -3989,6 +3993,7 @@ declare class ModSpeedUp extends Mod implements IModApplicableToDroid, IModAppli
     readonly droidString = "b";
     readonly isDroidLegacyMod = true;
     readonly trackRateMultiplier = 1.25;
+    applyToRate(rate: number): number;
 }
 
 /**
@@ -4124,15 +4129,18 @@ declare abstract class ModUtil {
      * @param mode The game mode to apply the `Mod`s for.
      * @param mods The selected `Mod`s.
      * @param customSpeedMultiplier The custom speed multiplier to apply.
+     * @param withRateChange Whether to apply rate changes.
+     * @param oldStatistics Whether to enforce old statistics. Some `Mod`s behave differently with this flag.
      */
-    static applyModsToBeatmapDifficulty(difficulty: BeatmapDifficulty, mode: Modes, mods: Mod[], customSpeedMultiplier?: number): void;
+    static applyModsToBeatmapDifficulty(difficulty: BeatmapDifficulty, mode: Modes, mods: Mod[], customSpeedMultiplier?: number, withRateChange?: boolean, oldStatistics?: boolean): void;
     /**
      * Calculates the rate for the track with the selected `Mod`s.
      *
      * @param mods The list of selected `Mod`s.
+     * @param oldStatistics Whether to enforce old statistics. Some `Mod`s behave differently with this flag.
      * @returns The rate with `Mod`s.
      */
-    static calculateRateWithMods(mods: Iterable<Mod>): number;
+    static calculateRateWithMods(mods: Iterable<Mod>, oldStatistics?: boolean): number;
     /**
      * Processes parsing options.
      *