@rian8337/osu-difficulty-calculator 4.0.0-beta.44 → 4.0.0-beta.48

package/dist/index.js

@@ -1158,8 +1158,9 @@ class DroidRhythmEvaluator {
      * with historic data of the current object.
      *
      * @param current The current object.
+     * @param useSliderAccuracy Whether to use slider accuracy.
      */
-    static evaluateDifficultyOf(current) {
+    static evaluateDifficultyOf(current, useSliderAccuracy) {
         if (current.object instanceof osuBase.Spinner) {
             return 1;
         }
@@ -1221,15 +1222,17 @@ class DroidRhythmEvaluator {
                     island.addDelta(currentDelta);
                 }
                 else {
-                    // BPM change is into slider, this is easy acc window.
-                    if (currentObject.object instanceof osuBase.Slider) {
-                        effectiveRatio /= 8;
-                    }
-                    // BPM change was from a slider, this is easier typically than circle -> circle.
-                    // Unintentional side effect is that bursts with kicksliders at the ends might have lower difficulty
-                    // than bursts without sliders.
-                    if (prevObject.object instanceof osuBase.Slider) {
-                        effectiveRatio *= 0.3;
+                    if (!useSliderAccuracy) {
+                        // BPM change is into slider, this is easy acc window.
+                        if (currentObject.object instanceof osuBase.Slider) {
+                            effectiveRatio /= 8;
+                        }
+                        // BPM change was from a slider, this is easier typically than circle -> circle.
+                        // Unintentional side effect is that bursts with kicksliders at the ends might have lower difficulty
+                        // than bursts without sliders.
+                        if (prevObject.object instanceof osuBase.Slider) {
+                            effectiveRatio *= 0.3;
+                        }
                     }
                     // Repeated island polarity (2 -> 4, 3 -> 5).
                     if (island.isSimilarPolarity(previousIsland)) {
@@ -1312,18 +1315,19 @@ DroidRhythmEvaluator.rhythmRatioMultiplier = 12;
  * Represents the skill required to properly follow a beatmap's rhythm.
  */
 class DroidRhythm extends DroidSkill {
-    constructor() {
-        super(...arguments);
+    constructor(mods) {
+        super(mods);
         this.reducedSectionCount = 5;
         this.reducedSectionBaseline = 0.75;
         this.strainDecayBase = 0.3;
         this.starsPerDouble = 1.75;
         this.currentRhythmStrain = 0;
         this.currentRhythmMultiplier = 1;
+        this.useSliderAccuracy = mods.some((m) => m instanceof osuBase.ModScoreV2);
     }
     strainValueAt(current) {
         this.currentRhythmMultiplier =
-            DroidRhythmEvaluator.evaluateDifficultyOf(current);
+            DroidRhythmEvaluator.evaluateDifficultyOf(current, this.useSliderAccuracy);
         this.currentRhythmStrain *= this.strainDecay(current.deltaTime);
         this.currentRhythmStrain += this.currentRhythmMultiplier - 1;
         return this.currentRhythmStrain;
@@ -2103,12 +2107,10 @@ class PerformanceCalculator {
          * Nerf factor used for nerfing beatmaps with very likely dropped sliderends.
          */
         this.sliderNerfFactor = 1;
-        if (this.isCacheableAttribute(difficultyAttributes)) {
-            this.difficultyAttributes = Object.assign(Object.assign({}, difficultyAttributes), { mods: osuBase.ModUtil.pcStringToMods(difficultyAttributes.mods) });
-        }
-        else {
-            this.difficultyAttributes = osuBase.Utils.deepCopy(difficultyAttributes);
-        }
+        this.difficultyAttributes = difficultyAttributes;
+        this.mods = this.isCacheableAttribute(difficultyAttributes)
+            ? osuBase.ModUtil.pcStringToMods(difficultyAttributes.mods)
+            : difficultyAttributes.mods;
     }
     /**
      * Calculates the performance points of the beatmap.
@@ -2175,15 +2177,15 @@ class PerformanceCalculator {
             });
         }
         this.effectiveMissCount = this.calculateEffectiveMissCount(combo, maxCombo);
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModNoFail)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModNoFail)) {
             this.finalMultiplier *= Math.max(0.9, 1 - 0.02 * this.effectiveMissCount);
         }
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModSpunOut)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModSpunOut)) {
             this.finalMultiplier *=
                 1 -
                     Math.pow(this.difficultyAttributes.spinnerCount / this.totalHits, 0.85);
         }
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModRelax)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModRelax)) {
             // Graph: https://www.desmos.com/calculator/bc9eybdthb
             // We use OD13.3 as maximum since it's the value at which great hit window becomes 0.
             const n100Multiplier = Math.max(0, this.difficultyAttributes.overallDifficulty > 0
@@ -2512,12 +2514,12 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
      * Calculates the accuracy performance value of the beatmap.
      */
     calculateAccuracyValue() {
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModRelax) ||
+        if (this.mods.some((m) => m instanceof osuBase.ModRelax) ||
             this.totalSuccessfulHits === 0) {
             return 0;
         }
         let accuracyValue = 650 * Math.exp(-0.1 * this._deviation);
-        const ncircles = this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModScoreV2)
+        const ncircles = this.mods.some((m) => m instanceof osuBase.ModScoreV2)
             ? this.totalHits - this.difficultyAttributes.spinnerCount
             : this.difficultyAttributes.hitCircleCount;
         // Bonus for many hitcircles - it's harder to keep good accuracy up for longer.
@@ -2529,7 +2531,7 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
                     Math.exp(-(this.difficultyAttributes.rhythmDifficulty - 1) / 2));
         // Penalize accuracy pp after the first miss.
         accuracyValue *= Math.pow(0.97, Math.max(0, this.effectiveMissCount - 1));
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
             accuracyValue *= 1.02;
         }
         return accuracyValue;
@@ -2538,7 +2540,7 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
      * Calculates the flashlight performance value of the beatmap.
      */
     calculateFlashlightValue() {
-        if (!this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
+        if (!this.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
             return 0;
         }
         let flashlightValue = Math.pow(this.difficultyAttributes.flashlightDifficulty, 1.6) * 25;
@@ -2761,7 +2763,7 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
     }
     getConvertedHitWindow() {
         const hitWindow300 = new osuBase.OsuHitWindow(this.difficultyAttributes.overallDifficulty).greatWindow;
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModPrecise)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModPrecise)) {
             return new osuBase.PreciseDroidHitWindow(osuBase.PreciseDroidHitWindow.greatWindowToOD(hitWindow300 * this.difficultyAttributes.clockRate));
         }
         else {
@@ -3638,7 +3640,7 @@ class OsuPerformanceCalculator extends PerformanceCalculator {
         aimValue *= lengthBonus;
         aimValue *= this.calculateStrainBasedMissPenalty(this.difficultyAttributes.aimDifficultStrainCount);
         const calculatedAR = this.difficultyAttributes.approachRate;
-        if (!this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModRelax)) {
+        if (!this.mods.some((m) => m instanceof osuBase.ModRelax)) {
             // AR scaling
             let arFactor = 0;
             if (calculatedAR > 10.33) {
@@ -3651,7 +3653,7 @@ class OsuPerformanceCalculator extends PerformanceCalculator {
             aimValue *= 1 + arFactor * lengthBonus;
         }
         // We want to give more reward for lower AR when it comes to aim and HD. This nerfs high AR and buffs lower AR.
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHidden)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModHidden)) {
             aimValue *= 1 + 0.04 * (12 - calculatedAR);
         }
         // Scale the aim value with slider factor to nerf very likely dropped sliderends.
@@ -3667,7 +3669,7 @@ class OsuPerformanceCalculator extends PerformanceCalculator {
      * Calculates the speed performance value of the beatmap.
      */
     calculateSpeedValue() {
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModRelax)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModRelax)) {
             return 0;
         }
         let speedValue = this.baseValue(this.difficultyAttributes.speedDifficulty);
@@ -3684,7 +3686,7 @@ class OsuPerformanceCalculator extends PerformanceCalculator {
             // Buff for longer maps with high AR.
             speedValue *= 1 + 0.3 * (calculatedAR - 10.33) * lengthBonus;
         }
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHidden)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModHidden)) {
             speedValue *= 1 + 0.04 * (12 - calculatedAR);
         }
         // Calculate accuracy assuming the worst case scenario.
@@ -3717,10 +3719,10 @@ class OsuPerformanceCalculator extends PerformanceCalculator {
      * Calculates the accuracy performance value of the beatmap.
      */
     calculateAccuracyValue() {
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModRelax)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModRelax)) {
             return 0;
         }
-        const ncircles = this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModScoreV2)
+        const ncircles = this.mods.some((m) => m instanceof osuBase.ModScoreV2)
             ? this.totalHits - this.difficultyAttributes.spinnerCount
             : this.difficultyAttributes.hitCircleCount;
         if (ncircles === 0) {
@@ -3735,10 +3737,10 @@ class OsuPerformanceCalculator extends PerformanceCalculator {
             2.83;
         // Bonus for many hitcircles - it's harder to keep good accuracy up for longer
         accuracyValue *= Math.min(1.15, Math.pow(ncircles / 1000, 0.3));
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModHidden)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModHidden)) {
             accuracyValue *= 1.08;
         }
-        if (this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
+        if (this.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
             accuracyValue *= 1.02;
         }
         return accuracyValue;
@@ -3747,7 +3749,7 @@ class OsuPerformanceCalculator extends PerformanceCalculator {
      * Calculates the flashlight performance value of the beatmap.
      */
     calculateFlashlightValue() {
-        if (!this.difficultyAttributes.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
+        if (!this.mods.some((m) => m instanceof osuBase.ModFlashlight)) {
             return 0;
         }
         let flashlightValue = Math.pow(this.difficultyAttributes.flashlightDifficulty, 2) * 25;

package/package.json

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

package/typings/index.d.ts

@@ -1006,7 +1006,11 @@ declare abstract class PerformanceCalculator<T extends DifficultyAttributes> {
     /**
      * The difficulty attributes that is being calculated.
      */
-    readonly difficultyAttributes: T;
+    readonly difficultyAttributes: T | CacheableDifficultyAttributes<T>;
+    /**
+     * The mods that were used.
+     */
+    protected readonly mods: Mod[];
     /**
      * The global multiplier to be applied to the final performance value.
      *
@@ -1254,8 +1258,10 @@ declare class DroidRhythm extends DroidSkill {
     protected readonly reducedSectionBaseline = 0.75;
     protected readonly strainDecayBase = 0.3;
     protected readonly starsPerDouble = 1.75;
+    private readonly useSliderAccuracy;
     private currentRhythmStrain;
     private currentRhythmMultiplier;
+    constructor(mods: Mod[]);
     protected strainValueAt(current: DroidDifficultyHitObject): number;
     protected calculateInitialStrain(time: number, current: DroidDifficultyHitObject): number;
     protected getObjectStrain(): number;
@@ -1275,8 +1281,9 @@ declare abstract class DroidRhythmEvaluator {
      * with historic data of the current object.
      *
      * @param current The current object.
+     * @param useSliderAccuracy Whether to use slider accuracy.
      */
-    static evaluateDifficultyOf(current: DroidDifficultyHitObject): number;
+    static evaluateDifficultyOf(current: DroidDifficultyHitObject, useSliderAccuracy: boolean): number;
 }
 
 /**