joe

.gitea/workflows/deploy.yml

@@ -17,5 +17,5 @@ jobs:
       - name: Push to dokku
         uses: dokku/github-action@master
         with:
-          git_remote_url: "ssh://dokku@10.0.3.39:22/scoresaber-reloadedv2"
+          git_remote_url: "ssh://dokku@10.0.50.65:22/scoresaber-reloadedv2"
           ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}

pnpm-lock.yaml

@@ -141,10 +141,10 @@ devDependencies:
     version: 8.4.33
   prettier:
     specifier: ^3.2.4
-    version: 3.2.5
+    version: 3.2.4
   prettier-plugin-tailwindcss:
     specifier: ^0.5.11
-    version: 0.5.11(prettier@3.2.5)
+    version: 0.5.11(prettier@3.2.4)
   tailwindcss:
     specifier: ^3.4.1
     version: 3.4.1
@@ -3548,7 +3548,7 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /prettier-plugin-tailwindcss@0.5.11(prettier@3.2.5):
+  /prettier-plugin-tailwindcss@0.5.11(prettier@3.2.4):
     resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==}
     engines: {node: '>=14.21.3'}
     peerDependencies:
@@ -3597,11 +3597,11 @@ packages:
       prettier-plugin-twig-melody:
         optional: true
     dependencies:
-      prettier: 3.2.5
+      prettier: 3.2.4
     dev: true
 
-  /prettier@3.2.5:
-    resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+  /prettier@3.2.4:
+    resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==}
     engines: {node: '>=14'}
     hasBin: true
     dev: true

src/utils/scoresaber/scores.ts

@@ -7,7 +7,7 @@ import { useScoresaberScoresStore } from "@/store/scoresaberScoresStore";
 export const WEIGHT_COEFFICIENT = 0.965;
 
 const starMultiplier = 42.11;
-const ppCurve = [
+const ppCurve: [number, number][] = [
   [1, 5.367394282890631],
   [0.9995, 5.019543595874787],
   [0.999, 4.715470646416203],
@@ -63,29 +63,53 @@ function lerp(v0: number, v1: number, t: number) {
   return v0 + t * (v1 - v0);
 }
 
-function calculatePPModifier(c1: Array<any>, c2: Array<any>, acc: number) {
-  const distance = (c2[0] - acc) / (c2[0] - c1[0]);
-  return lerp(c2[1], c1[1], distance);
+function calculatePPModifier(
+  c1: [number, number],
+  c2: [number, number],
+  acc: number,
+): number {
+  const distance: number = (c2[0] - acc) / (c2[0] - c1[0]);
+  const interpolated: number = lerp(c2[1], c1[1], distance);
+  console.log(
+    `Acc: ${acc}, c1: ${c1}, c2: ${c2}, Distance: ${distance}, Interpolated: ${interpolated}`,
+  );
+  return interpolated;
 }
 
-function findPPModifier(acc: number, curve: Array<any>) {
+function findPPModifier(
+  acc: number,
+  curve: [number, number][],
+): number | undefined {
   acc = clamp(acc, 0, 100) / 100;
+  console.log("Clamped Accuracy:", acc);
 
-  let prev = curve[1];
+  let prev: [number, number] = curve[1];
   for (const item of curve) {
+    console.log("Curve Point:", item[0], item[1]);
     if (item[0] <= acc) {
       return calculatePPModifier(item, prev, acc);
     }
     prev = item;
   }
+  return undefined;
 }
 
-export function getScoreSaberPP(acc: number, stars: number) {
-  const ppValue = stars * starMultiplier;
-  const modifier = findPPModifier(acc * 100, ppCurve);
-  if (!modifier) return undefined;
+export function getScoreSaberPP(
+  acc: number,
+  stars: number,
+): { pp: number | undefined } {
+  console.log("Input Stars:", stars);
+  console.log("Input Accuracy:", acc);
+
+  const ppValue: number = stars * starMultiplier;
+  const modifier: number | undefined = findPPModifier(acc * 100, ppCurve);
+  console.log("Modifier:", modifier);
+
+  if (!modifier) return { pp: undefined };
+
+  const finalPP: number = modifier * ppValue;
+  console.log("Final PP:", finalPP);
 
-  const finalPP = modifier * ppValue;
   return {
     pp: Number.isNaN(finalPP) ? undefined : finalPP,
   };