@rian8337/osu-difficulty-calculator 1.2.1 → 1.2.3

package/dist/DroidStarRating.js

@@ -115,7 +115,9 @@ class DroidStarRating extends StarRating_1.StarRating {
         if (!isRelax) {
             this.postCalculateTap(tapSkill);
         }
-        this.calculateSpeedNoteCount();
+        else {
+            this.calculateSpeedNoteCount();
+        }
         if (!isRelax) {
             this.postCalculateRhythm(rhythmSkill);
         }

package/dist/OsuStarRating.js

@@ -35,15 +35,8 @@ class OsuStarRating extends StarRating_1.StarRating {
     calculateAim() {
         const aimSkill = new OsuAim_1.OsuAim(this.mods, true);
         const aimSkillWithoutSliders = new OsuAim_1.OsuAim(this.mods, false);
-        this.calculateSkills(aimSkill);
-        this.strainPeaks.aimWithSliders = aimSkill.strainPeaks;
-        this.strainPeaks.aimWithoutSliders = aimSkillWithoutSliders.strainPeaks;
-        this.aim = this.starValue(aimSkill.difficultyValue());
-        if (this.aim) {
-            this.attributes.sliderFactor =
-                this.starValue(aimSkillWithoutSliders.difficultyValue()) /
-                    this.aim;
-        }
+        this.calculateSkills(aimSkill, aimSkillWithoutSliders);
+        this.postCalculateAim(aimSkill, aimSkillWithoutSliders);
     }
     /**
      * Calculates the speed star rating of the beatmap and stores it in this instance.
@@ -54,8 +47,7 @@ class OsuStarRating extends StarRating_1.StarRating {
         }
         const speedSkill = new OsuSpeed_1.OsuSpeed(this.mods, new osu_base_1.OsuHitWindow(this.stats.od).hitWindowFor300());
         this.calculateSkills(speedSkill);
-        this.strainPeaks.speed = speedSkill.strainPeaks;
-        this.speed = this.starValue(speedSkill.difficultyValue());
+        this.postCalculateSpeed(speedSkill);
     }
     /**
      * Calculates the flashlight star rating of the beatmap and stores it in this instance.
@@ -63,8 +55,7 @@ class OsuStarRating extends StarRating_1.StarRating {
     calculateFlashlight() {
         const flashlightSkill = new OsuFlashlight_1.OsuFlashlight(this.mods);
         this.calculateSkills(flashlightSkill);
-        this.strainPeaks.flashlight = flashlightSkill.strainPeaks;
-        this.flashlight = this.starValue(flashlightSkill.difficultyValue());
+        this.postCalculateFlashlight(flashlightSkill);
     }
     calculateTotal() {
         const aimPerformanceValue = this.basePerformanceValue(this.aim);
@@ -87,10 +78,6 @@ class OsuStarRating extends StarRating_1.StarRating {
     calculateAll() {
         const skills = this.createSkills();
         const isRelax = this.mods.some((m) => m instanceof osu_base_1.ModRelax);
-        if (isRelax) {
-            // Remove speed skill to prevent overhead
-            skills.splice(2, 1);
-        }
         this.calculateSkills(...skills);
         const aimSkill = skills[0];
         const aimSkillWithoutSliders = skills[1];
@@ -103,20 +90,11 @@ class OsuStarRating extends StarRating_1.StarRating {
             speedSkill = skills[2];
             flashlightSkill = skills[3];
         }
-        this.strainPeaks.aimWithSliders = aimSkill.strainPeaks;
-        this.strainPeaks.aimWithoutSliders = aimSkillWithoutSliders.strainPeaks;
-        this.aim = this.starValue(aimSkill.difficultyValue());
-        if (this.aim) {
-            this.attributes.sliderFactor =
-                this.starValue(aimSkillWithoutSliders.difficultyValue()) /
-                    this.aim;
-        }
+        this.postCalculateAim(aimSkill, aimSkillWithoutSliders);
         if (speedSkill) {
-            this.strainPeaks.speed = speedSkill.strainPeaks;
-            this.speed = this.starValue(speedSkill.difficultyValue());
+            this.postCalculateSpeed(speedSkill);
         }
-        this.strainPeaks.flashlight = flashlightSkill.strainPeaks;
-        this.flashlight = this.starValue(flashlightSkill.difficultyValue());
+        this.postCalculateFlashlight(flashlightSkill);
         this.calculateTotal();
     }
     /**
@@ -143,5 +121,39 @@ class OsuStarRating extends StarRating_1.StarRating {
             new OsuFlashlight_1.OsuFlashlight(this.mods),
         ];
     }
+    /**
+     * Called after aim skill calculation.
+     *
+     * @param aimSkill The aim skill that considers sliders.
+     * @param aimSkillWithoutSliders The aim skill that doesn't consider sliders.
+     */
+    postCalculateAim(aimSkill, aimSkillWithoutSliders) {
+        this.strainPeaks.aimWithSliders = aimSkill.strainPeaks;
+        this.strainPeaks.aimWithoutSliders = aimSkillWithoutSliders.strainPeaks;
+        this.aim = this.starValue(aimSkill.difficultyValue());
+        if (this.aim) {
+            this.attributes.sliderFactor =
+                this.starValue(aimSkillWithoutSliders.difficultyValue()) /
+                    this.aim;
+        }
+    }
+    /**
+     * Called after speed skill calculation.
+     *
+     * @param speedSkill The speed skill.
+     */
+    postCalculateSpeed(speedSkill) {
+        this.strainPeaks.speed = speedSkill.strainPeaks;
+        this.speed = this.starValue(speedSkill.difficultyValue());
+    }
+    /**
+     * Called after flashlight skill calculation.
+     *
+     * @param flashlightSkill The flashlight skill.
+     */
+    postCalculateFlashlight(flashlightSkill) {
+        this.strainPeaks.flashlight = flashlightSkill.strainPeaks;
+        this.flashlight = this.starValue(flashlightSkill.difficultyValue());
+    }
 }
 exports.OsuStarRating = OsuStarRating;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rian8337/osu-difficulty-calculator",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "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": "8c08cf8f2c3af4b9a306f9fe9ffedfe339b9b046"
+  "gitHead": "e2d1f9bef01c9b12954a78683c3b8dcddabc7b1d"
 }

package/typings/index.d.ts

@@ -414,16 +414,6 @@ declare module "@rian8337/osu-difficulty-calculator" {
          * @param flashlightSkill The flashlight skill.
          */
         private postCalculateFlashlight(flashlightSkill: DroidFlashlight): void;
-        /**
-         * Calculates the base rating value of a difficulty.
-         */
-        private baseRatingValue(difficulty: number): number;
-        /**
-         * Calculates the base performance value of a difficulty rating.
-         *
-         * @param rating The difficulty rating.
-         */
-        private basePerformanceValue(rating: number): number;
     }
 
     /**
@@ -716,17 +706,27 @@ declare module "@rian8337/osu-difficulty-calculator" {
          */
         protected override createSkills(): OsuSkill[];
         /**
-         * Calculates the base performance value of a difficulty rating.
+         * Called after aim skill calculation.
          *
-         * @param rating The difficulty rating.
+         * @param aimSkill The aim skill that considers sliders.
+         * @param aimSkillWithoutSliders The aim skill that doesn't consider sliders.
          */
-        private basePerformanceValue(rating: number): number;
+        private postCalculateAim(
+            aimSkill: OsuAim,
+            aimSkillWithoutSliders: OsuAim
+        ): void;
         /**
-         * Calculates the star rating value of a difficulty.
+         * Called after speed skill calculation.
          *
-         * @param difficulty The difficulty to calculate.
+         * @param speedSkill The speed skill.
          */
-        private starValue(difficulty: number): number;
+        private postCalculateSpeed(speedSkill: OsuSpeed): void;
+        /**
+         * Called after flashlight skill calculation.
+         *
+         * @param flashlightSkill The flashlight skill.
+         */
+        private postCalculateFlashlight(flashlightSkill: OsuFlashlight): void;
     }
 
     //#endregion
@@ -1061,6 +1061,18 @@ declare module "@rian8337/osu-difficulty-calculator" {
          * Creates skills to be calculated.
          */
         protected abstract createSkills(): Skill[];
+        /**
+         * Calculates the star rating value of a difficulty.
+         *
+         * @param difficulty The difficulty to calculate.
+         */
+        protected starValue(difficulty: number): number;
+        /**
+         * Calculates the base performance value of a difficulty rating.
+         *
+         * @param rating The difficulty rating.
+         */
+        protected basePerformanceValue(rating: number): number;
     }
 
     /**