changed show score pp to show both leaderboards

src/components/ScoreStats.js

@@ -1,3 +1,4 @@
+import Image from "next/image";
 import { getFormattedScorePercent } from "../helpers/map/mapHelpers";
 import { useSettingsStore } from "../store/overlaySettingsStore";
 import { useSongDataStore } from "../store/songDataStore";
@@ -25,6 +26,9 @@ export default function ScoreStats() {
 		return null;
 	}
 
+	const scoreSaberPP = currentPP?.scoreSaber;
+	const beatLeaderPP = currentPP?.beatLeader;
+
 	return (
 		<div className={styles.scoreStats}>
 			<p
@@ -43,8 +47,47 @@ export default function ScoreStats() {
 					<p>
 						{getFormattedScorePercent(percentage)} {percentage.toFixed(2)}%
 					</p>
-					{currentPP !== undefined && showPp ? (
+					{scoreSaberPP !== undefined && showPp ? (
-						<p>{currentPP.toFixed(0)}pp</p>
+						<div
+							style={{
+								display: "flex",
+								flexDirection: "row",
+							}}
+						>
+							<Image
+								width={30}
+								height={30}
+								src="https://cdn.fascinated.cc/Hc1eD7QY.png"
+							></Image>
+							<p
+								style={{
+									marginLeft: "5px",
+								}}
+							>
+								{scoreSaberPP.toFixed(0)}pp
+							</p>
+						</div>
+					) : null}
+					{beatLeaderPP !== undefined && showPp ? (
+						<div
+							style={{
+								display: "flex",
+								flexDirection: "row",
+							}}
+						>
+							<Image
+								width={30}
+								height={30}
+								src="https://cdn.fascinated.cc/Wo9JRAfD.png"
+							></Image>
+							<p
+								style={{
+									marginLeft: "8px",
+								}}
+							>
+								{beatLeaderPP.toFixed(0)}pp
+							</p>
+						</div>
 					) : null}
 				</div>
 			</div>

src/store/songDataStore.ts

@@ -2,7 +2,6 @@ import env from "@beam-australia/react-env";
 import axios from "axios";
 import { create } from "zustand";
 import Utils from "../utils/utils";
-import { useSettingsStore } from "./overlaySettingsStore";
 
 interface SongDataState {
 	isLoading: boolean;
@@ -14,9 +13,15 @@ interface SongDataState {
 	songDifficulty: string;
 	songModifiers: Object;
 	mapLeaderboardData: {
-		stars: Number;
+		scoresaber: {
+			stars: Number | undefined;
 			modifiers: Object;
 		};
+		beatleader: {
+			stars: Number | undefined;
+			modifiers: Object;
+		};
+	};
 	mapArt: string;
 	bsr: string;
 
@@ -26,7 +31,10 @@ interface SongDataState {
 	currentScore: number;
 	percentage: number;
 	combo: number;
-	currentPP: number | undefined;
+	currentPP: {
+		scoreSaber: number | undefined;
+		beatLeader: number | undefined;
+	};
 	saberA: {
 		cutDistanceScore: number;
 		averagePreSwing: number;
@@ -67,9 +75,15 @@ export const useSongDataStore = create<SongDataState>()((set) => ({
 	songDifficulty: "",
 	songModifiers: {},
 	mapLeaderboardData: {
+		scoresaber: {
 			stars: 0,
 			modifiers: {},
 		},
+		beatleader: {
+			stars: 0,
+			modifiers: {},
+		},
+	},
 	mapArt: "",
 	bsr: "",
 
@@ -79,7 +93,10 @@ export const useSongDataStore = create<SongDataState>()((set) => ({
 	currentScore: 0,
 	percentage: 100,
 	combo: 0,
-	currentPP: undefined,
+	currentPP: {
+		beatLeader: undefined,
+		scoreSaber: undefined,
+	},
 	saberA: {
 		cutDistanceScore: 0.0,
 		averagePreSwing: 0.0,
@@ -100,26 +117,35 @@ export const useSongDataStore = create<SongDataState>()((set) => ({
 		songLength: number
 	) => {
 		let hasError = false;
-		const leaderboardType = useSettingsStore.getState().leaderboardType;
+		//const leaderboardType = useSettingsStore.getState().leaderboardType;
-
+		const beatLeaderLeaderboardData = await Utils.getWebsiteApi(
-		const mapLeaderboardData = await Utils.getWebsiteApi(
+			"BeatLeader"
-			leaderboardType
 		).getMapLeaderboardData(mapHash, mapDiff, characteristic);
 
-		const response = await axios.get(
+		const scoreSaberLeaderboardData = await Utils.getWebsiteApi(
+			"ScoreSaber"
+		).getMapLeaderboardData(mapHash, mapDiff, characteristic);
+
+		const mapDataresponse = await axios.get(
 			`${env("SITE_URL")}/api/beatsaver/map?hash=${mapHash}`
 		);
-		if (response.status !== 200) {
+		if (mapDataresponse.status !== 200) {
 			return set({ isLoading: false, hasError: hasError });
 		}
-		const { bsr, mapArt } = response.data.data;
+		const { bsr, mapArt } = mapDataresponse.data.data;
 
 		set({
 			isLoading: false,
 			hasError: hasError,
 			mapLeaderboardData: {
-				stars: mapLeaderboardData.stars,
+				beatleader: {
-				modifiers: mapLeaderboardData.modifiers,
+					stars: beatLeaderLeaderboardData.stars,
+					modifiers: beatLeaderLeaderboardData.modifiers,
+				},
+				scoresaber: {
+					stars: scoreSaberLeaderboardData.stars,
+					modifiers: scoreSaberLeaderboardData.modifiers,
+				},
 			},
 			bsr: bsr,
 			mapArt: mapArt,
@@ -159,14 +185,32 @@ export const useSongDataStore = create<SongDataState>()((set) => ({
 	},
 
 	setPp: (percent: number) => {
-		const leaderboardType = useSettingsStore.getState().leaderboardType;
+		const scoreSaberMapStarCount =
-		const mapStarCount = useSongDataStore.getState().mapLeaderboardData.stars;
+			useSongDataStore.getState().mapLeaderboardData.scoresaber.stars;
+		let scoreSaberPP = Utils.calculatePP(
+			scoreSaberMapStarCount,
+			percent,
+			"ScoreSaber"
+		);
 
-		let pp = Utils.calculatePP(mapStarCount, percent, leaderboardType);
+		const beatLeaderMapStarCount =
-		if (pp === undefined) {
+			useSongDataStore.getState().mapLeaderboardData.beatleader.stars;
-			return;
+		let beatLeaderPP = Utils.calculatePP(
-		}
+			beatLeaderMapStarCount,
-		set({ currentPP: pp });
+			percent,
+			"BeatLeader"
+		);
+
+		const lastSSPP = useSongDataStore.getState().currentPP?.scoreSaber;
+		const lastBLPP = useSongDataStore.getState().currentPP?.beatLeader;
+
+		// undefined is returned if the curve ate shit (BL one does that if the current % is too high).
+		set({
+			currentPP: {
+				beatLeader: beatLeaderPP == undefined ? lastBLPP : beatLeaderPP,
+				scoreSaber: scoreSaberPP == undefined ? lastSSPP : scoreSaberPP,
+			},
+		});
 	},
 
 	setInSong: (isInSong: boolean) => {
@@ -186,9 +230,15 @@ export const useSongDataStore = create<SongDataState>()((set) => ({
 			songDifficulty: "",
 			songModifiers: {},
 			mapLeaderboardData: {
-				stars: 0,
+				scoresaber: {
+					stars: undefined,
 					modifiers: {},
 				},
+				beatleader: {
+					stars: undefined,
+					modifiers: {},
+				},
+			},
 			mapArt: "",
 			bsr: "",