- {Object.entries(gptConfig.classHumanisedFormat).map(([classSet, value]) => (
+ {Object.entries(gptConfig.classes).map(([classSet, conf]) => (
- {value.map((e, i) => (
+ {conf.values.map((e) => (
{e.id}
setAlg(e.target.value as any)}>
- {gptConfig.profileRatingAlgs.map((e) => (
+ {Object.keys(gptConfig.profileRatingAlgs).map((e) => (
@@ -125,7 +125,7 @@ function ProfileLeaderboard({ game, playtype }: GamePT) {
headers={[
["Ranking", "Rank", NumericSOV((x) => x.__related.index)],
["User", "User", StrSOV((x) => x.__related.user.username)],
- ...gptConfig.profileRatingAlgs.map(
+ ...(Object.keys(gptConfig.profileRatingAlgs) as Array).map(
(e) =>
[
UppercaseFirst(e),
@@ -139,11 +139,13 @@ function ProfileLeaderboard({ game, playtype }: GamePT) {
+ ).map((e) => (
{r.ratings[e]
- ? gptConfig.profileRatingAlgFormatters[e]
- ? gptConfig.profileRatingAlgFormatters[e]!(r.ratings[e]!)
+ ? gptConfig.profileRatingAlgs[e].formatter
+ ? gptConfig.profileRatingAlgs[e].formatter!(r.ratings[e]!)
: r.ratings[e]!.toFixed(2)
: "No Data."}
@@ -152,15 +154,18 @@ function ProfileLeaderboard({ game, playtype }: GamePT) {
{Object.keys(r.classes).length === 0 ? (
None
) : (
- Object.entries(r.classes).map(([k, v]) => (
-
diff --git a/client/src/app/pages/dashboard/games/_game/_playtype/GPTSongsPage.tsx b/client/src/app/pages/dashboard/games/_game/_playtype/GPTSongsPage.tsx
index 66c6550e9..4e6aa61ca 100644
--- a/client/src/app/pages/dashboard/games/_game/_playtype/GPTSongsPage.tsx
+++ b/client/src/app/pages/dashboard/games/_game/_playtype/GPTSongsPage.tsx
@@ -20,6 +20,7 @@ import {
SongDocument,
} from "tachi-common";
import { GamePT } from "types/react";
+import { CascadingRatingValue } from "components/tables/headers/ChartHeader";
export default function GPTSongsPage({ game, playtype }: GamePT) {
useSetSubheader(
@@ -90,19 +91,7 @@ function SearchSongsTable({ game, playtype, search }: { search: string } & GameP
entryName="Charts"
dataset={dataset}
headers={[
- [
- "Chart",
- "Chart",
- NumericSOV((chart) => {
- for (const tierlist of gptConfig.tierlists) {
- if (chart.tierlistInfo[tierlist]) {
- return chart.tierlistInfo[tierlist]!.value;
- }
- }
-
- return chart.levelNum;
- }),
- ],
+ ["Chart", "Chart", (a, b) => CascadingRatingValue(game, a, b)],
["Song Title", "Song", StrSOV((x) => x.__related.song.title)],
["Playcount", "Playcount", NumericSOV((x) => x.__playcount)],
]}
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/LeaderboardsPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/LeaderboardsPage.tsx
index 4cba7d98a..d2e8eb228 100644
--- a/client/src/app/pages/dashboard/users/games/_game/_playtype/LeaderboardsPage.tsx
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/LeaderboardsPage.tsx
@@ -16,10 +16,10 @@ import {
FormatGame,
GetGameConfig,
GetGamePTConfig,
- IDStrings,
+ GPTString,
integer,
UserDocument,
- ProfileRatingLookup,
+ ProfileRatingAlgorithms,
UserGameStats,
} from "tachi-common";
import { GameClassSets } from "tachi-common/game-classes";
@@ -84,8 +84,8 @@ function LeaderboardsPageContent({
}: {
reqUser: UserDocument;
data: LeaderboardsData;
- alg: ProfileRatingLookup[IDStrings];
- setAlg: SetState;
+ alg: ProfileRatingAlgorithms[GPTString];
+ setAlg: SetState;
} & GamePT) {
const { stats, leaderboard } = data;
@@ -142,7 +142,7 @@ function LeaderboardsPageContent({
<>
- {gptConfig.scoreRatingAlgs.length > 1 && (
+ {Object.keys(gptConfig.scoreRatingAlgs).length > 1 && (
;
+ alg: ScoreRatingAlgorithms[GPTString];
+ setAlg: SetState;
}) {
return (
>,
- onSubmit: NO_OP,
- });
-
- const tierlistInfo = useMemo(
- () => FolderDatasetToTierlistInfo(folderDataset, game, playtype, formik.values),
- [formik.values]
- );
-
- const dataMap = CreateChartIDMap(folderDataset);
-
- return (
-
-
- Here you can select what tierlist blocks to show!
- {gptConfig.tierlistDescriptions[e]}
-
- ))}
-
- Hide achieved elements of the tierlist.
-
-
-
- );
-}
-
-const NO_TIERLIST_DATA_VALUE = {
- text: "No Tierlist Info",
- value: 0,
-};
-
-function TierlistInfoLadder({
- tierlistInfo,
- dataMap,
- game,
- playtype,
- reqUser,
-}: {
- tierlistInfo: NullableTierlistInfo[];
- dataMap: Map;
- game: Game;
- playtype: Playtype;
- reqUser: UserDocument;
-}) {
- const buckets: TierlistInfo[][] = useMemo(() => {
- const buckets: TierlistInfo[][] = [];
- let currentBucket: TierlistInfo[] = [];
- const noDataBucket: TierlistInfo[] = [];
-
- let lastValue;
- for (const tl of tierlistInfo) {
- if (tl.data === null) {
- noDataBucket.push({
- achieved: tl.achieved,
- chartID: tl.chartID,
- data: NO_TIERLIST_DATA_VALUE,
- key: tl.key,
- });
- continue;
- }
-
- // no longer nullable
- const tlx = tl as TierlistInfo;
-
- if (lastValue && tlx.data.value !== lastValue) {
- buckets.push(currentBucket);
- currentBucket = [tlx];
- } else {
- currentBucket.push(tlx);
- }
- lastValue = tlx.data.value;
- }
-
- if (currentBucket.length) {
- buckets.push(currentBucket);
- }
-
- buckets.push(noDataBucket);
-
- return buckets;
- }, [tierlistInfo]);
-
- const gptConfig = GetGamePTConfig(game, playtype);
-
- for (const bucket of buckets) {
- bucket.sort(NumericSOV((x) => gptConfig.tierlists.indexOf(x.key), true));
- }
-
- if (tierlistInfo.length === 0) {
- return Got no tierlist data to show you!
;
- }
-
- return (
-
- {buckets
- .filter((e) => e.length > 0)
- .map((bucket, i) => (
-
-
- ))}
-
- );
-}
-
-function TierlistBucket({
- bucket,
- dataMap,
- game,
- reqUser,
-}: {
- dataMap: Map;
- game: Game;
- playtype: Playtype;
- reqUser: UserDocument;
- bucket: TierlistInfo[];
-}) {
- // xs view is tabular
- if (window.screen.width <= 576) {
- return (
-
- {bucket.map((tierlistInfo, i) => (
-
- );
- }
-
- return (
- <>
- {bucket.map((tierlistInfo, i) => (
- ;
- game: Game;
- i: integer;
- reqUser: UserDocument;
-}) {
- const data = dataMap.get(tierlistInfo.chartID)!;
-
- const lastKey = bucket[i - 1];
-
- let statusClass;
-
- switch (tierlistInfo.achieved) {
- case AchievedStatuses.ACHIEVED:
- statusClass = "achieved";
- break;
- case AchievedStatuses.FAILED:
- statusClass = "unachieved";
- break;
- case AchievedStatuses.NOT_PLAYED:
- case AchievedStatuses.SCORE_BASED:
- statusClass = "";
- }
-
- // xs view
- if (window.screen.width <= 576) {
- return (
-
-
-
- {data.__related.song.title}
- {" "}
-
-
-
- );
- }
-
- return (
- <>
- {lastKey && lastKey.key !== tierlistInfo.key &&
- -
-
-
-
- );
-}
-
-function TierlistInfoCell({ tierlistInfo }: { tierlistInfo: TierlistInfo }) {
- let colour;
- let text;
-
- if (
- tierlistInfo.achieved === AchievedStatuses.NOT_PLAYED ||
- tierlistInfo.achieved === AchievedStatuses.FAILED
- ) {
- colour = COLOUR_SET.red;
- text = "✗";
- } else {
- colour = COLOUR_SET.green;
- text = "✓";
- }
-
- return (
-
- {text}
-
- );
-}
-
-interface NullableTierlistInfo {
- chartID: string;
- key: GPTTierlists[IDStrings];
- data: ChartTierlistInfo | null;
- achieved: AchievedStatuses;
-}
-
-interface TierlistInfo {
- chartID: string;
- key: GPTTierlists[IDStrings];
- data: ChartTierlistInfo;
- achieved: AchievedStatuses;
-}
-
-enum AchievedStatuses {
- NOT_PLAYED,
- FAILED,
- ACHIEVED,
- SCORE_BASED,
-}
-
-function FolderDatasetToTierlistInfo(
- folderDataset: FolderDataset,
- game: Game,
- playtype: Playtype,
- options: Partial> & { __hideAchieved: boolean }
-) {
- const tierlistInfo: NullableTierlistInfo[] = [];
-
- const tierlistKeys: GPTTierlists[IDStrings][] = [];
-
- for (const k in options) {
- if (k === "__hideAchieved") {
- continue;
- }
-
- const key = k as GPTTierlists[IDStrings];
- if (options[key]) {
- tierlistKeys.push(key);
- }
- }
-
- for (const data of folderDataset) {
- for (const key of tierlistKeys) {
- let achieved: AchievedStatuses;
-
- if (!data.__related.pb) {
- achieved = AchievedStatuses.NOT_PLAYED;
- } else {
- const fn = GetScaleAchievedFn(game, playtype, key);
-
- if (fn) {
- achieved = fn(data.__related.pb)
- ? AchievedStatuses.ACHIEVED
- : AchievedStatuses.FAILED;
- } else {
- achieved = AchievedStatuses.SCORE_BASED;
- }
- }
-
- if (options.__hideAchieved && achieved === AchievedStatuses.ACHIEVED) {
- continue;
- }
-
- tierlistInfo.push({
- chartID: data.chartID,
- key,
- data: data.tierlistInfo[key] ?? null,
- achieved,
- });
- }
- }
-
- return tierlistInfo.sort(NumericSOV((x) => (x.data ? x.data.value : -Infinity), true));
-}
diff --git a/client/src/components/activity/Activity.tsx b/client/src/components/activity/Activity.tsx
index 54a84fb38..2fb2aa5db 100644
--- a/client/src/components/activity/Activity.tsx
+++ b/client/src/components/activity/Activity.tsx
@@ -18,7 +18,13 @@ import { UserContext } from "context/UserContext";
import React, { useContext, useEffect, useState } from "react";
import { Button, Col, Row } from "react-bootstrap";
import { Link } from "react-router-dom";
-import { FormatChart, FormatGame, GetGamePTConfig, UserDocument } from "tachi-common";
+import {
+ FormatChart,
+ FormatGame,
+ GetGamePTConfig,
+ GetScoreEnumConfs,
+ UserDocument,
+} from "tachi-common";
import { ActivityReturn, RecordActivityReturn, SessionReturns } from "types/api-returns";
import { UGPT } from "types/react";
import { ScoreDataset } from "types/tables";
@@ -556,15 +562,21 @@ function SessionShower({ sessionID }: { sessionID: string }) {
return false;
}
- if (e.isNewScore) {
- return (
- score.scoreData.lampIndex > gptConfig.lamps.indexOf(gptConfig.clearLamp) ||
- score.scoreData.gradeIndex > gptConfig.grades.indexOf(gptConfig.clearGrade)
- );
- } else if (e.gradeDelta > 0) {
- return score.scoreData.gradeIndex > gptConfig.grades.indexOf(gptConfig.clearGrade);
- } else if (e.lampDelta > 0) {
- return score.scoreData.lampIndex > gptConfig.lamps.indexOf(gptConfig.clearLamp);
+ const enumMetrics = GetScoreEnumConfs(gptConfig);
+
+ // for all enum metrics, check if this score beats the minimum relevant enum
+ // and is a raise.
+ for (const [metric, conf] of Object.entries(enumMetrics)) {
+ if (!e.isNewScore && e.deltas[metric] <= 0) {
+ continue;
+ }
+
+ if (
+ // @ts-expect-error its gonna exist buddy
+ score.scoreData.enumIndexes[metric] > conf.values.indexOf(conf.minimumRelevantValue)
+ ) {
+ return true;
+ }
}
return false;
diff --git a/client/src/components/game/ClassBadge.tsx b/client/src/components/game/ClassBadge.tsx
index 9fa46551f..6ad6ad497 100644
--- a/client/src/components/game/ClassBadge.tsx
+++ b/client/src/components/game/ClassBadge.tsx
@@ -1,59 +1,73 @@
import { UppercaseFirst } from "util/misc";
import QuickTooltip from "components/layout/misc/QuickTooltip";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
import React from "react";
import { Badge } from "react-bootstrap";
-import { GetGamePTConfig, IDStrings, integer } from "tachi-common";
-import { GameClassSets } from "tachi-common/game-classes";
+import { Classes, GPTString, GetGPTString, GetGamePTConfig } from "tachi-common";
import { GamePT } from "types/react";
-export default function ClassBadge({
+export default function ClassBadge({
game,
playtype,
classSet,
classValue,
showSetOnHover = true,
}: {
- classSet: GameClassSets[I];
- classValue: integer;
+ classSet: Classes[GPT];
+ classValue: string;
showSetOnHover?: boolean;
} & GamePT) {
- const gptConfig = GetGamePTConfig(game, playtype);
+ const classStyle =
+ // @ts-expect-error hepl i'm trapped in a type factory
+ GPT_CLIENT_IMPLEMENTATIONS[GetGPTString(game, playtype)].classColours[classSet][classValue];
- const data = gptConfig.classHumanisedFormat[classSet][classValue];
+ const data = GetGamePTConfig(game, playtype).classes[classSet].values.find(
+ (e) => e.id === classValue
+ );
if (!data) {
- throw new Error(`Unknown class value ${classSet}:${classValue}`);
+ return (
+ <>
+ {classSet} {classValue} (messed up!)
+
+ );
}
let badgeComponent;
- if (data.variant) {
+
+ if (classStyle === null) {
badgeComponent = (
-
+
{data.display}
);
- } else if (data.css) {
+ } else if (typeof classStyle === "string") {
badgeComponent = (
-
+
{data.display}
);
} else {
badgeComponent = (
-
+
{data.display}
);
}
- if (data.mouseover && showSetOnHover) {
+ if (data.hoverText && showSetOnHover) {
return (
-
+
{badgeComponent}
);
- } else if (data.mouseover) {
- return {badgeComponent} ;
+ } else if (data.hoverText) {
+ return {badgeComponent} ;
} else if (showSetOnHover) {
{badgeComponent} ;
}
diff --git a/client/src/components/game/ScoreLeaderboard.tsx b/client/src/components/game/ScoreLeaderboard.tsx
index e31b2f7c5..f34145035 100644
--- a/client/src/components/game/ScoreLeaderboard.tsx
+++ b/client/src/components/game/ScoreLeaderboard.tsx
@@ -38,9 +38,9 @@ export default function ScoreLeaderboard({
const [alg, setAlg] = useState(defaultAlg);
const SelectComponent =
- gptConfig.scoreRatingAlgs.length > 1 ? (
+ Object.keys(gptConfig.scoreRatingAlgs).length > 1 ? (
setAlg(e.target.value as any)}>
- {gptConfig.scoreRatingAlgs.map((e) => (
+ {Object.keys(gptConfig.scoreRatingAlgs).map((e) => (
diff --git a/client/src/components/game/charts/ChartInfoFormat.tsx b/client/src/components/game/charts/ChartInfoFormat.tsx
index 5434fb913..c0a56822a 100644
--- a/client/src/components/game/charts/ChartInfoFormat.tsx
+++ b/client/src/components/game/charts/ChartInfoFormat.tsx
@@ -1,4 +1,5 @@
import QuickTooltip from "components/layout/misc/QuickTooltip";
+import RatingSystemPart from "components/tables/cells/RatingSystemPart";
import MiniTable from "components/tables/components/MiniTable";
import ApiError from "components/util/ApiError";
import ExternalLink from "components/util/ExternalLink";
@@ -6,12 +7,13 @@ import Icon from "components/util/Icon";
import Loading from "components/util/Loading";
import Muted from "components/util/Muted";
import useApiQuery from "components/util/query/useApiQuery";
-import { UserContext } from "context/UserContext";
import { AllLUGPTStatsContext } from "context/AllLUGPTStatsContext";
+import { UserContext } from "context/UserContext";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
import React, { useContext } from "react";
import { Col, Row } from "react-bootstrap";
import { Link } from "react-router-dom";
-import { ChartDocument, FolderDocument, Game, GetGamePTConfig } from "tachi-common";
+import { ChartDocument, FolderDocument, Game, GetGPTString } from "tachi-common";
import { GamePT } from "types/react";
export default function ChartInfoFormat({
@@ -19,9 +21,9 @@ export default function ChartInfoFormat({
game,
playtype,
}: { chart: ChartDocument } & GamePT) {
- const gptConfig = GetGamePTConfig(game, playtype);
+ const gptImpl = GPT_CLIENT_IMPLEMENTATIONS[GetGPTString(game, playtype)];
- const withTierlists = gptConfig.tierlists.filter((e) => chart.tierlistInfo[e]);
+ const ratingSystems = gptImpl.ratingSystems;
const { data, error } = useApiQuery(
`/games/${game}/${playtype}/charts/${chart.chartID}/folders`
@@ -71,27 +73,44 @@ export default function ChartInfoFormat({
- {withTierlists.map((e) => (
-
- {e}
-
- {chart.tierlistInfo[e]!.text}{" "}
- ({chart.tierlistInfo[e]!.value.toFixed(2)})
- {chart.tierlistInfo[e]!.individualDifference && (
- <>
-
-
-
-
-
- )}
-
-
- ))}
+
+ {ratingSystems.map((e) => {
+ // @ts-expect-error bad types
+ const strV = e.toString(chart);
+ // @ts-expect-error bad types
+ const numV = e.toNumber(chart);
+
+ if (
+ strV === null ||
+ strV === undefined ||
+ numV === null ||
+ numV === undefined
+ ) {
+ return null;
+ }
+
+ return (
+
+ {e}
+
+ {strV} ({numV.toFixed(2)})
+ {/* @ts-expect-error utterly silly types */}
+ {e.idvDifference(chart) && (
+ <>
+
+
+
+
+
+ )}
+
+
+ );
+ })}
) : (
No tierlist info.
diff --git a/client/src/components/game/folder/FolderInfoHeader.tsx b/client/src/components/game/folder/FolderInfoHeader.tsx
index 9426b5f09..92a1d9c35 100644
--- a/client/src/components/game/folder/FolderInfoHeader.tsx
+++ b/client/src/components/game/folder/FolderInfoHeader.tsx
@@ -21,8 +21,8 @@ export default function FolderInfoHeader({
folderDataset: FolderDataset;
folderTitle: string;
} & GamePT) {
- const scoreBucket = useBucket(game, playtype);
- const [view, setView] = useState<"grade" | "lamp">(scoreBucket);
+ const preferredDefaultEnum = useBucket(game, playtype);
+ const [view, setView] = useState<"grade" | "lamp">(preferredDefaultEnum);
const [breakdownInfo, setBreakdownInfo] = useState<"graph" | "switchboard">("switchboard");
return (
@@ -66,7 +66,7 @@ export default function FolderInfoHeader({
game={game}
playtype={playtype}
folderDataset={folderDataset}
- view={view}
+ enumMetric={view}
/>
)}
diff --git a/client/src/components/game/folder/FolderMinimap.tsx b/client/src/components/game/folder/FolderMinimap.tsx
index bcd65a7ba..11a7d337c 100644
--- a/client/src/components/game/folder/FolderMinimap.tsx
+++ b/client/src/components/game/folder/FolderMinimap.tsx
@@ -1,34 +1,35 @@
import { ChangeOpacity } from "util/color-opacity";
+import { ONE_WEEK } from "util/constants/time";
import { CreateChartLink } from "util/data";
import { NumericSOV } from "util/sorts";
-import { ONE_WEEK } from "util/constants/time";
import QuickTooltip from "components/layout/misc/QuickTooltip";
+import ScoreCoreCells from "components/tables/game-core-cells/ScoreCoreCells";
import ApiError from "components/util/ApiError";
import Divider from "components/util/Divider";
import Loading from "components/util/Loading";
import useApiQuery from "components/util/query/useApiQuery";
-import React, { useEffect, useMemo, useState } from "react";
-import { Form } from "react-bootstrap";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
+import React, { useMemo } from "react";
import { Link } from "react-router-dom";
import {
- ChartDocument,
FormatChart,
Game,
GamePTConfig,
+ GetGPTString,
GetGamePTConfig,
+ GetScoreMetricConf,
IIDX_LAMPS,
- UserDocument,
SessionDocument,
SessionScoreInfo,
+ UserDocument,
} from "tachi-common";
import { GamePT } from "types/react";
import { FolderDataset } from "types/tables";
-import { SessionReturns } from "types/api-returns";
type Props = {
folderDataset: FolderDataset;
reqUser: UserDocument;
- view: "grade" | "lamp";
+ enumMetric: string;
} & GamePT;
export default function FolderMinimap(props: Props) {
@@ -61,7 +62,7 @@ export default function FolderMinimap(props: Props) {
} | null;
}) {
const gptConfig = GetGamePTConfig(game, playtype);
- const [sortAlg, setSortAlg] = useState(view === "grade" ? "score" : "lamp");
-
- useEffect(() => {
- if (view === "grade") {
- setSortAlg("score");
- } else {
- setSortAlg("lamp");
- }
- }, [view]);
-
const getterFn = useMemo<(f: FolderDataset[0]) => number | undefined>(() => {
- if (sortAlg === "score") {
- return (c) => c.__related.pb?.scoreData.percent;
- } else if (sortAlg === "lamp") {
- return (c) => c.__related.pb?.scoreData.lampIndex;
- } else if (sortAlg.startsWith("tierlist:")) {
- const v = sortAlg.split("tierlist:")[1];
+ const conf = GetScoreMetricConf(gptConfig, enumMetric);
- return (c) => c.tierlistInfo[v as keyof ChartDocument["tierlistInfo"]]?.value;
+ if (!conf) {
+ return () => 0; // wut
}
- return () => 0;
- }, [sortAlg]);
+ if (conf.type === "ENUM") {
+ // @ts-expect-error insane dynamic access
+ return (c) => c.__related.pb?.scoreData.enumIndexes[enumMetric];
+ }
+
+ // @ts-expect-error insane dynamic access
+ return (c) => c.__related.pb?.scoreData[enumMetric];
+ }, [enumMetric]);
const sortedDataset = useMemo(
() => folderDataset.slice(0).sort(NumericSOV((a) => getterFn(a) ?? -Infinity, true)),
- [getterFn, folderDataset, sortAlg]
+ [getterFn, folderDataset, enumMetric]
);
// For the switchboard chart, display a raise icon on stuff the user has recently played.
@@ -114,7 +107,19 @@ function FolderMinimapMain({
}
return recentSession.scoreInfo
- .filter((e) => e.isNewScore || e.gradeDelta > 0 || e.lampDelta > 0)
+ .filter((e) => {
+ if (e.isNewScore) {
+ return true;
+ }
+
+ for (const v of Object.values(e.deltas)) {
+ if (v >= 0) {
+ return true;
+ }
+ }
+
+ return false;
+ })
.map((e) => e.scoreID);
}, [recentSession]);
@@ -127,37 +132,20 @@ function FolderMinimapMain({
key={d.chartID}
data={d}
gptConfig={gptConfig}
- view={view}
+ enumMetric={enumMetric}
game={game}
wasRecent={
(d.__related.pb &&
- recentlyTouched.some(
- (scoreID) =>
- d.__related.pb!.composedFrom.scorePB === scoreID ||
- d.__related.pb!.composedFrom.lampPB === scoreID
+ recentlyTouched.some((scoreID) =>
+ d.__related.pb!.composedFrom.find(
+ (e) => e.scoreID === scoreID
+ )
)) ??
false
}
/>
))}
-
- Sorting switchboard on:
- setSortAlg(e.target.value)}
- >
- {view === "grade" && }
- {view === "lamp" && }
- {gptConfig.tierlists.map((e) => (
-
- ))}
-
-
);
@@ -166,16 +154,18 @@ function FolderMinimapMain({
function MinimapElement({
data,
gptConfig,
- view,
+ enumMetric,
game,
wasRecent,
}: {
data: FolderDataset[0];
- view: "grade" | "lamp";
+ enumMetric: string;
gptConfig: GamePTConfig;
game: Game;
wasRecent: boolean;
}) {
+ const gptImpl = GPT_CLIENT_IMPLEMENTATIONS[GetGPTString(game, data.playtype)];
+
let icon = "level-up-alt";
// if this user recently cleared mare nectaris
@@ -183,7 +173,8 @@ function MinimapElement({
if (
data.chartID === "924bf011fdd8334b609b02e382123f9f5440d16d" &&
data.__related.pb &&
- data.__related.pb?.scoreData.lampIndex >= IIDX_LAMPS.EASY_CLEAR
+ // @ts-expect-error the above chartID guarantees mare nectaris
+ data.__related.pb?.scoreData.enumIndexes.lamp >= IIDX_LAMPS.EASY_CLEAR
) {
icon = "hand-middle-finger";
}
@@ -194,8 +185,8 @@ function MinimapElement({
}
// @ts-expect-error unhinged dynamic access (i dont care)
- return gptConfig[`${view}Colours`][data.__related.pb.scoreData[view]];
- }, [data.__related.pb, gptConfig, view]);
+ return gptImpl.enumColours[enumMetric][data.__related.pb.scoreData[enumMetric]];
+ }, [data.__related.pb, gptConfig, enumMetric]);
return (
- {data.__related.pb.scoreData.grade} -
- - {data.__related.pb.scoreData.score} ( - {data.__related.pb.scoreData.percent.toFixed(2)}%) - - + {data.__related.pb ? ( +> = {
+const GPT_UTILS: Record> = {
"bms:7K": [BMSCustomTablesTool, BMSSieglindeInfoTool],
"bms:14K": [BMSCustomTablesTool, BMSSieglindeInfoTool],
"chunithm:Single": [],
@@ -29,7 +29,7 @@ const GPT_UTILS: Record> = {
};
export function GetGPTUtils(game: Game, playtype: Playtype) {
- const idString = `${game}:${playtype}` as IDStrings;
+ const idString = `${game}:${playtype}` as GPTString;
return GPT_UTILS[idString];
}
diff --git a/client/src/components/gpt-utils/tools/BMSSieglindeInfoTool.tsx b/client/src/components/gpt-utils/tools/BMSSieglindeInfoTool.tsx
index e6b67181c..ff39df5be 100644
--- a/client/src/components/gpt-utils/tools/BMSSieglindeInfoTool.tsx
+++ b/client/src/components/gpt-utils/tools/BMSSieglindeInfoTool.tsx
@@ -12,9 +12,9 @@ import { TachiConfig } from "lib/config";
import React from "react";
import { Col, Row } from "react-bootstrap";
import { BMS_TABLES, ChartDocument, SongDocument } from "tachi-common";
-import { FormatSieglindeBMS } from "tachi-common/config/internal-utils";
import { UGPT } from "types/react";
import { GPTUtility } from "types/ugpt";
+import { FormatSieglindeBMS } from "tachi-common/config/game-support/bms";
type DatasetElement = ChartDocument<"bms:7K" | "bms:14K"> & { __related: { song: SongDocument } };
@@ -76,20 +76,20 @@ function Component({ game, playtype, reqUser }: UGPT) {
[
"EASY CLEAR Sieglinde",
"EC sgl.",
- NumericSOV((x) => x.tierlistInfo["sgl-EC"]?.value ?? -Infinity),
+ NumericSOV((x) => x.data.sglEC ?? -Infinity),
],
[
"HARD CLEAR Sieglinde",
"EC sgl.",
- NumericSOV((x) => x.tierlistInfo["sgl-HC"]?.value ?? -Infinity),
+ NumericSOV((x) => x.data.sglHC ?? -Infinity),
],
]}
rowFunction={(d) => (
{FormatSieglindeBMS(d.tierlistInfo["sgl-EC"]?.value ?? 0)}
- {FormatSieglindeBMS(d.tierlistInfo["sgl-HC"]?.value ?? 0)}
+ {FormatSieglindeBMS(d.data.sglEC ?? 0)}
+ {FormatSieglindeBMS(d.data.sglHC ?? 0)}
)}
defaultSortMode="EASY CLEAR Sieglinde"
diff --git a/client/src/components/sessions/SessionFolderRaiseBreakdown.tsx b/client/src/components/sessions/SessionFolderRaiseBreakdown.tsx
index 1e94b46e4..11daad1ce 100644
--- a/client/src/components/sessions/SessionFolderRaiseBreakdown.tsx
+++ b/client/src/components/sessions/SessionFolderRaiseBreakdown.tsx
@@ -115,7 +115,8 @@ export default function SessionFolderRaiseBreakdown({
const chartMap = CreateChartMap(sessionData.charts);
const songMap = CreateSongMap(sessionData.songs);
- const preferredScoreBucket = settings?.preferences.scoreBucket ?? gptConfig.scoreBucket;
+ const preferredScoreBucket =
+ settings?.preferences.preferredDefaultEnum ?? gptConfig.preferredDefaultEnum;
if (selectedTable === "LOADING") {
return
@@ -132,7 +132,7 @@ function AlgSelector({
value={alg}
onChange={(e) => setAlg(e.target.value as any)}
>
- {gptConfig.scoreRatingAlgs.map((e) => (
+ {Object.keys(gptConfig.scoreRatingAlgs).map((e) => (
))}
@@ -172,7 +172,7 @@ function PBsOverview({
url: string;
indexCol?: boolean;
showPlaycount?: boolean;
- alg?: ScoreCalculatedDataLookup[IDStrings];
+ alg?: ScoreRatingAlgorithms[GPTString];
} & GamePT) {
const [search, setSearch] = useState("");
@@ -212,9 +212,9 @@ function PBsOverview({
function FormatData<
D extends PBScoreDocument | ScoreDocument,
- I extends IDStrings = IDStrings,
+ GPT extends GPTString = GPTString,
G extends Game = Game
->(d: D[], songs: SongDocument[], charts: ChartDocument[], reqUser: UserDocument) {
+>(d: D[], songs: SongDocument[], charts: ChartDocument[], reqUser: UserDocument) {
const songMap = new Map();
const chartMap = new Map();
@@ -266,7 +266,7 @@ function PBsSearch({
}: {
reqUser: UserDocument;
search: string;
- alg?: ScoreCalculatedDataLookup[IDStrings];
+ alg?: ScoreRatingAlgorithms[GPTString];
} & GamePT) {
const { data, error } = useFetchPBs(
`/users/${reqUser.id}/games/${game}/${playtype}/pbs?search=${search}`,
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/SessionsPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/SessionsPage.tsx
index 4b1894d69..8c67eeb7c 100644
--- a/client/src/app/pages/dashboard/users/games/_game/_playtype/SessionsPage.tsx
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/SessionsPage.tsx
@@ -135,7 +135,7 @@ function SearchSessionsTable({
__related: {
index: i,
},
- }));
+ })) as SessionDataset;
}
);
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx
index b8d8e013d..3165ac51b 100644
--- a/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx
@@ -27,7 +27,7 @@ import {
GetGamePTConfig,
ShowcaseStatDetails,
TableDocument,
- UGPTSettings,
+ UGPTSettingsDocument,
UserDocument,
} from "tachi-common";
import { SetState, UGPT } from "types/react";
@@ -109,7 +109,8 @@ function PreferencesForm({ reqUser, game, playtype }: UGPT) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
gameSpecific: settings!.preferences.gameSpecific as any,
defaultTable: settings!.preferences.defaultTable,
- scoreBucket: settings!.preferences.scoreBucket ?? gptConfig.scoreBucket,
+ preferredDefaultEnum:
+ settings!.preferences.preferredDefaultEnum ?? gptConfig.preferredDefaultEnum,
preferredRanking: settings!.preferences.preferredRanking ?? "global",
},
onSubmit: async (values) => {
@@ -129,7 +130,7 @@ function PreferencesForm({ reqUser, game, playtype }: UGPT) {
if (rj.success) {
setLoggedInData({
...loggedInData,
- settings: deepmerge(settings as UGPTSettings, { preferences: values }),
+ settings: deepmerge(settings as UGPTSettingsDocument, { preferences: values }),
});
}
},
@@ -153,7 +154,7 @@ function PreferencesForm({ reqUser, game, playtype }: UGPT) {
return (
-
- {tierlistInfo.key} ({tierlistInfo.data.text})
- {tierlistInfo.data.individualDifference && (
-
-
- - -
-
-
-
-
-
- )}
- -
+
- Sadly, Switchboard view doesn't work very well on mobile at the moment.
+ Sadly, Switchboard view doesn't work on mobile at the moment.
);
@@ -71,40 +72,32 @@ function FolderMinimapMain({
game,
playtype,
folderDataset,
- view,
+ enumMetric,
recentSession,
}: Props & {
recentSession: { session: SessionDocument; scoreInfo: Array- {data.__related.pb.scoreData.grade} -
- - {data.__related.pb.scoreData.score} ( - {data.__related.pb.scoreData.percent.toFixed(2)}%) - - + {data.__related.pb ? ( +
- {gptConfig.sessionRatingAlgs.map((e) => (
+ {Object.keys(gptConfig.sessionRatingAlgs).map((e) => (
diff --git a/client/src/components/sessions/SessionRaiseBreakdown.tsx b/client/src/components/sessions/SessionRaiseBreakdown.tsx
index 5c48fa3ef..d4f0160f6 100644
--- a/client/src/components/sessions/SessionRaiseBreakdown.tsx
+++ b/client/src/components/sessions/SessionRaiseBreakdown.tsx
@@ -1,35 +1,38 @@
import { APIFetchV1 } from "util/api";
import { ChangeOpacity } from "util/color-opacity";
import { CreateChartMap, CreateScoreIDMap, CreateSongMap } from "util/data";
-import { PartialArrayRecordAssign } from "util/misc";
+import { PartialArrayRecordAssign, UppercaseFirst } from "util/misc";
import DifficultyCell from "components/tables/cells/DifficultyCell";
-import LampCell from "components/tables/cells/LampCell";
-import ScoreCell from "components/tables/cells/ScoreCell";
import TitleCell from "components/tables/cells/TitleCell";
import MiniTable from "components/tables/components/MiniTable";
import { CommentModal, ModifyScore } from "components/tables/dropdowns/components/ScoreEditButtons";
+import ScoreCoreCells from "components/tables/game-core-cells/ScoreCoreCells";
import Divider from "components/util/Divider";
import Icon from "components/util/Icon";
import Loading from "components/util/Loading";
import SelectButton from "components/util/SelectButton";
import { UserContext } from "context/UserContext";
import deepmerge from "deepmerge";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
+import { GPTClientImplementation } from "lib/types";
import React, { useContext, useEffect, useMemo, useState } from "react";
import { useQuery } from "react-query";
import {
ChartDocument,
+ GPTString,
Game,
GamePTConfig,
+ GetGPTString,
GetGamePTConfig,
- Grades,
- IDStrings,
- integer,
- Lamps,
+ GetScoreMetricConf,
+ GetScoreMetrics,
ScoreDocument,
SessionScoreInfo,
SongDocument,
TableDocument,
+ integer,
} from "tachi-common";
+import { ConfEnumScoreMetric } from "tachi-common/types/metrics";
import { SessionReturns } from "types/api-returns";
type SetScores = (scores: ScoreDocument[]) => void;
@@ -57,7 +60,10 @@ export default function SessionRaiseBreakdown({
return res.body;
});
- const [view, setView] = useState<"lamps" | "both" | "grades">("both");
+
+ // null -> view all in small format
+ // string -> view this specific metric.
+ const [view, setView] = useState(null);
if (error) {
return <>{(error as Error).message};
@@ -75,17 +81,17 @@ export default function SessionRaiseBreakdown({
{UppercaseFirst(e)}
{FormatSessionRating(
session.game,
session.playtype,
- e,
- session.calculatedData[e]
+ e as AnySessionRatingAlg,
+ session.calculatedData[e as AnySessionRatingAlg]
)}
-
+
-
+
-
+
@@ -115,122 +121,103 @@ function SessionScoreStatBreakdown({
}: {
sessionData: SessionReturns;
setScores?: SetScores;
- view: "lamps" | "both" | "grades";
+ view: string | null;
}) {
const songMap = CreateSongMap(sessionData.songs);
const chartMap = CreateChartMap(sessionData.charts);
const scoreMap = CreateScoreIDMap(sessionData.scores);
+ const gptConfig = GetGamePTConfig(sessionData.session.game, sessionData.session.playtype);
- const [newLamps, newGrades] = useMemo(() => {
- const newLamps: Partial<
- Record
- > = {};
- const newGrades: Partial<
- Record
+ const enumMetrics = GetScoreMetrics(gptConfig, "ENUM");
+
+ const newEnums = useMemo(() => {
+ const newEnums: Record<
+ string,
+ Record
> = {};
- for (const scoreInfo of sessionData.scoreInfo) {
- const score = scoreMap.get(scoreInfo.scoreID);
+ for (const metric of enumMetrics) {
+ newEnums[metric] = {};
- if (!score) {
- console.error(
- `Session score info contains scoreID ${scoreInfo.scoreID}, but no score exists?`
- );
- continue;
- }
+ for (const scoreInfo of sessionData.scoreInfo) {
+ const score = scoreMap.get(scoreInfo.scoreID);
- if (scoreInfo.isNewScore) {
- PartialArrayRecordAssign(newLamps, score.scoreData.lamp, { score, scoreInfo });
- PartialArrayRecordAssign(newGrades, score.scoreData.grade, { score, scoreInfo });
- } else {
- if (scoreInfo.lampDelta > 0) {
- PartialArrayRecordAssign(newLamps, score.scoreData.lamp, { score, scoreInfo });
+ if (!score) {
+ console.error(
+ `Session score info contains scoreID ${scoreInfo.scoreID}, but no score exists?`
+ );
+ continue;
}
- if (scoreInfo.gradeDelta > 0) {
- PartialArrayRecordAssign(newGrades, score.scoreData.grade, {
- score,
- scoreInfo,
- });
+ if (scoreInfo.isNewScore || scoreInfo.deltas[metric] > 0) {
+ PartialArrayRecordAssign(
+ newEnums[metric],
+
+ // @ts-expect-error yeah this is fine pls
+ score.scoreData[metric] as string,
+ {
+ score,
+ scoreInfo,
+ }
+ );
}
}
}
- return [newLamps, newGrades];
+ return newEnums;
}, [view]);
- const gptConfig = GetGamePTConfig(sessionData.session.game, sessionData.session.playtype);
+ const gptImpl =
+ GPT_CLIENT_IMPLEMENTATIONS[
+ GetGPTString(sessionData.session.game, sessionData.session.playtype)
+ ];
return (
<>
- {view === "both" ? (
- <>
-
-
-
-
-
-
-
-
-
- ) : view === "grades" ? (
-
-
-
+ {view === null ? (
+ ;
gptConfig: GamePTConfig;
+ gptImpl: GPTClientImplementation;
songMap: Map>;
- chartMap: Map>;
+ chartMap: Map>;
game: Game;
fullSize?: boolean;
}) {
const tableContents = useMemo(() => {
- // relements.. haha
- const relevantElements =
- type === "lamp"
- ? gptConfig.lamps.slice(gptConfig.lamps.indexOf(gptConfig.clearLamp) - 1).reverse()
- : gptConfig.grades
- .slice(gptConfig.grades.indexOf(gptConfig.clearGrade) - 1)
- .reverse();
+ const conf = GetScoreMetricConf(gptConfig, metric) as ConfEnumScoreMetric;
- const colours = type === "lamp" ? gptConfig.lampColours : gptConfig.gradeColours;
+ // relements.. haha
+ const relevantElements = conf.values.slice(conf.values.indexOf(conf.minimumRelevantValue));
+
+ const colours = gptImpl.enumColours[metric];
const tableContents = [];
for (const element of relevantElements) {
@@ -283,7 +269,6 @@ function ElementStatTable({
;
chartMap: Map;
gptConfig: GamePTConfig;
- type: "lamp" | "grade";
+ metric: string;
scores: Array;
setScores?: SetScores;
}) {
@@ -425,25 +410,24 @@ function BreakdownChartContents({
let preScoreCell = No Play ;
if (!scoreInfo.isNewScore) {
- const oldGradeIndex = score.scoreData.gradeIndex - scoreInfo.gradeDelta;
- const oldLampIndex = score.scoreData.lampIndex - scoreInfo.lampDelta;
+ const newScoreData = score.scoreData;
+
+ for (const [k, d] of Object.entries(scoreInfo.deltas)) {
+ // @ts-expect-error ugh
+ if (typeof score.scoreData[k] === "string") {
+ // @ts-expect-error ugh
+ newScoreData.enumIndexes[k] = score.scoreData.enumIndexes[k] - d;
+ } else {
+ // @ts-expect-error ugh
+ newScoreData[k] = score.scoreData[k] - d;
+ }
+ }
const mockScore = deepmerge(score, {
- scoreData: {
- score: score.scoreData.score - scoreInfo.scoreDelta,
- percent: score.scoreData.percent - scoreInfo.percentDelta,
- grade: gptConfig.grades[oldGradeIndex],
- gradeIndex: oldGradeIndex,
- lamp: gptConfig.lamps[oldLampIndex],
- lampIndex: oldLampIndex,
- },
+ scoreData: newScoreData,
}) as ScoreDocument;
- if (type === "grade") {
- preScoreCell = ⟶
- {type === "grade" ? (
-
);
}
diff --git a/client/src/components/tables/cells/BMSOrPMSLampCell.tsx b/client/src/components/tables/cells/BMSOrPMSLampCell.tsx
index e779a7af4..48104d617 100644
--- a/client/src/components/tables/cells/BMSOrPMSLampCell.tsx
+++ b/client/src/components/tables/cells/BMSOrPMSLampCell.tsx
@@ -1,7 +1,8 @@
import { ChangeOpacity } from "util/color-opacity";
import { IsNotNullish } from "util/misc";
+import { GetEnumColour } from "lib/game-implementations";
import React from "react";
-import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
+import { PBScoreDocument, ScoreDocument } from "tachi-common";
export default function BMSOrPMSLampCell({
score,
@@ -10,19 +11,17 @@ export default function BMSOrPMSLampCell({
| ScoreDocument<"bms:7K" | "bms:14K" | "pms:Keyboard" | "pms:Controller">
| PBScoreDocument<"bms:7K" | "bms:14K" | "pms:Keyboard" | "pms:Controller">;
}) {
- const gptConfig = GetGamePTConfig(score.game, score.playtype);
-
return (
{score.scoreData.lamp}
- {IsNotNullish(score.scoreData.hitMeta.bp) && (
+ {IsNotNullish(score.scoreData.optional.bp) && (
<>
- [BP: {score.scoreData.hitMeta.bp}] + [BP: {score.scoreData.optional.bp}] )}
diff --git a/client/src/components/tables/cells/BPICell.tsx b/client/src/components/tables/cells/BPICell.tsx
index 25232b896..dd5811898 100644
--- a/client/src/components/tables/cells/BPICell.tsx
+++ b/client/src/components/tables/cells/BPICell.tsx
@@ -1,4 +1,4 @@
-import { GetGradeFromPercent, IsNullish } from "util/misc";
+import { IsNullish } from "util/misc";
import QuickTooltip from "components/layout/misc/QuickTooltip";
import Divider from "components/util/Divider";
import Muted from "components/util/Muted";
@@ -6,7 +6,15 @@ import useLUGPTSettings from "components/util/useLUGPTSettings";
import { UserContext } from "context/UserContext";
import React, { useContext } from "react";
import { PoyashiBPI } from "rg-stats";
-import { ChartDocument, integer, PBScoreDocument, ScoreDocument } from "tachi-common";
+import {
+ ChartDocument,
+ GetGrade,
+ IIDXLIKE_GBOUNDARIES,
+ integer,
+ PBScoreDocument,
+ ScoreDocument,
+} from "tachi-common";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
import MiniTable from "../components/MiniTable";
import DeltaCell from "./DeltaCell";
import ScoreCell from "./ScoreCell";
@@ -135,22 +143,15 @@ export default function BPICell({
function FormatAverage(score: integer, playtype: "SP" | "DP", notecount: integer) {
const percent = (100 * score) / (notecount * 2);
- const grade = GetGradeFromPercent("iidx", playtype, percent);
+ const grade = GetGrade(IIDXLIKE_GBOUNDARIES, percent);
return {
score: (
N/A ;
diff --git a/client/src/components/tables/cells/DifficultyCell.tsx b/client/src/components/tables/cells/DifficultyCell.tsx
index 0e2b99f3f..9d2a2c9eb 100644
--- a/client/src/components/tables/cells/DifficultyCell.tsx
+++ b/client/src/components/tables/cells/DifficultyCell.tsx
@@ -11,7 +11,7 @@ import {
GetGamePTConfig,
} from "tachi-common";
import BMSOrPMSDifficultyCell from "./BMSOrPMSDifficultyCell";
-import TierlistInfoPart from "./TierlistInfoPart";
+import RatingSystemPart from "./RatingSystemPart";
import USCDifficultyCell from "./USCDifficultyCell";
import ITGDifficultyCell from "./ITGDifficultyCell";
@@ -73,7 +73,7 @@ export default function DifficultyCell({
)}
{!noTierlist && Object.keys(chart.tierlistInfo).length > 0 && (
-
diff --git a/client/src/components/tables/cells/IIDXLampCell.tsx b/client/src/components/tables/cells/IIDXLampCell.tsx
index 5051869e7..e9af56cbe 100644
--- a/client/src/components/tables/cells/IIDXLampCell.tsx
+++ b/client/src/components/tables/cells/IIDXLampCell.tsx
@@ -1,8 +1,9 @@
import { IsScore } from "util/asserts";
import { ChangeOpacity } from "util/color-opacity";
import { IsNotNullish } from "util/misc";
-import { ChartDocument, GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
+import { GetEnumColour } from "lib/game-implementations";
import React from "react";
+import { ChartDocument, GetGPTString, PBScoreDocument, ScoreDocument } from "tachi-common";
export default function IIDXLampCell({
sc,
@@ -11,33 +12,36 @@ export default function IIDXLampCell({
sc: ScoreDocument<"iidx:SP" | "iidx:DP"> | PBScoreDocument<"iidx:SP" | "iidx:DP">;
chart: ChartDocument<"iidx:SP" | "iidx:DP">;
}) {
- const gptConfig = GetGamePTConfig("iidx", sc.playtype);
-
let gaugeText = null;
- if (sc.scoreData.hitMeta.gsm) {
+ if (
+ sc.scoreData.optional.gsmEXHard &&
+ sc.scoreData.optional.gsmHard &&
+ sc.scoreData.optional.gsmNormal &&
+ sc.scoreData.optional.gsmEasy
+ ) {
gaugeText = `EC: ${
- sc.scoreData.hitMeta.gsm.EASY[sc.scoreData.hitMeta.gsm.EASY.length - 1]
- }%, NC: ${sc.scoreData.hitMeta.gsm.NORMAL[sc.scoreData.hitMeta.gsm.NORMAL.length - 1]}%`;
+ sc.scoreData.optional.gsmEasy[sc.scoreData.optional.gsmEasy.length - 1]
+ }%, NC: ${sc.scoreData.optional.gsmNormal[sc.scoreData.optional.gsmNormal.length - 1]}%`;
} else if (IsScore(sc)) {
if (sc.scoreMeta.gauge === "EASY") {
- gaugeText = `EC: ${sc.scoreData.hitMeta.gauge}%`;
+ gaugeText = `EC: ${sc.scoreData.optional.gauge}%`;
} else if (sc.scoreMeta.gauge === "NORMAL") {
- gaugeText = `NC: ${sc.scoreData.hitMeta.gauge}%`;
+ gaugeText = `NC: ${sc.scoreData.optional.gauge}%`;
}
}
let bpText;
- if (IsNotNullish(sc.scoreData.hitMeta.bp)) {
- bpText = `[BP: ${sc.scoreData.hitMeta.bp}]`;
+ if (IsNotNullish(sc.scoreData.optional.bp)) {
+ bpText = `[BP: ${sc.scoreData.optional.bp}]`;
}
let cbrkCount;
let cbrkText;
- if (sc.scoreData.hitMeta.comboBreak) {
- cbrkCount = sc.scoreData.hitMeta.comboBreak;
+ if (sc.scoreData.optional.comboBreak) {
+ cbrkCount = sc.scoreData.optional.comboBreak;
} else if (
IsNotNullish(sc.scoreData.judgements.pgreat) &&
IsNotNullish(sc.scoreData.judgements.great) &&
@@ -57,7 +61,7 @@ export default function IIDXLampCell({
return (
{sc.scoreData.lamp}
diff --git a/client/src/components/tables/cells/ITGDifficultyCell.tsx b/client/src/components/tables/cells/ITGDifficultyCell.tsx
index 141dea326..a1611dbd7 100644
--- a/client/src/components/tables/cells/ITGDifficultyCell.tsx
+++ b/client/src/components/tables/cells/ITGDifficultyCell.tsx
@@ -4,7 +4,7 @@ import Muted from "components/util/Muted";
import React from "react";
import { ChartDocument, COLOUR_SET, GetGamePTConfig } from "tachi-common";
import MiniTable from "../components/MiniTable";
-import TierlistInfoPart from "./TierlistInfoPart";
+import RatingSystemPart from "./RatingSystemPart";
export default function ITGDifficultyCell({ chart }: { chart: ChartDocument<"itg:Stamina"> }) {
const gptConfig = GetGamePTConfig("itg", "Stamina");
@@ -45,7 +45,7 @@ export default function ITGDifficultyCell({ chart }: { chart: ChartDocument<"itg
{chart.data.charter}
-
diff --git a/client/src/components/tables/cells/JubeatScoreCell.tsx b/client/src/components/tables/cells/JubeatScoreCell.tsx
index 0584527eb..597dd63c8 100644
--- a/client/src/components/tables/cells/JubeatScoreCell.tsx
+++ b/client/src/components/tables/cells/JubeatScoreCell.tsx
@@ -1,20 +1,28 @@
import { ChangeOpacity } from "util/color-opacity";
import { FormatMillions } from "util/misc";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
import React from "react";
-import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
-
-export default function JubeatScoreCell({ sc }: { sc: ScoreDocument | PBScoreDocument }) {
- const gptConfig = GetGamePTConfig(sc.game, sc.playtype);
+import { PBScoreDocument, ScoreDocument } from "tachi-common";
+export default function JubeatScoreCell({
+ sc,
+}: {
+ sc: ScoreDocument<"jubeat:Single"> | PBScoreDocument<"jubeat:Single">;
+}) {
return (
{sc.scoreData.grade}
- {sc.scoreData.percent.toFixed(2)}% + {sc.scoreData.musicRate.toFixed(2)}%
{FormatMillions(sc.scoreData.score)}
diff --git a/client/src/components/tables/cells/LampCell.tsx b/client/src/components/tables/cells/LampCell.tsx
index 169c2f6eb..6e7328412 100644
--- a/client/src/components/tables/cells/LampCell.tsx
+++ b/client/src/components/tables/cells/LampCell.tsx
@@ -1,17 +1,14 @@
import { ChangeOpacity } from "util/color-opacity";
import React from "react";
-import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
-
-export default function LampCell({ score }: { score: ScoreDocument | PBScoreDocument }) {
- const gptConfig = GetGamePTConfig(score.game, score.playtype);
+export default function LampCell({ lamp, colour }: { lamp: string; colour: string }) {
return (
- {score.scoreData.lamp}
+ {lamp}
);
}
diff --git a/client/src/components/tables/cells/MillionsScoreCell.tsx b/client/src/components/tables/cells/MillionsScoreCell.tsx
index 5406e31ef..c0e94f1c8 100644
--- a/client/src/components/tables/cells/MillionsScoreCell.tsx
+++ b/client/src/components/tables/cells/MillionsScoreCell.tsx
@@ -1,20 +1,26 @@
import { ChangeOpacity } from "util/color-opacity";
import { FormatMillions } from "util/misc";
import React from "react";
-import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
-
-export default function MillionsScoreCell({ score }: { score: PBScoreDocument | ScoreDocument }) {
- const gptConfig = GetGamePTConfig(score.game, score.playtype);
+import { GetGamePTConfig, PBScoreDocument, ScoreDocument, integer } from "tachi-common";
+export default function MillionsScoreCell({
+ score,
+ colour,
+ grade,
+}: {
+ score: integer;
+ grade: string;
+ colour: string;
+}) {
return (
- {score.scoreData.grade}
+ {grade}
- {FormatMillions(score.scoreData.score)} + {FormatMillions(score)}
);
}
diff --git a/client/src/components/tables/cells/PBCompareCell.tsx b/client/src/components/tables/cells/PBCompareCell.tsx
index b4a764f95..6f4eba576 100644
--- a/client/src/components/tables/cells/PBCompareCell.tsx
+++ b/client/src/components/tables/cells/PBCompareCell.tsx
@@ -1,22 +1,21 @@
import { FormatMillions } from "util/misc";
import React from "react";
import { COLOUR_SET, Game, PBScoreDocument, Playtype } from "tachi-common";
-import { ESDCompare } from "tachi-common/lib/esd";
-import Muted from "components/util/Muted";
+import { ConfScoreMetric } from "tachi-common/types/metrics";
export default function PBCompareCell({
base,
compare,
game,
- compareType,
- shouldESD,
+ metricConf,
+ metric,
}: {
base: PBScoreDocument | null;
compare: PBScoreDocument | null;
game: Game;
playtype: Playtype;
- compareType: "score" | "lamp";
- shouldESD: boolean;
+ metricConf: ConfScoreMetric;
+ metric: string;
}) {
let status: "win" | "draw" | "lose";
@@ -27,10 +26,12 @@ export default function PBCompareCell({
status = "lose";
} else if (!compare) {
status = "win";
- } else if (compareType === "score") {
- status = cmp(base.scoreData.score, compare.scoreData.score);
+ } else if (metricConf.type === "ENUM") {
+ // @ts-expect-error yeah this index will work sorry
+ status = cmp(base.scoreData.enumIndexes[metric], compare.scoreData.enumIndexes[metric]);
} else {
- status = cmp(base.scoreData.lampIndex, compare.scoreData.lampIndex);
+ // @ts-expect-error yeah this index will work sorry
+ status = cmp(base.scoreData[metric], compare.scoreData[metric]);
}
let scoreRenderFn = (k: number) => k.toString();
@@ -68,14 +69,6 @@ export default function PBCompareCell({
const cmpScore = (base?.scoreData.score ?? 0) - (compare?.scoreData.score ?? 0);
const cmpLamp = (base?.scoreData.lampIndex ?? 0) - (compare?.scoreData.lampIndex ?? 0);
- let esdDiff;
-
- if (shouldESD) {
- if (base?.scoreData.esd && compare?.scoreData.esd) {
- esdDiff = ESDCompare(compare.scoreData.esd, base.scoreData.esd);
- }
- }
-
return (
- {compareType === "score" ? (
+ {metricConf.type === "ENUM" ? (
+ <>
+ ) : (
<>
{shouldPrioritisePercent ? (
<>
@@ -114,22 +109,6 @@ export default function PBCompareCell({
)}
)}
- {esdDiff !== undefined && (
- <>
-
- {esdDiff.toFixed(2) === "0.00" ? ( -Negligable Difference
- ) : (
-
- Relative: {(esdDiff > 0 ? "+" : "") + esdDiff.toFixed(2)}
-
- )}
-
- )}
-
- ) : (
- <>
- {(cmpLamp > 0 ? "+" : "") + cmpLamp}
)}
diff --git a/client/src/components/tables/cells/PopnLampCell.tsx b/client/src/components/tables/cells/PopnLampCell.tsx
index 6751ae2a8..6d9406b63 100644
--- a/client/src/components/tables/cells/PopnLampCell.tsx
+++ b/client/src/components/tables/cells/PopnLampCell.tsx
@@ -1,31 +1,31 @@
import { ToCDNURL } from "util/api";
import { ChangeOpacity } from "util/color-opacity";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
import React from "react";
-import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
+import { PBScoreDocument, ScoreDocument } from "tachi-common";
export default function PopnLampCell({
score,
}: {
score: ScoreDocument<"popn:9B"> | PBScoreDocument<"popn:9B">;
}) {
- const gptConfig = GetGamePTConfig(score.game, score.playtype);
-
return (
{score.scoreData.lamp}
- {score.scoreData.hitMeta.specificClearType && ( -})
- )}
+ })
);
}
diff --git a/client/src/components/tables/cells/RatingSystemPart.tsx b/client/src/components/tables/cells/RatingSystemPart.tsx
new file mode 100644
index 000000000..f49c8d980
--- /dev/null
+++ b/client/src/components/tables/cells/RatingSystemPart.tsx
@@ -0,0 +1,81 @@
+import QuickTooltip from "components/layout/misc/QuickTooltip";
+import Icon from "components/util/Icon";
+import Muted from "components/util/Muted";
+import { GPT_CLIENT_IMPLEMENTATIONS } from "lib/game-implementations";
+import React from "react";
+import { ChartDocument, Game, GetGPTString } from "tachi-common";
+import { GPTRatingSystem } from "lib/types";
+import MiniTable from "../components/MiniTable";
+
+export default function RatingSystemPart({ chart, game }: { chart: ChartDocument; game: Game }) {
+ const ratingSystems: Array> =
+ GPT_CLIENT_IMPLEMENTATIONS[GetGPTString(game, chart.playtype)].ratingSystems;
+
+ // don't render anything if this game has no other rating systems defined
+ // for this chart
+ if (ratingSystems.filter((e) => typeof e.toNumber(chart) === "number").length === 0) {
+ return null;
+ }
+
+ return (
+ <>
+
{score.scoreData.lamp === "FAILED" ? "PLAYED" : score.scoreData.lamp}
diff --git a/client/src/components/tables/cells/ScoreCell.tsx b/client/src/components/tables/cells/ScoreCell.tsx
index c90eb86ee..e6a30cfd5 100644
--- a/client/src/components/tables/cells/ScoreCell.tsx
+++ b/client/src/components/tables/cells/ScoreCell.tsx
@@ -1,39 +1,33 @@
import { ChangeOpacity } from "util/color-opacity";
import React from "react";
-import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
+import { integer } from "tachi-common";
export default function ScoreCell({
score,
- showScore = true,
+ colour,
+ grade,
+ percent,
scoreRenderFn,
}: {
- score: PBScoreDocument | ScoreDocument;
+ score: integer;
+ percent: number;
+ grade: string;
+ colour: string;
showScore?: boolean;
scoreRenderFn?: (s: number) => string;
}) {
- const gptConfig = GetGamePTConfig(score.game, score.playtype);
-
return (
- {score.scoreData.grade}
+ {grade}
- {`${score.scoreData.percent.toFixed(2)}%`} - {showScore && ( - <> -
- - [ - {scoreRenderFn - ? scoreRenderFn(score.scoreData.score) - : score.scoreData.score} - ] - - - )} + {`${percent.toFixed(2)}%`} + +
+ [{scoreRenderFn ? scoreRenderFn(score) : score}]
);
}
diff --git a/client/src/components/tables/cells/ScoreCellLarge.tsx b/client/src/components/tables/cells/ScoreCellLarge.tsx
deleted file mode 100644
index f76ad4c83..000000000
--- a/client/src/components/tables/cells/ScoreCellLarge.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { FormatMillions } from "util/misc";
-import React from "react";
-import { Game, PBScoreDocument, ScoreDocument, Playtype } from "tachi-common";
-import ScoreCell from "./ScoreCell";
-
-export default function ScoreCellLarge(props: {
- game: Game;
- playtype: Playtype;
- score: ScoreDocument | PBScoreDocument;
-}) {
- return
+ {enumMetrics.map((metric) => (
+
) : (
+
+
+
+ ))}
-
+
@@ -240,7 +227,7 @@ function SessionScoreStatBreakdown({
}
function ElementStatTable({
- type,
+ metric: metric,
counts,
gptConfig,
songMap,
@@ -249,27 +236,26 @@ function ElementStatTable({
fullSize = false,
scores,
setScores,
+ gptImpl,
}: {
- type: "lamp" | "grade";
+ metric: string;
setScores?: SetScores;
scores: ScoreDocument[];
counts: Record- [BP: {score.scoreData.hitMeta.bp}] + [BP: {score.scoreData.optional.bp}] )}
- {sc.scoreData.percent.toFixed(2)}% + {sc.scoreData.musicRate.toFixed(2)}%
{FormatMillions(sc.scoreData.score)}
- {FormatMillions(score.scoreData.score)} + {FormatMillions(score)}
- {esdDiff.toFixed(2) === "0.00" ? ( -
- {score.scoreData.hitMeta.specificClearType && ( -
- )}
+
+
+ {ratingSystems.map((e) => {
+ const strV = e.toString(chart);
+ const numV = e.toNumber(chart);
+
+ if (
+ strV === null ||
+ strV === undefined ||
+ numV === null ||
+ numV === undefined
+ ) {
+ return null;
+ }
+
+ return (
+
+ {e}
+
+ {strV} ({numV.toFixed(2)})
+ {/* @ts-expect-error utterly silly types */}
+ {e.idvDifference(chart) && (
+ <>
+
+
+
+
+
+ )}
+
+
+ );
+ })}
+
+ }
+ >
+
+
+ +
+
+ {ratingSystems.map((r) => r.toString(chart as any)).join(" / ")}
+
+
+
+
+ {ratingSystems.map((r) => (
+
+ {r.toString(chart as any)}
+
+
+ ))}
+
+
+
+ );
+}
diff --git a/client/src/components/tables/cells/SDVXLampCell.tsx b/client/src/components/tables/cells/SDVXLampCell.tsx
index eb9fbd70b..4162bb228 100644
--- a/client/src/components/tables/cells/SDVXLampCell.tsx
+++ b/client/src/components/tables/cells/SDVXLampCell.tsx
@@ -1,6 +1,7 @@
import { ChangeOpacity } from "util/color-opacity";
+import { GetEnumColour } from "lib/game-implementations";
import React from "react";
-import { GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
+import { PBScoreDocument, ScoreDocument } from "tachi-common";
// Lamp cell, but if the lamp is FAILED, display it slightly differently.
export default function SDVXLampCell({
@@ -10,12 +11,10 @@ export default function SDVXLampCell({
| ScoreDocument<"sdvx:Single" | "usc:Controller" | "usc:Keyboard">
| PBScoreDocument<"sdvx:Single" | "usc:Controller" | "usc:Keyboard">;
}) {
- const gptConfig = GetGamePTConfig(score.game, score.playtype);
-
return (
+
- {`${score.scoreData.percent.toFixed(2)}%`} - {showScore && ( - <> -
- - [ - {scoreRenderFn - ? scoreRenderFn(score.scoreData.score) - : score.scoreData.score} - ] - - - )} + {`${percent.toFixed(2)}%`} + +
+ [{scoreRenderFn ? scoreRenderFn(score) : score}]
-
-
-
- Tierlist
- Value
-
-
-
- {keys.map((k) => (
-
- {k}
-
- {chart.tierlistInfo[k]!.text} (
- {chart.tierlistInfo[k]!.value.toFixed(2)})
- {chart.tierlistInfo[k]!.individualDifference && (
- <>
-
-
-
- ))}
-
-
- }
- >
-
-
- -
- {keys.map((k) => chart.tierlistInfo[k]!.text).join(" / ")}
-
-
-
- {keys.map((k) => (
-
- {chart.tierlistInfo[k]!.text}
-
-
- ))}
-
-
-
- );
-}
diff --git a/client/src/components/tables/cells/USCDifficultyCell.tsx b/client/src/components/tables/cells/USCDifficultyCell.tsx
index a564bc0d3..9c5c22a28 100644
--- a/client/src/components/tables/cells/USCDifficultyCell.tsx
+++ b/client/src/components/tables/cells/USCDifficultyCell.tsx
@@ -4,7 +4,7 @@ import QuickTooltip from "components/layout/misc/QuickTooltip";
import Icon from "components/util/Icon";
import React from "react";
import { ChartDocument, COLOUR_SET, GetGamePTConfig } from "tachi-common";
-import TierlistInfoPart from "./TierlistInfoPart";
+import RatingSystemPart from "./RatingSystemPart";
export default function USCDifficultyCell({
chart,
@@ -29,7 +29,7 @@ export default function USCDifficultyCell({
}}
>
{levelText}
- -
diff --git a/client/src/components/tables/cells/VF6Cell.tsx b/client/src/components/tables/cells/VF6Cell.tsx
index 4a3bd4ac9..11304d980 100644
--- a/client/src/components/tables/cells/VF6Cell.tsx
+++ b/client/src/components/tables/cells/VF6Cell.tsx
@@ -3,9 +3,15 @@ import useLUGPTSettings from "components/util/useLUGPTSettings";
import { UserContext } from "context/UserContext";
import React, { useContext } from "react";
import { Volforce } from "rg-stats";
-import { ChartDocument, GetGamePTConfig, PBScoreDocument, ScoreDocument } from "tachi-common";
+import {
+ ChartDocument,
+ GetGPTString,
+ GetSpecificGPTConfig,
+ PBScoreDocument,
+ ScoreDocument,
+} from "tachi-common";
-type VF6IDStrings = "sdvx:Single" | "usc:Keyboard" | "usc:Controller";
+type VF6GPTString = "sdvx:Single" | "usc:Keyboard" | "usc:Controller";
const SHORT_LAMPS = {
CLEAR: "CLR",
@@ -17,11 +23,11 @@ export default function VF6Cell({
score,
chart,
}: {
- score: ScoreDocument | PBScoreDocument;
- chart: ChartDocument;
+ score: ScoreDocument | PBScoreDocument;
+ chart: ChartDocument;
}) {
const { user } = useContext(UserContext);
- const { settings } = useLUGPTSettings();
+ const { settings } = useLUGPTSettings();
if (IsNullish(score.calculatedData.VF6)) {
return N/A ;
@@ -29,13 +35,18 @@ export default function VF6Cell({
const vf6Target = settings?.preferences.gameSpecific.vf6Target;
- const gptConfig = GetGamePTConfig(score.game, score.playtype);
+ const gptConfig = GetSpecificGPTConfig(
+ GetGPTString(score.game, score.playtype) as VF6GPTString
+ );
const targets: Record = {};
if (vf6Target && score.userID === user?.id) {
for (const lamp of ["CLEAR", "EXCESSIVE CLEAR", "ULTIMATE CHAIN"] as const) {
- if (score.scoreData.lampIndex <= gptConfig.lamps.indexOf(lamp)) {
+ if (
+ score.scoreData.enumIndexes.lamp <=
+ gptConfig.providedMetrics.lamp.values.indexOf(lamp)
+ ) {
const expectedScore = InverseVF6(vf6Target, lamp, chart.levelNum);
if (expectedScore === null) {
diff --git a/client/src/components/tables/components/SelectableCompareType.tsx b/client/src/components/tables/components/SelectableCompareType.tsx
index c2bcee02b..6db0a05ce 100644
--- a/client/src/components/tables/components/SelectableCompareType.tsx
+++ b/client/src/components/tables/components/SelectableCompareType.tsx
@@ -3,20 +3,20 @@ import { SetState } from "types/react";
import { ZTableTHProps } from "./TachiTable";
export default function SelectableCompareType({
- compareType,
- setCompareType,
+ metric,
+ setMetric,
changeSort,
currentSortMode,
reverseSort,
}: {
- compareType: "score" | "lamp";
- setCompareType: SetState<"score" | "lamp">;
+ metric: string;
+ setMetric: SetState;
} & ZTableTHProps) {
return (