@rian8337/osu-difficulty-calculator 4.0.0-beta.75 → 4.0.0-beta.77

package/dist/index.js

@@ -849,15 +849,18 @@ class DroidAimEvaluator {
      * Calculates the flow aim strain of a hitobject.
      */
     static flowAimStrainOf(current) {
-        var _a, _b;
+        var _a;
         let speedBonus = 1;
         if (current.strainTime < this.minSpeedBonus) {
             speedBonus +=
                 0.75 *
                     Math.pow((this.minSpeedBonus - current.strainTime) / 40, 2);
         }
-        const travelDistance = (_b = (_a = current.previous(0)) === null || _a === void 0 ? void 0 : _a.travelDistance) !== null && _b !== void 0 ? _b : 0;
-        const shortDistancePenalty = Math.pow(Math.min(this.singleSpacingThreshold, travelDistance + current.minimumJumpDistance) / this.singleSpacingThreshold, 3.5);
+        const prev = current.previous(0);
+        // Punish low spacing as it is easier to aim.
+        const travelDistance = (_a = prev === null || prev === void 0 ? void 0 : prev.travelDistance) !== null && _a !== void 0 ? _a : 0;
+        const distance = travelDistance + current.minimumJumpDistance;
+        const shortDistancePenalty = Math.min(1, Math.pow(distance / this.singleSpacingThreshold, 3.5));
         return (200 * speedBonus * shortDistancePenalty) / current.strainTime;
     }
     static calculateWideAngleBonus(angle) {
@@ -872,7 +875,7 @@ DroidAimEvaluator.acuteAngleMultiplier = 2.6;
 DroidAimEvaluator.sliderMultiplier = 1.35;
 DroidAimEvaluator.velocityChangeMultiplier = 0.75;
 DroidAimEvaluator.wiggleMultiplier = 1.02;
-DroidAimEvaluator.singleSpacingThreshold = 100;
+DroidAimEvaluator.singleSpacingThreshold = DroidDifficultyHitObject.normalizedDiameter;
 // 200 1/4 BPM delta time
 DroidAimEvaluator.minSpeedBonus = 75;
 
@@ -1028,7 +1031,7 @@ class DroidAim extends DroidSkill {
         this.reducedSectionCount = 10;
         this.reducedSectionBaseline = 0.75;
         this.starsPerDouble = 1.05;
-        this.skillMultiplier = 25.6;
+        this.skillMultiplier = 26.5;
         this.currentAimStrain = 0;
         this.sliderStrains = [];
         this.withSliders = withSliders;
@@ -1230,7 +1233,7 @@ class DroidFlashlight extends DroidSkill {
         this.reducedSectionCount = 0;
         this.reducedSectionBaseline = 1;
         this.starsPerDouble = 1.06;
-        this.skillMultiplier = 0.02;
+        this.skillMultiplier = 0.023;
         this.currentFlashlightStrain = 0;
         this.withSliders = withSliders;
     }
@@ -1501,7 +1504,6 @@ class DroidTapEvaluator {
      * - and the strain time cap.
      *
      * @param current The current object.
-     * @param greatWindow The great hit window of the current object.
      * @param considerCheesability Whether to consider cheesability.
      * @param strainTimeCap The strain time to cap the object's strain time to.
      */
@@ -1511,7 +1513,6 @@ class DroidTapEvaluator {
             current.isOverlapping(false)) {
             return 0;
         }
-        // Nerf doubletappable doubles.
         const doubletapness = considerCheesability
             ? 1 - current.doubletapness
             : 1;
@@ -1646,7 +1647,7 @@ class DroidVisualEvaluator {
             current.index === 0) {
             return 0;
         }
-        // Start with base density and give global bonus for Hidden and Traceable.
+        // Start with base density and give global bonus for Hidden.
         // Add density caps for sanity.
         let strain;
         if (mods.has(osuBase.ModHidden)) {
@@ -1737,7 +1738,7 @@ class DroidVisual extends DroidSkill {
         this.strainDecayBase = 0.1;
         this.currentVisualStrain = 0;
         this.currentRhythmMultiplier = 1;
-        this.skillMultiplier = 10;
+        this.skillMultiplier = 11.2;
         this.withSliders = withSliders;
     }
     strainValueAt(current) {
@@ -2219,43 +2220,26 @@ class PerformanceCalculator {
                 this.computedAccuracy.n100 * n100Multiplier +
                 this.computedAccuracy.n50 * n50Multiplier, this.totalHits);
         }
-        const { sliderCount, sliderFactor, aimDifficultSliderCount } = this.difficultyAttributes;
-        if (sliderCount > 0) {
-            if (this.mode === osuBase.Modes.droid) {
-                // We assume 15% of sliders in a beatmap are difficult since there's no way to tell from the performance calculator.
-                const estimateDifficultSliders = sliderCount * 0.15;
-                const estimateSliderEndsDropped = osuBase.MathUtils.clamp(Math.min(this.computedAccuracy.n100 +
-                    this.computedAccuracy.n50 +
-                    this.computedAccuracy.nmiss, maxCombo - combo), 0, estimateDifficultSliders);
-                this.sliderNerfFactor =
-                    (1 - sliderFactor) *
-                        Math.pow(1 -
-                            estimateSliderEndsDropped /
-                                estimateDifficultSliders, 3) +
-                        sliderFactor;
+        const { aimDifficultSliderCount, sliderFactor } = this.difficultyAttributes;
+        if (aimDifficultSliderCount > 0) {
+            let estimateImproperlyFollowedDifficultSliders;
+            if (this.usingClassicSliderAccuracy) {
+                // When the score is considered classic (regardless if it was made on old client or not),
+                // we consider all missing combo to be dropped difficult sliders.
+                estimateImproperlyFollowedDifficultSliders = osuBase.MathUtils.clamp(Math.min(this.totalImperfectHits, maxCombo - combo), 0, aimDifficultSliderCount);
             }
             else {
-                let estimateImproperlyFollowedDifficultSliders;
-                if (this.usingClassicSliderAccuracy) {
-                    // When the score is considered classic (regardless if it was made on old client or not),
-                    // we consider all missing combo to be dropped difficult sliders
-                    estimateImproperlyFollowedDifficultSliders =
-                        osuBase.MathUtils.clamp(Math.min(this.totalImperfectHits, maxCombo - combo), 0, aimDifficultSliderCount);
-                }
-                else {
-                    // We add tick misses here since they too mean that the player didn't follow the slider
-                    // properly. However aren't adding misses here because missing slider heads has a harsh
-                    // penalty by itself and doesn't mean that the rest of the slider wasn't followed properly.
-                    estimateImproperlyFollowedDifficultSliders =
-                        osuBase.MathUtils.clamp(this.sliderEndsDropped + this.sliderTicksMissed, 0, aimDifficultSliderCount);
-                }
-                this.sliderNerfFactor =
-                    (1 - sliderFactor) *
-                        Math.pow(1 -
-                            estimateImproperlyFollowedDifficultSliders /
-                                aimDifficultSliderCount, 3) +
-                        sliderFactor;
+                // We add tick misses here since they too mean that the player didn't follow the slider
+                // properly. However aren't adding misses here because missing slider heads has a harsh
+                // penalty by itself and doesn't mean that the rest of the slider wasn't followed properly.
+                estimateImproperlyFollowedDifficultSliders = osuBase.MathUtils.clamp(this.sliderEndsDropped + this.sliderTicksMissed, 0, aimDifficultSliderCount);
             }
+            this.sliderNerfFactor =
+                (1 - sliderFactor) *
+                    Math.pow(1 -
+                        estimateImproperlyFollowedDifficultSliders /
+                            aimDifficultSliderCount, 3) +
+                    sliderFactor;
         }
     }
     /**
@@ -2492,7 +2476,7 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
             Math.pow(this.visual, 1.1), 1 / 1.1) * this.finalMultiplier);
     }
     handleOptions(options) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         this._tapPenalty = (_a = options === null || options === void 0 ? void 0 : options.tapPenalty) !== null && _a !== void 0 ? _a : 1;
         this._aimSliderCheesePenalty = (_b = options === null || options === void 0 ? void 0 : options.aimSliderCheesePenalty) !== null && _b !== void 0 ? _b : 1;
         this._flashlightSliderCheesePenalty =
@@ -2500,18 +2484,6 @@ class DroidPerformanceCalculator extends PerformanceCalculator {
         this._visualSliderCheesePenalty =
             (_d = options === null || options === void 0 ? void 0 : options.visualSliderCheesePenalty) !== null && _d !== void 0 ? _d : 1;
         super.handleOptions(options);
-        const { maxCombo, aimDifficultSliderCount, sliderFactor } = this.difficultyAttributes;
-        const combo = (_e = options === null || options === void 0 ? void 0 : options.combo) !== null && _e !== void 0 ? _e : maxCombo - this.computedAccuracy.nmiss;
-        if (aimDifficultSliderCount > 0) {
-            // Consider all missing combo to be dropped difficult sliders.
-            const estimateImproperlyFollowedDifficultSliders = osuBase.MathUtils.clamp(Math.min(this.totalImperfectHits, maxCombo - combo), 0, aimDifficultSliderCount);
-            this.sliderNerfFactor =
-                (1 - sliderFactor) *
-                    Math.pow(1 -
-                        estimateImproperlyFollowedDifficultSliders /
-                            aimDifficultSliderCount, 3) +
-                    sliderFactor;
-        }
     }
     /**
      * Calculates the aim performance value of the beatmap.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-difficulty-calculator",
-    "version": "4.0.0-beta.75",
+    "version": "4.0.0-beta.77",
     "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.74"
+        "@rian8337/osu-base": "^4.0.0-beta.77"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "1e8a43d98546e5071bebe45b3ca40dd496aa7b21"
+    "gitHead": "13ad454ea657dbd5821d0857c4da6dc7ab0fe965"
 }

package/typings/index.d.ts

@@ -1313,7 +1313,6 @@ declare abstract class DroidTapEvaluator {
      * - and the strain time cap.
      *
      * @param current The current object.
-     * @param greatWindow The great hit window of the current object.
      * @param considerCheesability Whether to consider cheesability.
      * @param strainTimeCap The strain time to cap the object's strain time to.
      */