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

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());
@@ -390,7 +392,7 @@ exports.objectTypes = void 0;
 })(exports.objectTypes || (exports.objectTypes = {}));
 
 /**
- * Based on `Vector2` class in C#.
+ * Represents a two-dimensional vector.
  */
 class Vector2 {
     /**
@@ -1305,11 +1307,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 +1333,7 @@ class DifficultyControlPointManager extends ControlPointManager {
     defaultControlPoint = new DifficultyControlPoint({
         time: 0,
         speedMultiplier: 1,
+        generateTicks: true,
     });
     controlPointAt(time) {
         return this.binarySearchWithFallback(time);
@@ -1725,7 +1727,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 +1777,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;
@@ -2018,18 +2030,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 +2060,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 +2074,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 +2088,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 +2102,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 +2116,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 +2163,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 +2177,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 +2191,6 @@ class ModFlashlight extends Mod {
     pcScoreMultiplier = 1.12;
     bitwise = 1 << 10;
     droidString = "i";
-    droidOnly = false;
 }
 
 /**
@@ -2207,7 +2199,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 +2207,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 +2221,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 +2235,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 +2249,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 +2263,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 +2288,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 +2363,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 +2373,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".