@rian8337/osu-difficulty-calculator 1.1.0 → 1.1.1

package/dist/DroidStarRating.js

@@ -72,9 +72,6 @@ class DroidStarRating extends StarRating_1.StarRating {
      * Calculates the speed star rating of the beatmap and stores it in this instance.
      */
     calculateTap() {
-        if (this.mods.some((m) => m instanceof osu_base_1.ModRelax)) {
-            return;
-        }
         const tapSkill = new DroidTap_1.DroidTap(this.mods, this.stats.od);
         this.calculateSkills(tapSkill);
         this.strainPeaks.speed = tapSkill.strainPeaks;
@@ -122,24 +119,12 @@ class DroidStarRating extends StarRating_1.StarRating {
     calculateAll() {
         const skills = this.createSkills();
         const isRelax = this.mods.some((m) => m instanceof osu_base_1.ModRelax);
-        if (isRelax) {
-            // Remove tap and rhythm skill to prevent overhead. These values will be 0 anyways.
-            skills.splice(2, 2);
-        }
         this.calculateSkills(...skills);
         const aimSkill = skills[0];
         const aimSkillWithoutSliders = skills[1];
-        let tapSkill;
-        let rhythmSkill;
-        let flashlightSkill;
-        if (!isRelax) {
-            rhythmSkill = skills[2];
-            tapSkill = skills[3];
-            flashlightSkill = skills[4];
-        }
-        else {
-            flashlightSkill = skills[2];
-        }
+        const rhythmSkill = skills[2];
+        const tapSkill = skills[3];
+        const flashlightSkill = skills[4];
         this.strainPeaks.aimWithSliders = aimSkill.strainPeaks;
         this.strainPeaks.aimWithoutSliders = aimSkillWithoutSliders.strainPeaks;
         this.aim = this.starValue(aimSkill.difficultyValue());
@@ -148,18 +133,16 @@ class DroidStarRating extends StarRating_1.StarRating {
                 this.starValue(aimSkillWithoutSliders.difficultyValue()) /
                     this.aim;
         }
-        if (tapSkill) {
+        if (!isRelax) {
             this.strainPeaks.speed = tapSkill.strainPeaks;
             this.tap = this.starValue(tapSkill.difficultyValue());
-            const objectStrains = this.objects.map((v) => v.tapStrain);
-            const maxStrain = Math.max(...objectStrains);
-            if (maxStrain) {
-                this.attributes.speedNoteCount = objectStrains.reduce((total, next) => total +
-                    1 / (1 + Math.exp(-((next / maxStrain) * 12 - 6))), 0);
-            }
         }
-        if (rhythmSkill) {
-            this.calculateSkills(rhythmSkill);
+        const objectStrains = this.objects.map((v) => v.tapStrain);
+        const maxStrain = Math.max(...objectStrains);
+        if (maxStrain) {
+            this.attributes.speedNoteCount = objectStrains.reduce((total, next) => total + 1 / (1 + Math.exp(-((next / maxStrain) * 12 - 6))), 0);
+        }
+        if (!isRelax) {
             this.rhythm = this.starValue(rhythmSkill.difficultyValue());
         }
         this.strainPeaks.flashlight = flashlightSkill.strainPeaks;

package/dist/base/PerformanceCalculator.js

@@ -62,8 +62,9 @@ class PerformanceCalculator {
                 nmiss: params.miss || 0,
             });
         }
+        this.effectiveMissCount = this.calculateEffectiveMissCount(combo, maxCombo);
         if (this.stars.mods.some((m) => m instanceof osu_base_1.ModNoFail)) {
-            this.finalMultiplier *= Math.max(0.9, 1 - 0.02 * this.computedAccuracy.nmiss);
+            this.finalMultiplier *= Math.max(0.9, 1 - 0.02 * this.effectiveMissCount);
         }
         if (this.stars.mods.some((m) => m instanceof osu_base_1.ModSpunOut)) {
             this.finalMultiplier *=
@@ -71,11 +72,13 @@ class PerformanceCalculator {
                     Math.pow(this.stars.map.spinners / this.stars.objects.length, 0.85);
         }
         if (this.stars.mods.some((m) => m instanceof osu_base_1.ModRelax)) {
-            this.computedAccuracy.nmiss +=
-                this.computedAccuracy.n100 + this.computedAccuracy.n50;
+            // As we're adding 100s and 50s to an approximated number of combo breaks, the result can be higher
+            // than total hits in specific scenarios (which breaks some calculations),  so we need to clamp it.
+            this.effectiveMissCount = Math.min(this.effectiveMissCount +
+                this.computedAccuracy.n100 +
+                this.computedAccuracy.n50, this.stars.objects.length);
             this.finalMultiplier *= 0.6;
         }
-        this.effectiveMissCount = this.calculateEffectiveMissCount(combo, maxCombo);
         this.mapStatistics = new osu_base_1.MapStats({
             ar: baseAR,
             od: baseOD,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rian8337/osu-difficulty-calculator",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A module for calculating osu!standard beatmap difficulty and performance value with respect to the current difficulty and performance algorithm.",
   "keywords": [
     "osu",
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "409e4106e7d7297924a55c625d4214fb0ba79a18"
+  "gitHead": "595c6aac626f4346807f6da868c86324fed52422"
 }