fix: Update rosu-pp to version 2.0.0

README.md

@@ -118,7 +118,8 @@ api
   - `n100` - Amount of 100
   - `n50` - Amount of 50
   - `sliderEndHits` - Amount of slider ends hits (lazer only)
-  - `sliderTickHits` - Amount of slider ticks hits (lazer only)
+  - `smallTickHits` - Amount of slider small ticks hits (lazer only)
+  - `largeTickHits` - Amount of slider large ticks hits (lazer only)
   - `nMisses` - Amount of Misses
   - `combo` - combo
   - `passedObjects` - Sum of nGeki, nKatu, n300, n100, n50, nMisses

packages/server/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@tosu/common": "workspace:*",
     "@tosu/updater": "workspace:*",
-    "@kotrikd/rosu-pp": "2.0.0-alpha.10",
+    "@kotrikd/rosu-pp": "2.0.0",
     "semver": "^7.5.4",
     "ws": "^8.16.0"
   },

packages/server/router/index.ts

@@ -451,14 +451,10 @@ export default function buildBaseApi(server: Server) {
             if (query.acc !== undefined) params.accuracy = +query.acc;
             if (query.sliderEndHits !== undefined)
                 params.sliderEndHits = +query.sliderEndHits;
-            if (query.sliderTickHits !== undefined)
-                params.sliderTickHits = +query.sliderTickHits;
-
-            if (
-                params.sliderEndHits === undefined &&
-                params.sliderTickHits === undefined
-            )
-                params.lazer = false;
+            if (query.smallTickHits !== undefined)
+                params.smallTickHits = +query.smallTickHits;
+            if (query.largeTickHits !== undefined)
+                params.largeTickHits = +query.largeTickHits;
 
             const calculate = new rosu.Performance(params).calculate(beatmap);
             sendJson(res, calculate);

packages/tosu/package.json

@@ -24,7 +24,7 @@
         "osu-standard-stable": "^5.0.0",
         "osu-taiko-stable": "^5.0.0",
         "resedit": "^2.0.0",
-        "@kotrikd/rosu-pp": "2.0.0-alpha.10",
+        "@kotrikd/rosu-pp": "2.0.0",
         "semver": "^7.5.4",
         "tsprocess": "workspace:*"
     },

packages/tosu/src/api/types/v2.ts

@@ -221,7 +221,8 @@ export interface Hits {
     katu: number;
     sliderBreaks: number;
     sliderEndHits: number;
-    sliderTickHits: number;
+    smallTickHits: number;
+    largeTickHits: number;
 }
 
 export interface Combo {
@@ -364,7 +365,8 @@ export interface Hits3 {
     geki: number;
     katu: number;
     sliderEndHits: number;
-    sliderTickHits: number;
+    smallTickHits: number;
+    largeTickHits: number;
 }
 
 export interface Folders {

packages/tosu/src/api/utils/buildResultV2.ts

@@ -125,7 +125,8 @@ export const buildResult = (instanceManager: InstanceManager): ApiAnswer => {
         50: resultScreen.hit50,
         0: resultScreen.hitMiss,
         sliderEndHits: resultScreen.sliderEndHits,
-        sliderTickHits: resultScreen.sliderTickHits
+        smallTickHits: resultScreen.smallTickHits,
+        largeTickHits: resultScreen.largeTickHits
     };
 
     return {
@@ -570,7 +571,8 @@ function buildPlay(
             0: gameplay.hitMiss,
             sliderBreaks: gameplay.hitSB,
             sliderEndHits: gameplay.sliderEndHits,
-            sliderTickHits: gameplay.sliderTickHits
+            smallTickHits: gameplay.smallTickHits,
+            largeTickHits: gameplay.largeTickHits
         },
 
         hitErrorArray: gameplay.hitErrors,

packages/tosu/src/memory/lazer.ts

@@ -803,8 +803,9 @@ export class LazerMemory extends AbstractMemory<LazerPatternData> {
             hit100: statistics.ok,
             hit50: statistics.meh,
             hitMiss: statistics.miss,
-            sliderEndHits: statistics.sliderTailHit || statistics.smallTickHit,
-            sliderTickHits: statistics.largeTickHit,
+            sliderEndHits: statistics.sliderTailHit,
+            smallTickHits: statistics.largeTickHit,
+            largeTickHits: statistics.smallTickHit,
             combo,
             maxCombo: this.process.readInt(scoreInfo + 0xc4),
             pp
@@ -925,7 +926,8 @@ export class LazerMemory extends AbstractMemory<LazerPatternData> {
             hitKatu: score.hitKatu,
             hitMiss: score.hitMiss,
             sliderEndHits: score.sliderEndHits,
-            sliderTickHits: score.sliderTickHits,
+            smallTickHits: score.smallTickHits,
+            largeTickHits: score.largeTickHits,
             date
         };
     }

packages/tosu/src/memory/stable.ts

@@ -430,7 +430,8 @@ export class StableMemory extends AbstractMemory<OsuPatternData> {
                 hitKatu,
                 hitMiss,
                 sliderEndHits: 0,
-                sliderTickHits: 0,
+                smallTickHits: 0,
+                largeTickHits: 0,
                 date
             };
         } catch (error) {
@@ -549,7 +550,8 @@ export class StableMemory extends AbstractMemory<OsuPatternData> {
                 hitKatu,
                 hitMiss,
                 sliderEndHits: 0,
-                sliderTickHits: 0,
+                smallTickHits: 0,
+                largeTickHits: 0,
                 combo,
                 maxCombo
             };

packages/tosu/src/memory/types.ts

@@ -63,7 +63,8 @@ export type IResultScreen =
           hitKatu: number;
           hitMiss: number;
           sliderEndHits: number;
-          sliderTickHits: number;
+          smallTickHits: number;
+          largeTickHits: number;
           date: string;
       }
     | string
@@ -85,7 +86,8 @@ export type IScore = {
     hitKatu: number;
     hitMiss: number;
     sliderEndHits: number;
-    sliderTickHits: number;
+    smallTickHits: number;
+    largeTickHits: number;
     combo: number;
     maxCombo: number;
     pp?: number;

packages/tosu/src/states/beatmap.ts

@@ -500,7 +500,7 @@ export class BeatmapPP extends AbstractState {
                 rhythm: fcPerformance.difficulty.rhythm,
                 color: fcPerformance.difficulty.color,
                 peak: fcPerformance.difficulty.peak,
-                hitWindow: fcPerformance.difficulty.hitWindow
+                hitWindow: fcPerformance.difficulty.greatHitWindow
             };
 
             attributes.free();

packages/tosu/src/states/gameplay.ts

@@ -44,7 +44,8 @@ export class Gameplay extends AbstractState {
     hitKatu: number;
     hitMiss: number;
     sliderEndHits: number;
-    sliderTickHits: number;
+    smallTickHits: number;
+    largeTickHits: number;
     hitMissPrev: number;
     hitUR: number;
     hitSB: number;
@@ -87,7 +88,8 @@ export class Gameplay extends AbstractState {
         this.hitKatu = 0;
         this.hitMiss = 0;
         this.sliderEndHits = 0;
-        this.sliderTickHits = 0;
+        this.smallTickHits = 0;
+        this.largeTickHits = 0;
         this.hitMissPrev = 0;
         this.hitUR = 0.0;
         this.hitSB = 0;
@@ -203,7 +205,8 @@ export class Gameplay extends AbstractState {
             this.hitKatu = result.hitKatu;
             this.hitMiss = result.hitMiss;
             this.sliderEndHits = result.sliderEndHits;
-            this.sliderTickHits = result.sliderTickHits;
+            this.smallTickHits = result.smallTickHits;
+            this.largeTickHits = result.largeTickHits;
 
             this.combo = result.combo;
             this.maxCombo = result.maxCombo;
@@ -487,7 +490,8 @@ export class Gameplay extends AbstractState {
                 nKatu: this.hitKatu,
                 nGeki: this.hitGeki,
                 sliderEndHits: this.sliderEndHits,
-                sliderTickHits: this.sliderTickHits
+                osuSmallTickHits: this.smallTickHits,
+                osuLargeTickHits: this.largeTickHits
             };
 
             const currPerformance = this.gradualPerformance.nth(

packages/tosu/src/states/resultScreen.ts

@@ -21,7 +21,8 @@ export class ResultScreen extends AbstractState {
     hitKatu: number;
     hitMiss: number;
     sliderEndHits: number;
-    sliderTickHits: number;
+    smallTickHits: number;
+    largeTickHits: number;
     grade: string;
     date: string;
     accuracy: number;
@@ -52,7 +53,8 @@ export class ResultScreen extends AbstractState {
         this.hitKatu = 0;
         this.hitMiss = 0;
         this.sliderEndHits = 0;
-        this.sliderTickHits = 0;
+        this.smallTickHits = 0;
+        this.largeTickHits = 0;
         this.grade = '';
         this.date = '';
         this.accuracy = 0;
@@ -84,7 +86,8 @@ export class ResultScreen extends AbstractState {
             this.hitKatu = result.hitKatu;
             this.hitMiss = result.hitMiss;
             this.sliderEndHits = result.sliderEndHits;
-            this.sliderTickHits = result.sliderTickHits;
+            this.smallTickHits = result.smallTickHits;
+            this.largeTickHits = result.largeTickHits;
             this.date = result.date;
 
             const hits = {
@@ -146,7 +149,8 @@ export class ResultScreen extends AbstractState {
                 nKatu: this.hitKatu,
                 nGeki: this.hitGeki,
                 sliderEndHits: this.sliderEndHits,
-                sliderTickHits: this.sliderTickHits,
+                smallTickHits: this.smallTickHits,
+                largeTickHits: this.largeTickHits,
                 lazer: this.game.client === ClientType.lazer
             };