@rian8337/osu-base 4.0.0-beta.55 → 4.0.0-beta.56

package/dist/index.js

@@ -2721,7 +2721,7 @@ class ModDifficultyAdjust extends Mod {
     get osuScoreMultiplier() {
         return 0.5;
     }
-    applyToDifficultyWithSettings(mode, difficulty, mods) {
+    applyToDifficultyWithSettings(_, difficulty, mods) {
         var _a, _b, _c, _d;
         difficulty.cs = (_a = this.cs) !== null && _a !== void 0 ? _a : difficulty.cs;
         difficulty.ar = (_b = this.ar) !== null && _b !== void 0 ? _b : difficulty.ar;
@@ -2735,15 +2735,18 @@ class ModDifficultyAdjust extends Mod {
             difficulty.ar = BeatmapDifficulty.inverseDifficultyRange(preempt * trackRate, HitObject.preemptMax, HitObject.preemptMid, HitObject.preemptMin);
         }
     }
-    applyToHitObjectWithSettings(mode, hitObject, mods) {
+    applyToHitObjectWithSettings(_, hitObject, mods) {
         // Special case for force AR, where the AR value is kept constant with respect to game time.
         // This makes the player perceive the fade in animation as is under all speed multipliers.
         if (this.ar === undefined) {
             return;
         }
-        // IMPORTANT: This does not use `ModUtil.calculateRateWithMods` to avoid circular dependency.
-        const trackRate = this.calculateTrackRate(mods);
-        hitObject.timeFadeIn *= trackRate;
+        this.applyFadeAdjustment(hitObject, mods);
+        if (hitObject instanceof Slider) {
+            for (const nested of hitObject.nestedHitObjects) {
+                this.applyFadeAdjustment(nested, mods);
+            }
+        }
     }
     serializeSettings() {
         if (this.cs === undefined &&
@@ -2767,6 +2770,15 @@ class ModDifficultyAdjust extends Mod {
         }
         return settings;
     }
+    applyFadeAdjustment(hitObject, mods) {
+        // IMPORTANT: These do not use `ModUtil.calculateRateWithMods` to avoid circular dependency.
+        const initialTrackRate = this.calculateTrackRate(mods);
+        const currentTrackRate = this.calculateTrackRate(mods, hitObject.startTime);
+        // Cancel the rate that was initially applied to timePreempt (via applyToDifficulty above and
+        // HitObject.applyDefaults) and apply the current one.
+        hitObject.timePreempt *= currentTrackRate / initialTrackRate;
+        hitObject.timeFadeIn *= currentTrackRate;
+    }
     calculateTrackRate(mods, time = 0) {
         // IMPORTANT: This does not use `ModUtil.calculateRateWithMods` to avoid circular dependency.
         return mods.reduce((rate, mod) => mod.isApplicableToTrackRate()

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-base",
-    "version": "4.0.0-beta.55",
+    "version": "4.0.0-beta.56",
     "description": "Base module for all osu! related modules.",
     "keywords": [
         "osu",
@@ -35,5 +35,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f653b9f0de6a0b0c6d8176b223352cbf24a97640"
+    "gitHead": "330ca82968253d60fd3cb8ed0d769718028a8688"
 }

package/typings/index.d.ts

@@ -4184,9 +4184,10 @@ declare class ModDifficultyAdjust extends Mod implements IModApplicableToDroid,
     calculateDroidScoreMultiplier(difficulty: BeatmapDifficulty): number;
     get isOsuRelevant(): boolean;
     get osuScoreMultiplier(): number;
-    applyToDifficultyWithSettings(mode: Modes, difficulty: BeatmapDifficulty, mods: Mod[]): void;
-    applyToHitObjectWithSettings(mode: Modes, hitObject: HitObject, mods: Mod[]): void;
+    applyToDifficultyWithSettings(_: Modes, difficulty: BeatmapDifficulty, mods: Mod[]): void;
+    applyToHitObjectWithSettings(_: Modes, hitObject: HitObject, mods: Mod[]): void;
     protected serializeSettings(): Record<string, unknown> | null;
+    private applyFadeAdjustment;
     private calculateTrackRate;
     toString(): string;
 }