@rian8337/osu-base 2.2.0 → 3.0.0-beta.2

package/dist/index.js

@@ -311,7 +311,9 @@ class APIRequestBuilder {
             })
                 .on("complete", async (response) => {
                 ++this.fetchAttempts;
-                if (response.statusCode !== 200 && this.fetchAttempts < 5) {
+                const { statusCode } = response;
+                if ((statusCode === 500 || statusCode === 503) &&
+                    this.fetchAttempts < 5) {
                     console.error(`Request to ${url} failed; ${this.fetchAttempts} attempts so far; retrying`);
                     await Utils.sleep(0.2);
                     return resolve(this.sendRequest());
@@ -342,9 +344,7 @@ class APIRequestBuilder {
      * @param param The parameter to remove.
      */
     removeParameter(param) {
-        if (this.params.get(param)) {
-            this.params.delete(param);
-        }
+        this.params.delete(param);
         return this;
     }
 }
@@ -355,18 +355,6 @@ class DroidAPIRequestBuilder extends APIRequestBuilder {
     host = "https://osudroid.moe/api/";
     APIkey = process.env.DROID_API_KEY;
     APIkeyParam = `apiKey=${this.APIkey}&`;
-    setEndpoint(endpoint) {
-        // Compatibility with old API. Can be removed in v3.0.
-        switch (endpoint) {
-            case "banscore.php":
-                endpoint = "single_score_wipe.php";
-                break;
-            case "rename.php":
-                endpoint = "user_rename.php";
-                break;
-        }
-        return super.setEndpoint(endpoint);
-    }
 }
 /**
  * API request builder for osu!standard.
@@ -377,6 +365,15 @@ class OsuAPIRequestBuilder extends APIRequestBuilder {
     APIkeyParam = `k=${this.APIkey}&`;
 }
 
+/**
+ * Mode enum to switch things between osu!droid and osu!standard.
+ */
+exports.modes = void 0;
+(function (modes) {
+    modes["droid"] = "droid";
+    modes["osu"] = "osu";
+})(exports.modes || (exports.modes = {}));
+
 /**
  * Bitmask constant of object types. This is needed as osu! uses bits to determine object types.
  */
@@ -390,15 +387,15 @@ exports.objectTypes = void 0;
 })(exports.objectTypes || (exports.objectTypes = {}));
 
 /**
- * Based on `Vector2` class in C#.
+ * Represents a two-dimensional vector.
  */
 class Vector2 {
     /**
-     * The x position of the vector.
+     * The x position of this vector.
      */
     x;
     /**
-     * The y position of the vector.
+     * The y position of this vector.
      */
     y;
     constructor(x, y) {
@@ -406,11 +403,22 @@ class Vector2 {
         this.y = y;
     }
     /**
-     * Multiplies the vector with another vector.
+     * Multiplies this vector with another vector.
+     *
+     * @param vec The other vector.
+     * @returns The multiplied vector.
      */
     multiply(vec) {
         return new Vector2(this.x * vec.x, this.y * vec.y);
     }
+    /**
+     * Divides this vector with a scalar.
+     *
+     * Attempting to divide by 0 will throw an error.
+     *
+     * @param divideFactor The factor to divide the vector by.
+     * @returns The divided vector.
+     */
     divide(divideFactor) {
         if (divideFactor === 0) {
             throw new Error("Division by 0");
@@ -418,37 +426,52 @@ class Vector2 {
         return new Vector2(this.x / divideFactor, this.y / divideFactor);
     }
     /**
-     * Adds the vector with another vector.
+     * Adds this vector with another vector.
+     *
+     * @param vec The other vector.
+     * @returns The added vector.
      */
     add(vec) {
         return new Vector2(this.x + vec.x, this.y + vec.y);
     }
     /**
-     * Subtracts the vector with another vector.
+     * Subtracts this vector with another vector.
+     *
+     * @param vec The other vector.
+     * @returns The subtracted vector.
      */
     subtract(vec) {
         return new Vector2(this.x - vec.x, this.y - vec.y);
     }
     /**
-     * The length of the vector.
+     * The length of this vector.
      */
     get length() {
         return Math.sqrt(Math.pow(this.x, 2) + Math.pow(this.y, 2));
     }
     /**
      * Performs a dot multiplication with another vector.
+     *
+     * @param vec The other vector.
+     * @returns The dot product of both vectors.
      */
     dot(vec) {
         return this.x * vec.x + this.y * vec.y;
     }
     /**
-     * Scales the vector.
+     * Scales this vector.
+     *
+     * @param scaleFactor The factor to scale the vector by.
+     * @returns The scaled vector.
      */
     scale(scaleFactor) {
         return new Vector2(this.x * scaleFactor, this.y * scaleFactor);
     }
     /**
      * Gets the distance between this vector and another vector.
+     *
+     * @param vec The other vector.
+     * @returns The distance between this vector and the other vector.
      */
     getDistance(vec) {
         const x = this.x - vec.x;
@@ -467,6 +490,7 @@ class Vector2 {
      * Checks whether this vector is equal to another vector.
      *
      * @param other The other vector.
+     * @returns Whether this vector is equal to the other vector.
      */
     equals(other) {
         return this.x === other.x && this.y === other.y;
@@ -509,31 +533,6 @@ class HitObject {
     get duration() {
         return this.endTime - this.startTime;
     }
-    /**
-     * The stacked position of the hitobject.
-     */
-    get stackedPosition() {
-        if (this.type & exports.objectTypes.spinner) {
-            return this.position;
-        }
-        return this.position.add(this.stackOffset);
-    }
-    /**
-     * The stacked end position of the hitobject.
-     */
-    get stackedEndPosition() {
-        if (this.type & exports.objectTypes.spinner) {
-            return this.position;
-        }
-        return this.endPosition.add(this.stackOffset);
-    }
-    /**
-     * The stack vector to calculate offset for stacked positions.
-     */
-    get stackOffset() {
-        const coordinate = this.stackHeight * this.scale * -6.4;
-        return new Vector2(coordinate, coordinate);
-    }
     /**
      * Whether this hit object represents a new combo.
      */
@@ -554,15 +553,13 @@ class HitObject {
      */
     stackHeight = 0;
     /**
-     * The scale used to calculate stacked position and radius.
+     * The osu!droid scale used to calculate stacked position and radius.
      */
-    scale = 1;
+    droidScale = 1;
     /**
-     * The radius of the hitobject.
+     * The osu!standard scale used to calculate stacked position and radius.
      */
-    get radius() {
-        return 64 * this.scale;
-    }
+    osuScale = 1;
     constructor(values) {
         this.startTime = values.startTime;
         this.endTime = values.endTime ?? values.startTime;
@@ -572,6 +569,62 @@ class HitObject {
         this.isNewCombo = values.newCombo ?? false;
         this.comboOffset = values.comboOffset ?? 0;
     }
+    /**
+     * Evaluates the radius of the hitobject.
+     *
+     * @param mode The gamemode to evaluate for.
+     * @returns The radius of the hitobject with respect to the gamemode.
+     */
+    getRadius(mode) {
+        let radius = 64;
+        switch (mode) {
+            case exports.modes.droid:
+                radius *= this.droidScale;
+                break;
+            case exports.modes.osu:
+                radius *= this.osuScale;
+                break;
+        }
+        return radius;
+    }
+    /**
+     * Evaluates the stack offset vector of the hitobject.
+     *
+     * This is used to calculate offset for stacked positions.
+     *
+     * @param mode The gamemode to evaluate for.
+     * @returns The stack offset with respect to the gamemode.
+     */
+    getStackOffset(mode) {
+        let coordinate = this.stackHeight * -6.4;
+        switch (mode) {
+            case exports.modes.droid:
+                coordinate *= this.droidScale;
+                break;
+            case exports.modes.osu:
+                coordinate *= this.osuScale;
+                break;
+        }
+        return new Vector2(coordinate, coordinate);
+    }
+    /**
+     * Evaluates the stacked position of the hitobject.
+     *
+     * @param mode The gamemode to evaluate for.
+     * @returns The stacked position with respect to the gamemode.
+     */
+    getStackedPosition(mode) {
+        return this.evaluateStackedPosition(this.position, mode);
+    }
+    /**
+     * Evaluates the stacked end position of the hitobject.
+     *
+     * @param mode The gamemode to evaluate for.
+     * @returns The stacked end position with respect to the gamemode.
+     */
+    getStackedEndPosition(mode) {
+        return this.evaluateStackedPosition(this.endPosition, mode);
+    }
     /**
      * Returns the hitobject type.
      */
@@ -588,6 +641,19 @@ class HitObject {
         }
         return res.substring(0, Math.max(0, res.length - 3));
     }
+    /**
+     * Evaluates the stacked position of the specified position.
+     *
+     * @param position The position to evaluate.
+     * @param mode The gamemode to evaluate for.
+     * @returns The stacked position.
+     */
+    evaluateStackedPosition(position, mode) {
+        if (this.type & exports.objectTypes.spinner) {
+            return position;
+        }
+        return position.add(this.getStackOffset(mode));
+    }
 }
 
 /**
@@ -1305,11 +1371,10 @@ class DifficultyControlPoint extends ControlPoint {
      * This exists for backwards compatibility with maps that abuse NaN slider velocity behavior on osu!stable (e.g. /b/2628991).
      */
     generateTicks;
-    // Generate ticks can be made required in 3.0.
     constructor(values) {
         super(values);
         this.speedMultiplier = values.speedMultiplier;
-        this.generateTicks = values.generateTicks ?? true;
+        this.generateTicks = values.generateTicks;
     }
     isRedundant(existing) {
         return (this.speedMultiplier === existing.speedMultiplier &&
@@ -1332,6 +1397,7 @@ class DifficultyControlPointManager extends ControlPointManager {
     defaultControlPoint = new DifficultyControlPoint({
         time: 0,
         speedMultiplier: 1,
+        generateTicks: true,
     });
     controlPointAt(time) {
         return this.binarySearchWithFallback(time);
@@ -1725,7 +1791,12 @@ class Beatmap {
      * @param stats The statistics used for calculation.
      */
     maxDroidScore(stats) {
-        let scoreMultiplier = stats.mods.reduce((a, v) => a * v.droidScoreMultiplier, 1);
+        let scoreMultiplier = 1;
+        for (const mod of stats.mods) {
+            if (mod.isApplicableToDroid()) {
+                scoreMultiplier *= mod.droidScoreMultiplier;
+            }
+        }
         const { speedMultiplier } = stats;
         if (speedMultiplier >= 1) {
             scoreMultiplier *= 1 + (speedMultiplier - 1) * 0.24;
@@ -1770,7 +1841,12 @@ class Beatmap {
     maxOsuScore(mods = []) {
         const accumulatedDiffPoints = this.difficulty.cs + this.difficulty.hp + this.difficulty.od;
         let difficultyMultiplier = 2;
-        const scoreMultiplier = mods.reduce((a, v) => a * v.pcScoreMultiplier, 1);
+        let scoreMultiplier = 1;
+        for (const mod of mods) {
+            if (mod.isApplicableToOsu()) {
+                scoreMultiplier *= mod.pcScoreMultiplier;
+            }
+        }
         switch (true) {
             case accumulatedDiffPoints <= 5:
                 difficultyMultiplier = 2;
@@ -1881,15 +1957,6 @@ class BeatmapBackground {
     }
 }
 
-/**
- * Mode enum to switch things between osu!droid and osu!standard.
- */
-exports.modes = void 0;
-(function (modes) {
-    modes["droid"] = "droid";
-    modes["osu"] = "osu";
-})(exports.modes || (exports.modes = {}));
-
 class HitWindow {
     /**
      * The overall difficulty of this hit window.
@@ -2018,18 +2085,28 @@ class OsuHitWindow extends HitWindow {
     }
 }
 
-// TODO: separate droid/PC mod implementations
 /**
  * Represents a mod.
  */
 class Mod {
+    /**
+     * Whether this mod can be applied to osu!droid.
+     */
+    isApplicableToDroid() {
+        return "droidRanked" in this;
+    }
+    /**
+     * Whether this mod can be applied to osu!standard.
+     */
+    isApplicableToOsu() {
+        return "pcRanked" in this;
+    }
 }
 
 /**
  * Represents the DoubleTime mod.
  */
 class ModDoubleTime extends Mod {
-    scoreMultiplier = 1.12;
     acronym = "DT";
     name = "DoubleTime";
     droidRanked = true;
@@ -2038,14 +2115,12 @@ class ModDoubleTime extends Mod {
     pcScoreMultiplier = 1.12;
     bitwise = 1 << 6;
     droidString = "d";
-    droidOnly = false;
 }
 
 /**
  * Represents the HalfTime mod.
  */
 class ModHalfTime extends Mod {
-    scoreMultiplier = 0.3;
     acronym = "HT";
     name = "HalfTime";
     droidRanked = true;
@@ -2054,14 +2129,12 @@ class ModHalfTime extends Mod {
     pcScoreMultiplier = 0.3;
     bitwise = 1 << 8;
     droidString = "t";
-    droidOnly = false;
 }
 
 /**
  * Represents the NightCore mod.
  */
 class ModNightCore extends Mod {
-    scoreMultiplier = 1.12;
     acronym = "NC";
     name = "NightCore";
     droidRanked = true;
@@ -2070,14 +2143,12 @@ class ModNightCore extends Mod {
     pcScoreMultiplier = 1.12;
     bitwise = 1 << 9;
     droidString = "c";
-    droidOnly = false;
 }
 
 /**
  * Represents the HardRock mod.
  */
 class ModHardRock extends Mod {
-    scoreMultiplier = 1.06;
     acronym = "HR";
     name = "HardRock";
     bitwise = 1 << 4;
@@ -2086,14 +2157,12 @@ class ModHardRock extends Mod {
     droidScoreMultiplier = 1.06;
     pcScoreMultiplier = 1.06;
     droidString = "r";
-    droidOnly = false;
 }
 
 /**
  * Represents the Easy mod.
  */
 class ModEasy extends Mod {
-    scoreMultiplier = 0.5;
     acronym = "EZ";
     name = "Easy";
     droidRanked = true;
@@ -2102,62 +2171,45 @@ class ModEasy extends Mod {
     pcScoreMultiplier = 0.5;
     bitwise = 1 << 1;
     droidString = "e";
-    droidOnly = false;
 }
 
 /**
  * Represents the Precise mod.
  */
 class ModPrecise extends Mod {
-    scoreMultiplier = 1.06;
     acronym = "PR";
     name = "Precise";
     droidRanked = true;
-    pcRanked = false;
     droidScoreMultiplier = 1.06;
-    pcScoreMultiplier = 1.06;
-    bitwise = Number.NaN;
     droidString = "s";
-    droidOnly = true;
 }
 
 /**
  * Represents the SmallCircle mod.
  */
 class ModSmallCircle extends Mod {
-    scoreMultiplier = 1.06;
     acronym = "SC";
     name = "SmallCircle";
     droidRanked = false;
-    pcRanked = false;
     droidScoreMultiplier = 1.06;
-    pcScoreMultiplier = 1;
-    bitwise = Number.NaN;
     droidString = "m";
-    droidOnly = true;
 }
 
 /**
  * Represents the ReallyEasy mod.
  */
 class ModReallyEasy extends Mod {
-    scoreMultiplier = 0.4;
     acronym = "RE";
     name = "ReallyEasy";
     droidRanked = false;
-    pcRanked = false;
     droidScoreMultiplier = 0.4;
-    pcScoreMultiplier = 0.4;
-    bitwise = Number.NaN;
     droidString = "l";
-    droidOnly = true;
 }
 
 /**
  * Represents the Auto mod.
  */
 class ModAuto extends Mod {
-    scoreMultiplier = 0;
     acronym = "AT";
     name = "Autoplay";
     droidRanked = false;
@@ -2166,14 +2218,12 @@ class ModAuto extends Mod {
     pcScoreMultiplier = 1;
     bitwise = 1 << 11;
     droidString = "a";
-    droidOnly = false;
 }
 
 /**
  * Represents the Autopilot mod.
  */
 class ModAutopilot extends Mod {
-    scoreMultiplier = 0;
     acronym = "AP";
     name = "Autopilot";
     droidRanked = false;
@@ -2182,14 +2232,12 @@ class ModAutopilot extends Mod {
     pcScoreMultiplier = 0;
     bitwise = 1 << 13;
     droidString = "p";
-    droidOnly = false;
 }
 
 /**
  * Represents the Flashlight mod.
  */
 class ModFlashlight extends Mod {
-    scoreMultiplier = 1.12;
     acronym = "FL";
     name = "Flashlight";
     droidRanked = false;
@@ -2198,7 +2246,6 @@ class ModFlashlight extends Mod {
     pcScoreMultiplier = 1.12;
     bitwise = 1 << 10;
     droidString = "i";
-    droidOnly = false;
 }
 
 /**
@@ -2207,7 +2254,6 @@ class ModFlashlight extends Mod {
 class ModHidden extends Mod {
     static fadeInDurationMultiplier = 0.4;
     static fadeOutDurationMultiplier = 0.3;
-    scoreMultiplier = 1.06;
     acronym = "HD";
     name = "Hidden";
     bitwise = 1 << 3;
@@ -2216,14 +2262,12 @@ class ModHidden extends Mod {
     droidScoreMultiplier = 1.06;
     pcScoreMultiplier = 1.06;
     droidString = "h";
-    droidOnly = false;
 }
 
 /**
  * Represents the NoFail mod.
  */
 class ModNoFail extends Mod {
-    scoreMultiplier = 0.5;
     acronym = "NF";
     name = "NoFail";
     droidRanked = true;
@@ -2232,14 +2276,12 @@ class ModNoFail extends Mod {
     pcScoreMultiplier = 0.5;
     bitwise = 1 << 0;
     droidString = "n";
-    droidOnly = false;
 }
 
 /**
  * Represents the Perfect mod.
  */
 class ModPerfect extends Mod {
-    scoreMultiplier = 1;
     acronym = "PF";
     name = "Perfect";
     droidRanked = false;
@@ -2248,14 +2290,12 @@ class ModPerfect extends Mod {
     pcScoreMultiplier = 1;
     bitwise = 1 << 14;
     droidString = "f";
-    droidOnly = false;
 }
 
 /**
  * Represents the Relax mod.
  */
 class ModRelax extends Mod {
-    scoreMultiplier = 0;
     acronym = "RX";
     name = "Relax";
     droidRanked = false;
@@ -2264,14 +2304,12 @@ class ModRelax extends Mod {
     pcScoreMultiplier = 0;
     bitwise = 1 << 7;
     droidString = "x";
-    droidOnly = false;
 }
 
 /**
  * Represents the ScoreV2 mod.
  */
 class ModScoreV2 extends Mod {
-    scoreMultiplier = 1;
     acronym = "V2";
     name = "ScoreV2";
     droidRanked = false;
@@ -2280,30 +2318,23 @@ class ModScoreV2 extends Mod {
     pcScoreMultiplier = 1;
     bitwise = 1 << 29;
     droidString = "v";
-    droidOnly = false;
 }
 
 /**
  * Represents the SpunOut mod.
  */
 class ModSpunOut extends Mod {
-    scoreMultiplier = 0.9;
     acronym = "SO";
     name = "SpunOut";
-    droidRanked = false;
     pcRanked = true;
-    droidScoreMultiplier = 0.9;
     pcScoreMultiplier = 0.9;
     bitwise = 1 << 12;
-    droidString = "";
-    droidOnly = false;
 }
 
 /**
  * Represents the SuddenDeath mod.
  */
 class ModSuddenDeath extends Mod {
-    scoreMultiplier = 1;
     acronym = "SD";
     name = "Sudden Death";
     droidRanked = false;
@@ -2312,23 +2343,17 @@ class ModSuddenDeath extends Mod {
     pcScoreMultiplier = 1;
     bitwise = 1 << 5;
     droidString = "u";
-    droidOnly = false;
 }
 
 /**
  * Represents the TouchDevice mod.
  */
 class ModTouchDevice extends Mod {
-    scoreMultiplier = 1;
     acronym = "TD";
     name = "TouchDevice";
-    droidRanked = true;
     pcRanked = true;
-    droidScoreMultiplier = 1;
     pcScoreMultiplier = 1;
     bitwise = 1 << 2;
-    droidString = "";
-    droidOnly = false;
 }
 
 /**
@@ -2393,7 +2418,8 @@ class ModUtil {
      * @param options Options for parsing behavior.
      */
     static droidStringToMods(str, options) {
-        return this.processParsingOptions(this.allMods.filter((m) => m.droidString && str.toLowerCase().includes(m.droidString)), options);
+        return this.processParsingOptions(this.allMods.filter((m) => m.isApplicableToDroid() &&
+            str.toLowerCase().includes(m.droidString)), options);
     }
     /**
      * Gets a list of mods from a PC modbits.
@@ -2402,7 +2428,7 @@ class ModUtil {
      * @param options Options for parsing behavior.
      */
     static pcModbitsToMods(modbits, options) {
-        return this.processParsingOptions(this.allMods.filter((m) => m.bitwise & modbits), options);
+        return this.processParsingOptions(this.allMods.filter((m) => m.isApplicableToOsu() && m.bitwise & modbits), options);
     }
     /**
      * Gets a list of mods from a PC mod string, such as "HDHR".
@@ -2443,11 +2469,9 @@ class ModUtil {
      */
     static checkIncompatibleMods(mods) {
         for (const incompatibleMod of this.incompatibleMods) {
-            const fulfilledMods = mods.filter((m) => incompatibleMod.map((v) => v.acronym).includes(m.acronym));
+            const fulfilledMods = mods.filter((m) => incompatibleMod.some((v) => m.acronym === v.acronym));
             if (fulfilledMods.length > 1) {
-                mods = mods.filter((m) => !incompatibleMod
-                    .map((v) => v.acronym)
-                    .includes(m.acronym));
+                mods = mods.filter((m) => incompatibleMod.every((v) => m.acronym !== v.acronym));
                 // Keep the first selected mod
                 mods.push(fulfilledMods[0]);
             }
@@ -4332,7 +4356,12 @@ class RGBColor {
      * Returns a string representation of the color.
      */
     toString() {
-        return `${this.r},${this.g},${this.b}`;
+        if (this.a === 1) {
+            return `${this.r},${this.g},${this.b}`;
+        }
+        else {
+            return `${this.r},${this.g},${this.b},${this.a}`;
+        }
     }
     /**
      * Checks whether this color is equal to another color.
@@ -4340,7 +4369,10 @@ class RGBColor {
      * @param other The other color.
      */
     equals(other) {
-        return this.r === other.r && this.g === other.g && this.b === other.b;
+        return (this.r === other.r &&
+            this.g === other.g &&
+            this.b === other.b &&
+            this.a === other.a);
     }
 }
 
@@ -4694,21 +4726,11 @@ class CommandTimelineGroup {
         this.flipHorizontal,
         this.flipVertical,
     ];
-    /**
-     * The earliest visible time. Will be `null` unless this group's first alpha command has a start value of zero.
-     */
-    get earliestDisplayedTime() {
-        const first = this.alpha.commands.at(0);
-        return first?.startValue === 0 ? first.startTime : null;
-    }
     /**
      * The start time of commands.
      */
     get commandsStartTime() {
-        // If the first alpha command starts at zero it should be given priority over anything else.
-        // This is due to it creating a state where the target is not present before that time, causing any other events to not be visible.
-        return (this.earliestDisplayedTime ??
-            Math.min(...this.timelines.map((t) => t.startTime)));
+        return Math.min(...this.timelines.map((t) => t.startTime));
     }
     /**
      * The end time of commands.
@@ -4749,7 +4771,7 @@ class CommandTimelineGroup {
     /**
      * Gets the commands from a command timeline.
      *
-     * @param timelineSelector A function that returns a command timeline.
+     * @param timelineSelector A function to select the command timeline to retrieve commands from.
      * @param offset The offset to apply to all commands.
      */
     getCommands(timelineSelector, offset = 0) {
@@ -4861,20 +4883,14 @@ class StoryboardElement {
  * Represents a storyboard sprite.
  */
 class StoryboardSprite extends StoryboardElement {
-    _loops = [];
-    _triggers = [];
     /**
      * The loop commands of the sprite.
      */
-    get loops() {
-        return this._loops;
-    }
+    loops = [];
     /**
      * The trigger commands of the sprite.
      */
-    get triggers() {
-        return this._triggers;
-    }
+    triggers = [];
     /**
      * The origin of the sprite.
      */
@@ -4888,28 +4904,51 @@ class StoryboardSprite extends StoryboardElement {
      */
     timelineGroup = new CommandTimelineGroup();
     get startTime() {
-        // Check for presence affecting commands as an initial pass.
-        let earliestStartTime = this.timelineGroup.earliestDisplayedTime ??
-            Number.POSITIVE_INFINITY;
-        for (const l of this._loops) {
-            const { earliestDisplayedTime: loopEarliestDisplayTime } = l;
-            if (loopEarliestDisplayTime !== null) {
-                earliestStartTime = Math.min(earliestStartTime, l.loopStartTime + loopEarliestDisplayTime);
+        // To get the initial start time, we need to check whether the first alpha command to exist (across all loops) has a start value of zero.
+        // A start value of zero governs, above all else, the first valid display time of a sprite.
+        //
+        // You can imagine that the first command of each type decides that type's start value, so if the initial alpha is zero,
+        // anything before that point can be ignored (the sprite is not visible after all).
+        const alphaCommands = [];
+        let command = this.timelineGroup.alpha.commands[0];
+        if (command) {
+            alphaCommands.push({
+                startTime: command.startTime,
+                isZeroStartValue: command.startTime === 0,
+            });
+        }
+        for (const l of this.loops) {
+            command = l.alpha.commands[0];
+            if (command) {
+                alphaCommands.push({
+                    startTime: command.startTime + l.loopStartTime,
+                    isZeroStartValue: command.startTime === 0,
+                });
+            }
+        }
+        if (alphaCommands.length > 0) {
+            const firstAlpha = alphaCommands.sort((a, b) => a.startTime - b.startTime)[0];
+            if (firstAlpha.isZeroStartValue) {
+                return firstAlpha.startTime;
             }
         }
-        return earliestStartTime !== Number.POSITIVE_INFINITY
-            ? earliestStartTime
-            : Math.min(this.timelineGroup.startTime, ...this._loops.map((l) => l.startTime));
+        // If we got to this point, either no alpha commands were present, or the earliest had a non-zero start value.
+        // The sprite's start time will be determined by the earliest command, regardless of type.
+        let earliestStartTime = this.timelineGroup.startTime;
+        for (const l of this.loops) {
+            earliestStartTime = Math.min(earliestStartTime, l.startTime);
+        }
+        return earliestStartTime;
     }
     get endTime() {
-        return Math.max(this.timelineGroup.endTime, ...this._loops.map((l) => l.endTime));
+        return Math.max(this.timelineGroup.endTime, ...this.loops.map((l) => l.endTime));
     }
     /**
      * Whether this sprite has at least one command.
      */
     get hasCommands() {
         return (this.timelineGroup.hasCommands ||
-            this._loops.some((l) => l.hasCommands));
+            this.loops.some((l) => l.hasCommands));
     }
     constructor(path, origin, initialPosition) {
         super(path);
@@ -4925,7 +4964,7 @@ class StoryboardSprite extends StoryboardElement {
      */
     addLoop(startTime, repeatCount) {
         const loop = new CommandLoop(startTime, repeatCount);
-        this._loops.push(loop);
+        this.loops.push(loop);
         return loop;
     }
     /**
@@ -4939,7 +4978,7 @@ class StoryboardSprite extends StoryboardElement {
      */
     addTrigger(triggerName, startTime, endTime, groupNumber) {
         const trigger = new CommandTrigger(triggerName, startTime, endTime, groupNumber);
-        this._triggers.push(trigger);
+        this.triggers.push(trigger);
         return trigger;
     }
     toString() {
@@ -5379,16 +5418,23 @@ class BeatmapDecoder extends Decoder {
         else {
             hitObjectsDecoder.applyStackingOld();
         }
-        const circleSize = new MapStats({
+        const droidCircleSize = new MapStats({
+            cs: this.finalResult.difficulty.cs,
+            mods,
+        }).calculate({ mode: exports.modes.droid }).cs;
+        const droidScale = (1 - (0.7 * (droidCircleSize - 5)) / 5) / 2;
+        const osuCircleSize = new MapStats({
             cs: this.finalResult.difficulty.cs,
             mods,
-        }).calculate().cs;
-        const scale = (1 - (0.7 * (circleSize - 5)) / 5) / 2;
+        }).calculate({ mode: exports.modes.osu }).cs;
+        const osuScale = (1 - (0.7 * (osuCircleSize - 5)) / 5) / 2;
         this.finalResult.hitObjects.objects.forEach((h) => {
-            h.scale = scale;
+            h.droidScale = droidScale;
+            h.osuScale = osuScale;
             if (h instanceof Slider) {
                 h.nestedHitObjects.forEach((n) => {
-                    n.scale = scale;
+                    n.droidScale = droidScale;
+                    n.osuScale = osuScale;
                 });
             }
         });