@rian8337/osu-droid-replay-analyzer 4.0.0-beta.96 → 4.0.0-beta.97

package/dist/index.js

@@ -1327,7 +1327,7 @@ class TwoHandChecker {
         // this.csvString = `Mods,${
         //     data.convertedMods.reduce((a, m) => a + m.acronym, "") || "NM"
         // }\nCombo,${data.maxCombo}\nAccuracy,"${(
-        //     data.accuracy.value() * 100
+        //     data.accuracy.value * 100
         // ).toFixed(2)}% [${data.accuracy.n300}/${data.accuracy.n100}/${
         //     data.accuracy.n50
         // }/${
@@ -2195,15 +2195,22 @@ class ReplayData {
  */
 class ReplayV3Data extends ReplayData {
     /**
-     * The total score achieved in the play, after applying score multiplier from mods.
+     * Obtains the total score achieved in the play, after applying score multiplier from mods.
+     *
+     * @param difficulty The `BeatmapDifficulty` of the beatmap that was played. Required to correctly compute
+     * the score multiplier of difficulty-dependent mods. If not provided, those mods fall back to their
+     * difficulty-independent multiplier.
      */
-    get totalScore() {
-        var _a;
+    getTotalScore(difficulty = null) {
+        let baseScore = this.score;
         if (this.replayVersion < 8) {
-            return this.score;
+            // Replay versions 3 to 7 store the score after applying score multiplier
+            // from mods, so we need to reverse it to get the base score.
+            const legacyScoreMultiplier = new osuBase.DroidLegacyScoreMultiplierCalculator(difficulty).calculateFor(this.convertedMods.values());
+            baseScore = Math.round(this.score / legacyScoreMultiplier);
         }
-        (_a = this.scoreMultiplier) !== null && _a !== void 0 ? _a : (this.scoreMultiplier = osuBase.ModUtil.calculateScoreMultiplier(this.convertedMods.values(), osuBase.Modes.Droid));
-        return Math.round(Math.fround(this.score * this.scoreMultiplier));
+        const scoreMultiplier = new osuBase.DroidScoreMultiplierCalculator(difficulty).calculateFor(this.convertedMods.values());
+        return Math.round(baseScore * scoreMultiplier);
     }
     constructor(values) {
         super(values);
@@ -2646,9 +2653,16 @@ class ReplayAnalyzer {
             resultObject.accuracy.n100 = buf.readInt32BE(20);
             resultObject.accuracy.n50 = buf.readInt32BE(24);
             resultObject.accuracy.nmiss = buf.readInt32BE(28);
-            resultObject.score = buf.readInt32BE(32);
-            resultObject.maxCombo = buf.readInt32BE(36);
-            resultObject.isFullCombo = resultObject.accuracy.value() === 1;
+            if (resultObject.replayVersion >= 9) {
+                // From replay version 9 onwards, the score is stored as a long (8 bytes) instead of an int (4 bytes).
+                resultObject.score = Number(buf.readBigInt64BE(32));
+                resultObject.maxCombo = buf.readInt32BE(40);
+            }
+            else {
+                resultObject.score = buf.readInt32BE(32);
+                resultObject.maxCombo = buf.readInt32BE(36);
+            }
+            resultObject.isFullCombo = resultObject.accuracy.value === 1;
             resultObject.playerName = rawObject[5];
             if (resultObject.replayVersion >= 7) {
                 resultObject.convertedMods = osuBase.ModUtil.deserializeMods(JSON.parse(rawObject[6]));
@@ -2674,6 +2688,7 @@ class ReplayAnalyzer {
             case 3:
             case 7:
             case 8:
+            case 9:
                 bufferIndex = 7;
                 break;
             case 4:
@@ -2867,7 +2882,7 @@ class ReplayAnalyzer {
             resultObject.convertedMods.has(osuBase.ModFlashlight);
         const hit300Ratio = resultObject.accuracy.n300 / totalHits;
         switch (true) {
-            case resultObject.accuracy.value() === 1:
+            case resultObject.accuracy.value === 1:
                 return isHidden ? "XH" : "X";
             case hit300Ratio > 0.9 &&
                 resultObject.accuracy.n50 / totalHits < 0.01 &&

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rian8337/osu-droid-replay-analyzer",
-    "version": "4.0.0-beta.96",
+    "version": "4.0.0-beta.97",
     "description": "A replay analyzer for analyzing osu!droid replay files.",
     "keywords": [
         "osu",
@@ -34,9 +34,9 @@
         "url": "https://github.com/Rian8337/osu-droid-module/issues"
     },
     "dependencies": {
-        "@rian8337/osu-base": "4.0.0-beta.96",
-        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.96",
-        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.96",
+        "@rian8337/osu-base": "4.0.0-beta.97",
+        "@rian8337/osu-difficulty-calculator": "4.0.0-beta.97",
+        "@rian8337/osu-rebalance-difficulty-calculator": "4.0.0-beta.97",
         "java-deserialization": "^0.1.0",
         "unzipper": "^0.10.11"
     },
@@ -46,5 +46,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "13af8d35ad74141c270c6b985941b5f2a14e248b"
+    "gitHead": "0d77ee41c1b0eca8e46c118e942417483c4a9452"
 }

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-import { Vector2, HitResult, Accuracy, ScoreRank, ModMap, DroidPlayableBeatmap, Beatmap, HitWindow } from '@rian8337/osu-base';
+import { Vector2, HitResult, Accuracy, ScoreRank, ModMap, BeatmapDifficulty, DroidPlayableBeatmap, Beatmap, HitWindow } from '@rian8337/osu-base';
 import { IExtendedDroidDifficultyAttributes } from '@rian8337/osu-rebalance-difficulty-calculator';
 import { IExtendedDroidDifficultyAttributes as IExtendedDroidDifficultyAttributes$1 } from '@rian8337/osu-difficulty-calculator';
 
@@ -340,7 +340,7 @@ declare class ReplayV3Data extends ReplayData {
      * Between replay version 3 and 7, this is the final score after applying score multiplier from mods.
      * From replay version 8 onwards, this is the score before applying score multiplier from mods.
      *
-     * The {@link totalScore} getter can be used to get the total score across all replay versions.
+     * The {@link getTotalScore} method can be used to get the total score across all replay versions.
      */
     readonly score: number;
     /**
@@ -360,10 +360,13 @@ declare class ReplayV3Data extends ReplayData {
      */
     readonly convertedMods: ModMap;
     /**
-     * The total score achieved in the play, after applying score multiplier from mods.
+     * Obtains the total score achieved in the play, after applying score multiplier from mods.
+     *
+     * @param difficulty The `BeatmapDifficulty` of the beatmap that was played. Required to correctly compute
+     * the score multiplier of difficulty-dependent mods. If not provided, those mods fall back to their
+     * difficulty-independent multiplier.
      */
-    get totalScore(): number;
-    private scoreMultiplier?;
+    getTotalScore(difficulty?: BeatmapDifficulty | null): number;
     constructor(values: ReplayInformation);
 }