@rian8337/osu-base 1.2.8 → 1.4.2

package/dist/beatmap/Beatmap.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Beatmap = void 0;
 const Slider_1 = require("./hitobjects/Slider");
+const SliderTick_1 = require("./hitobjects/sliderObjects/SliderTick");
 /**
  * Represents a beatmap with advanced information.
  */
@@ -93,9 +94,7 @@ class Beatmap {
      */
     get sliderTicks() {
         const sliders = (this.objects.filter((v) => v instanceof Slider_1.Slider));
-        return sliders
-            .map((v) => v.ticks)
-            .reduce((acc, value) => acc + value, 0);
+        return sliders.reduce((acc, value) => acc + value.ticks, 0);
     }
     /**
      * The amount of sliderends in the beatmap.
@@ -108,9 +107,7 @@ class Beatmap {
      */
     get sliderRepeatPoints() {
         const sliders = (this.objects.filter((v) => v instanceof Slider_1.Slider));
-        return sliders
-            .map((v) => v.repeatPoints)
-            .reduce((acc, value) => acc + value, 0);
+        return sliders.reduce((acc, value) => acc + value.repeatPoints, 0);
     }
     /**
      * The maximum combo of the beatmap.
@@ -149,6 +146,86 @@ class Beatmap {
     difficultyControlPointAt(time) {
         return this.getTimingPoint(time, this.difficultyTimingPoints);
     }
+    /**
+     * Calculates the osu!droid maximum score of the beatmap without taking spinner bonus into account.
+     *
+     * @param stats The statistics used for calculation.
+     */
+    maxDroidScore(stats) {
+        let scoreMultiplier = 1;
+        if (stats.mods.every((m) => m.droidRanked)) {
+            let scoreSpeedMultiplier = 1;
+            const speedMultiplier = stats.speedMultiplier;
+            if (speedMultiplier > 1) {
+                scoreSpeedMultiplier += (speedMultiplier - 1) * 0.24;
+            }
+            else if (speedMultiplier < 1) {
+                scoreSpeedMultiplier = Math.pow(0.3, (1 - speedMultiplier) * 4);
+            }
+            scoreMultiplier =
+                stats.mods.reduce((a, v) => a * v.scoreMultiplier, 1) *
+                    scoreSpeedMultiplier;
+        }
+        else {
+            scoreMultiplier = 0;
+        }
+        return this.maxScore(1 + this.od / 10 + this.hp / 10 + (this.cs - 3) / 4, scoreMultiplier);
+    }
+    /**
+     * Calculates the osu!standard maximum score of the beatmap without taking spinner bonus into account.
+     *
+     * @param mods The modifications to calculate for. Defaults to No Mod.
+     */
+    maxOsuScore(mods = []) {
+        const accumulatedDiffPoints = this.cs + this.hp + this.od;
+        let difficultyMultiplier = 2;
+        switch (true) {
+            case accumulatedDiffPoints <= 5:
+                difficultyMultiplier = 2;
+                break;
+            case accumulatedDiffPoints <= 12:
+                difficultyMultiplier = 3;
+                break;
+            case accumulatedDiffPoints <= 17:
+                difficultyMultiplier = 4;
+                break;
+            case accumulatedDiffPoints <= 24:
+                difficultyMultiplier = 5;
+                break;
+            case accumulatedDiffPoints >= 25:
+                difficultyMultiplier = 6;
+                break;
+        }
+        return this.maxScore(difficultyMultiplier, mods.reduce((a, v) => a * v.scoreMultiplier, 1));
+    }
+    /**
+     * Calculates the maximum score with a given difficulty and score multiplier.
+     *
+     * @param difficultyMultiplier The difficulty multiplier.
+     * @param scoreMultiplier The score multiplier.
+     */
+    maxScore(difficultyMultiplier, scoreMultiplier) {
+        let combo = 0;
+        let score = 0;
+        for (const object of this.objects) {
+            if (!(object instanceof Slider_1.Slider)) {
+                score += Math.floor(300 +
+                    (300 * combo * difficultyMultiplier * scoreMultiplier) /
+                        25);
+                ++combo;
+                continue;
+            }
+            const tickCount = object.nestedHitObjects.filter((v) => v instanceof SliderTick_1.SliderTick).length;
+            // Apply sliderhead, slider repeats, and slider ticks
+            score += 30 * (object.repeatPoints + 1) + 10 * tickCount;
+            combo += tickCount + (object.repeatPoints + 1);
+            // Apply sliderend
+            score += Math.floor(300 +
+                (300 * combo * difficultyMultiplier * scoreMultiplier) / 25);
+            ++combo;
+        }
+        return score;
+    }
     /**
      * Gets the timing point that applies at a given time.
      *

package/dist/beatmap/hitobjects/sliderObjects/SliderHead.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SliderHead = void 0;
+const Circle_1 = require("../Circle");
+/**
+ * Represents the head of a slider.
+ */
+class SliderHead extends Circle_1.Circle {
+}
+exports.SliderHead = SliderHead;

package/dist/beatmap/hitobjects/sliderObjects/SliderRepeat.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SliderRepeat = void 0;
+const HitObject_1 = require("../HitObject");
+/**
+ * Represents a repeat point in a slider.
+ */
+class SliderRepeat extends HitObject_1.HitObject {
+    constructor(values) {
+        super({
+            startTime: values.startTime,
+            position: values.position,
+        });
+        this.repeatIndex = values.repeatIndex;
+        this.spanDuration = values.spanDuration;
+    }
+    toString() {
+        return `Position: [${this.position.x}, ${this.position.y}], repeat index: ${this.repeatIndex}, span duration: ${this.spanDuration}`;
+    }
+}
+exports.SliderRepeat = SliderRepeat;

package/dist/beatmap/hitobjects/sliderObjects/SliderTail.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SliderTail = void 0;
+const Circle_1 = require("../Circle");
+/**
+ * Represents the tail of a slider.
+ */
+class SliderTail extends Circle_1.Circle {
+}
+exports.SliderTail = SliderTail;

package/dist/tools/MapInfo.js

@@ -8,8 +8,6 @@ const request_1 = __importDefault(require("request"));
 const MapStats_1 = require("../utils/MapStats");
 const Parser_1 = require("../beatmap/Parser");
 const rankedStatus_1 = require("../constants/rankedStatus");
-const Slider_1 = require("../beatmap/hitobjects/Slider");
-const SliderTick_1 = require("../beatmap/hitobjects/sliderObjects/SliderTick");
 const APIRequestBuilder_1 = require("../utils/APIRequestBuilder");
 const Precision_1 = require("../utils/Precision");
 const Utils_1 = require("../utils/Utils");
@@ -179,7 +177,7 @@ class MapInfo {
         const map = new MapInfo();
         const result = await apiRequestBuilder.sendRequest();
         if (result.statusCode !== 200) {
-            throw new Error("API error");
+            throw new Error("osu! API error");
         }
         const mapinfo = JSON.parse(result.data.toString("utf-8"))[0];
         if (!mapinfo) {
@@ -499,55 +497,12 @@ class MapInfo {
         }
     }
     /**
-     * Calculates the osu!droid maximum score of the beatmap.
+     * Calculates the osu!droid maximum score of the beatmap without taking spinner bonus into account.
      *
      * This requires .osu file to be downloaded.
      */
     maxScore(stats) {
-        if (!this.map) {
-            return 0;
-        }
-        const difficultyMultiplier = 1 + this.od / 10 + this.hp / 10 + (this.cs - 3) / 4;
-        // score multiplier
-        let scoreMultiplier = 1;
-        if (stats.mods.every((m) => m.droidRanked)) {
-            let scoreSpeedMultiplier = 1;
-            const speedMultiplier = stats.speedMultiplier;
-            if (speedMultiplier > 1) {
-                scoreSpeedMultiplier += (speedMultiplier - 1) * 0.24;
-            }
-            else if (speedMultiplier < 1) {
-                scoreSpeedMultiplier = Math.pow(0.3, (1 - speedMultiplier) * 4);
-            }
-            scoreMultiplier =
-                stats.mods.reduce((a, v) => a * v.scoreMultiplier, 1) *
-                    scoreSpeedMultiplier;
-        }
-        else {
-            scoreMultiplier = 0;
-        }
-        const objects = this.map.objects;
-        let combo = 0;
-        let score = 0;
-        for (let i = 0; i < objects.length; ++i) {
-            const object = objects[i];
-            if (!(object instanceof Slider_1.Slider)) {
-                score += Math.floor(300 +
-                    (300 * combo * difficultyMultiplier * scoreMultiplier) /
-                        25);
-                ++combo;
-                continue;
-            }
-            const tickCount = object.nestedHitObjects.filter((v) => v instanceof SliderTick_1.SliderTick).length;
-            // Apply sliderhead, slider repeats, and slider ticks
-            score += 30 * (object.repeatPoints + 1) + 10 * tickCount;
-            combo += tickCount + (object.repeatPoints + 1);
-            // Apply sliderend
-            score += Math.floor(300 +
-                (300 * combo * difficultyMultiplier * scoreMultiplier) / 25);
-            ++combo;
-        }
-        return score;
+        return this.map?.maxDroidScore(stats) ?? 0;
     }
     /**
      * Returns a string representative of the class.

package/dist/utils/MapStats.js

@@ -173,9 +173,7 @@ class MapStats {
     static modifyAR(baseAR, speedMultiplier, statisticsMultiplier) {
         let ar = baseAR;
         ar *= statisticsMultiplier;
-        let arMS = ar < 5.0
-            ? this.AR0_MS - this.AR_MS_STEP1 * ar
-            : this.AR5_MS - this.AR_MS_STEP2 * (ar - 5);
+        let arMS = this.arToMS(ar);
         arMS = Math.min(this.AR0_MS, Math.max(this.AR10_MS, arMS));
         arMS /= speedMultiplier;
         ar =
@@ -184,6 +182,17 @@ class MapStats {
                 : 5 + (this.AR5_MS - arMS) / this.AR_MS_STEP2;
         return ar;
     }
+    /**
+     * Converts an AR value to its milliseconds value.
+     *
+     * @param ar The AR to convert.
+     * @returns The milliseconds value represented by the AR.
+     */
+    static arToMS(ar) {
+        return ar < 5.0
+            ? this.AR0_MS - this.AR_MS_STEP1 * ar
+            : this.AR5_MS - this.AR_MS_STEP2 * (ar - 5);
+    }
     /**
      * Utility function to apply speed and flat multipliers to stats where speed changes apply for OD.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rian8337/osu-base",
-  "version": "1.2.8",
+  "version": "1.4.2",
   "description": "Base module for all osu! related modules.",
   "keywords": [
     "osu",
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3e633e510be04aca9c46b9361524251442049621"
+  "gitHead": "5dee4c74e815dfee236e912ce40a6a7d363d62be"
 }

package/typings/index.d.ts

@@ -159,6 +159,28 @@ declare module "@rian8337/osu-base" {
          * @param time The time.
          */
         difficultyControlPointAt(time: number): DifficultyControlPoint;
+        /**
+         * Calculates the osu!droid maximum score of the beatmap without taking spinner bonus into account.
+         *
+         * @param stats The statistics used for calculation.
+         */
+        maxDroidScore(stats: MapStats): number;
+        /**
+         * Calculates the osu!standard maximum score of the beatmap without taking spinner bonus into account.
+         *
+         * @param mods The modifications to calculate for. Defaults to No Mod.
+         */
+        maxOsuScore(mods?: Mod[]): number;
+        /**
+         * Calculates the maximum score with a given difficulty and score multiplier.
+         *
+         * @param difficultyMultiplier The difficulty multiplier.
+         * @param scoreMultiplier The score multiplier.
+         */
+        private maxScore(
+            difficultyMultiplier: number,
+            scoreMultiplier: number
+        ): number;
         /**
          * Gets the timing point that applies at a given time.
          *
@@ -551,7 +573,7 @@ declare module "@rian8337/osu-base" {
          */
         get statusColor(): number;
         /**
-         * Calculates the osu!droid maximum score of the beatmap.
+         * Calculates the osu!droid maximum score of the beatmap without taking spinner bonus into account.
          *
          * This requires .osu file to be downloaded.
          */
@@ -683,6 +705,13 @@ declare module "@rian8337/osu-base" {
             speedMultiplier: number,
             statisticsMultiplier: number
         ): number;
+        /**
+         * Converts an AR value to its milliseconds value.
+         *
+         * @param ar The AR to convert.
+         * @returns The milliseconds value represented by the AR.
+         */
+        static arToMS(ar: number): number;
         /**
          * Utility function to apply speed and flat multipliers to stats where speed changes apply for OD.
          *