@rian8337/osu-base 2.0.0-alpha.0 → 2.0.0-alpha.26

package/dist/index.js

@@ -1177,7 +1177,9 @@ class ControlPointManager {
         }
         // Remove the existing control point if the new control point overrides it at the same time.
         while (controlPoint.time === existing.time) {
-            this.remove(existing);
+            if (!this.remove(existing)) {
+                break;
+            }
             existing = this.controlPointAt(controlPoint.time);
         }
         // Get the index at which to add the control point.
@@ -3359,18 +3361,6 @@ class BeatmapHitObjectsDecoder extends SectionDecoder {
     extraComboOffset = 0;
     forceNewCombo = false;
     decodeInternal(line) {
-        // Need to check if the beatmap doesn't have an uninherited timing point.
-        // This exists in cases such as /b/2290233 where the beatmap has been
-        // edited by the user.
-        //
-        // In lazer, the default BPM is set to 60 (60000 / 1000).
-        if (this.target.controlPoints.timing.points.length === 0) {
-            this.target.controlPoints.timing.add(new TimingControlPoint({
-                time: Number.NEGATIVE_INFINITY,
-                msPerBeat: 1000,
-                timeSignature: 4,
-            }));
-        }
         const s = line.split(",");
         if (s.length < 4) {
             throw new Error("Ignoring malformed hitobject");
@@ -5680,6 +5670,12 @@ class StoryboardVariablesEncoder extends StoryboardBaseEncoder {
     }
 }
 
+/**
+ * A storyboard encoder.
+ *
+ * Note that this storyboard encoder does not encode storyboards, and as such equality with the
+ * original beatmap or storyboard file is not guaranteed (and usually will not be equal).
+ */
 class StoryboardEncoder extends Encoder {
     finalResult = "";
     encoders = [];
@@ -6317,10 +6313,12 @@ class MapInfo {
      *
      * - Option `0`: return map title and mods used if defined
      * - Option `1`: return song source and map download link to beatmap mirrors
-     * - Option `2`: return CS, AR, OD, HP
-     * - Option `3`: return BPM, map length, max combo
-     * - Option `4`: return last update date and map status
-     * - Option `5`: return favorite count and play count
+     * - Option `2`: return circle, slider, and spinner count
+     * - Option `3`: return CS, AR, OD, HP, and max score statistics for droid
+     * - Option `4`: return CS, AR, OD, HP, and max score statistics for PC
+     * - Option `5`: return BPM, map length, and max combo
+     * - Option `6`: return last update date and map status
+     * - Option `7`: return favorite count and play count
      *
      * @param option The option to pick.
      * @param stats The custom statistics to apply. This will only be used to apply mods, custom speed multiplier, and force AR.
@@ -6343,13 +6341,9 @@ class MapInfo {
             mapParams.speedMultiplier =
                 stats.speedMultiplier ?? mapParams.speedMultiplier;
         }
-        const mapStatistics = new MapStats(mapParams).calculate();
-        mapStatistics.cs = parseFloat(mapStatistics.cs.toFixed(2));
-        mapStatistics.ar = parseFloat(mapStatistics.ar.toFixed(2));
-        mapStatistics.od = parseFloat(mapStatistics.od.toFixed(2));
-        mapStatistics.hp = parseFloat(mapStatistics.hp.toFixed(2));
         switch (option) {
             case 0: {
+                const mapStatistics = new MapStats(mapParams).calculate();
                 let string = `${this.fullTitle}${(mapStatistics.mods.length ?? 0) > 0
                     ? ` +${mapStatistics.mods
                         .map((m) => m.acronym)
@@ -6393,9 +6387,57 @@ class MapInfo {
                 return string;
             }
             case 2:
-                return `**Circles**: ${this.circles} - **Sliders**: ${this.sliders} - **Spinners**: ${this.spinners}\n**CS**: ${this.cs}${this.cs === mapStatistics.cs ? "" : ` (${mapStatistics.cs})`} - **AR**: ${this.ar}${this.ar === mapStatistics.ar ? "" : ` (${mapStatistics.ar})`} - **OD**: ${this.od}${this.od === mapStatistics.od ? "" : ` (${mapStatistics.od})`} - **HP**: ${this.hp}${this.hp === mapStatistics.hp ? "" : ` (${mapStatistics.hp})`}`;
+                return `**Circles**: ${this.circles} - **Sliders**: ${this.sliders} - **Spinners**: ${this.spinners}`;
             case 3: {
-                const maxScore = this.map?.maxDroidScore(mapStatistics) ?? 0;
+                const droidOriginalStats = new MapStats({
+                    cs: this.cs,
+                    ar: this.ar,
+                    od: this.od,
+                    hp: this.hp,
+                }).calculate({ mode: exports.modes.droid });
+                const droidModifiedStats = new MapStats(mapParams).calculate({ mode: exports.modes.droid });
+                droidOriginalStats.cs = MathUtils.round(droidOriginalStats.cs, 2);
+                droidOriginalStats.ar = MathUtils.round(droidOriginalStats.ar, 2);
+                droidOriginalStats.od = MathUtils.round(droidOriginalStats.od, 2);
+                droidOriginalStats.hp = MathUtils.round(droidOriginalStats.hp, 2);
+                droidModifiedStats.cs = MathUtils.round(droidModifiedStats.cs, 2);
+                droidModifiedStats.ar = MathUtils.round(droidModifiedStats.ar, 2);
+                droidModifiedStats.od = MathUtils.round(droidModifiedStats.od, 2);
+                droidModifiedStats.hp = MathUtils.round(droidModifiedStats.hp, 2);
+                const maxScore = this.map?.maxDroidScore(new MapStats(mapParams)) ?? 0;
+                return `**CS**: ${droidOriginalStats.cs}${Precision.almostEqualsNumber(droidOriginalStats.cs, droidModifiedStats.cs)
+                    ? ""
+                    : ` (${droidModifiedStats.cs})`} - **AR**: ${droidOriginalStats.ar}${Precision.almostEqualsNumber(droidOriginalStats.ar, droidModifiedStats.ar)
+                    ? ""
+                    : ` (${droidModifiedStats.ar})`} - **OD**: ${droidOriginalStats.od}${Precision.almostEqualsNumber(droidOriginalStats.od, droidModifiedStats.od)
+                    ? ""
+                    : ` (${droidModifiedStats.od})`} - **HP**: ${droidOriginalStats.hp}${Precision.almostEqualsNumber(droidOriginalStats.hp, droidModifiedStats.hp)
+                    ? ""
+                    : ` (${droidModifiedStats.hp})`}${maxScore > 0
+                    ? `\n**Max Score**: ${maxScore.toLocaleString()}`
+                    : ""}`;
+            }
+            case 4: {
+                const mapStatistics = new MapStats(mapParams).calculate();
+                mapStatistics.cs = MathUtils.round(mapStatistics.cs, 2);
+                mapStatistics.ar = MathUtils.round(mapStatistics.ar, 2);
+                mapStatistics.od = MathUtils.round(mapStatistics.od, 2);
+                mapStatistics.hp = MathUtils.round(mapStatistics.hp, 2);
+                const maxScore = this.map?.maxOsuScore(mapStatistics.mods) ?? 0;
+                return `**CS**: ${this.cs}${Precision.almostEqualsNumber(this.cs, mapStatistics.cs)
+                    ? ""
+                    : ` (${mapStatistics.cs})`} - **AR**: ${this.ar}${Precision.almostEqualsNumber(this.ar, mapStatistics.ar)
+                    ? ""
+                    : ` (${mapStatistics.ar})`} - **OD**: ${this.od}${Precision.almostEqualsNumber(this.od, mapStatistics.od)
+                    ? ""
+                    : ` (${mapStatistics.od})`} - **HP**: ${this.hp}${Precision.almostEqualsNumber(this.hp, mapStatistics.hp)
+                    ? ""
+                    : ` (${mapStatistics.hp})`}${maxScore > 0
+                    ? `\n**Max Score**: ${maxScore.toLocaleString()}`
+                    : ""}`;
+            }
+            case 5: {
+                const mapStatistics = new MapStats(mapParams).calculate();
                 const convertedBPM = this.convertBPM(mapStatistics);
                 let string = "**BPM**: ";
                 if (this.map) {
@@ -6403,9 +6445,7 @@ class MapInfo {
                     if (uninheritedTimingPoints.length === 1) {
                         string += `${this.bpm}${!Precision.almostEqualsNumber(this.bpm, convertedBPM)
                             ? ` (${convertedBPM})`
-                            : ""} - **Length**: ${this.convertTime(mapStatistics)} - **Max Combo**: ${this.maxCombo}x${maxScore > 0
-                            ? `\n**Max Score**: ${maxScore.toLocaleString()}`
-                            : ""}`;
+                            : ""} - **Length**: ${this.convertTime(mapStatistics)} - **Max Combo**: ${this.maxCombo}x`;
                     }
                     else {
                         let maxBPM = this.bpm;
@@ -6432,23 +6472,19 @@ class MapInfo {
                                 string += `(${convertedBPM}) `;
                             }
                         }
-                        string += `- **Length**: ${this.convertTime(mapStatistics)} - **Max Combo**: ${this.maxCombo}x${maxScore > 0
-                            ? `\n**Max score**: ${maxScore.toLocaleString()}`
-                            : ""}`;
+                        string += `- **Length**: ${this.convertTime(mapStatistics)} - **Max Combo**: ${this.maxCombo}x`;
                     }
                 }
                 else {
                     string += `${this.bpm}${!Precision.almostEqualsNumber(this.bpm, convertedBPM)
                         ? ` (${convertedBPM})`
-                        : ""} - **Length**: ${this.convertTime(mapStatistics)} - **Max Combo**: ${this.maxCombo}x${maxScore > 0
-                        ? `\n**Max score**: ${maxScore.toLocaleString()}`
-                        : ""}`;
+                        : ""} - **Length**: ${this.convertTime(mapStatistics)} - **Max Combo**: ${this.maxCombo}x`;
                 }
                 return string;
             }
-            case 4:
+            case 6:
                 return `**Last Update**: ${this.lastUpdate.toUTCString()} | **${this.convertStatus()}**`;
-            case 5:
+            case 7:
                 return `❤️ **${this.favorites.toLocaleString()}** - ▶️ **${this.plays.toLocaleString()}**`;
             default:
                 throw {