Merge pull request #181 from KotRikD/fix/bpm-mods-multiplier

Multiply bpm by selected mods
tosuapp · Sep 4, 2024 · 3fe5a19 · 3fe5a19
2 parents 29caa72 + 38a2ee3
commit 3fe5a19
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/tosu/src/entities/BeatmapPpData/index.ts b/packages/tosu/src/entities/BeatmapPpData/index.ts
@@ -9,6 +9,7 @@ import { BeatmapStrains } from '@/api/types/v1';
 import { AbstractEntity } from '@/entities/AbstractEntity';
 import { OsuInstance } from '@/objects/instanceManager/osuInstance';
 import { fixDecimals } from '@/utils/converters';
+import { OsuMods } from '@/utils/osuMods.types';
 
 interface BeatmapPPAcc {
     '100': number;
@@ -634,15 +635,24 @@ export class BeatmapPPData extends AbstractEntity {
         }
     }
 
-    updateRealTimeBPM(timeMS: number) {
+    updateRealTimeBPM(timeMS: number, mods: number) {
         if (!this.lazerBeatmap) return;
 
-        this.realtimeBPM =
+        const multiply =
+            (mods & OsuMods.DoubleTime) === OsuMods.DoubleTime ||
+            (mods & OsuMods.Nightcore) === OsuMods.Nightcore
+                ? 1.5
+                : (mods & OsuMods.HalfTime) === OsuMods.HalfTime
+                  ? 0.75
+                  : 1;
+        const bpm =
             this.lazerBeatmap.controlPoints.timingPoints
                 // @ts-ignore
                 .toReversed()
                 .find((r) => r.startTime <= timeMS && r.bpm !== 0)?.bpm ||
             this.lazerBeatmap.controlPoints.timingPoints[0]?.bpm ||
             0.0;
+
+        this.realtimeBPM = Math.round(bpm * multiply);
     }
 }
diff --git a/packages/tosu/src/objects/instanceManager/osuInstance.ts b/packages/tosu/src/objects/instanceManager/osuInstance.ts
@@ -318,7 +318,10 @@ export class OsuInstance {
                     this.previousMP3Length = menuData.MP3Length;
                 }
 
-                beatmapPpData.updateRealTimeBPM(allTimesData.PlayTime);
+                beatmapPpData.updateRealTimeBPM(
+                    allTimesData.PlayTime,
+                    currentMods
+                );
 
                 switch (allTimesData.Status) {
                     case 0: