Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-12 09:18:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: better arcaea judgement cell + ptt calculation fixes (#1589)

Browse Source 
* feat: PM judgements + correct rating calc

* apparently, I forgot SQL syntax

* rg-stats test case
This commit is contained in:
nairobi
2026-05-26 18:25:16 +01:00
committed by GitHub
parent da9c6acd0a
commit e8b460b9ee
8 changed files with 117 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
typescript/client/src/components/tables/cells/ArcaeaJudgementCell.tsx
-36
View File
@@ -1,36 +0,0 @@
import { IsNullish } from "#util/misc";
import React from "react";
import { COLOUR_SET, type PBScoreDocument, type ScoreDocument } from "tachi-common";
export default function ArcaeaJudgementCell({
score,
}: {
score: PBScoreDocument<"arcaea"> | ScoreDocument<"arcaea">;
}) {
// even if we dont have judgement data, we know what they got.
if (score.scoreData.lamp === "PURE MEMORY") {
return (
<td>
<strong>
<span style={{ color: COLOUR_SET.vibrantYellow }}>0</span>-
<span style={{ color: COLOUR_SET.red }}>0</span>
</strong>
</td>
);
}
const judgements = score.scoreData.judgements;
if (IsNullish(judgements.far) || IsNullish(judgements.lost)) {
return <td>No Data.</td>;
}
return (
<td>
<strong>
<span style={{ color: COLOUR_SET.vibrantYellow }}>{judgements.far}</span>-
<span style={{ color: COLOUR_SET.red }}>{judgements.lost}</span>
</strong>
</td>
);
}
typescript/client/src/lib/games/arcaea.tsx
+69 -5
View File
@@ -1,12 +1,17 @@
import ArcaeaJudgementCell from "#components/tables/cells/ArcaeaJudgementCell";
import QuickTooltip from "#components/layout/misc/QuickTooltip";
import LampCell from "#components/tables/cells/LampCell";
import MillionsScoreCell from "#components/tables/cells/MillionsScoreCell";
import RatingCell from "#components/tables/cells/RatingCell";
import { GetEnumColour } from "#lib/game-implementations";
import { type GPTClientImplementation } from "#lib/types";
import { FormatScoreRating, IsNullish } from "#util/misc";
import { NumericSOV } from "#util/sorts";
import React from "react";
import { COLOUR_SET, type GamesForGroup } from "tachi-common";
import {
COLOUR_SET,
type GamesForGroup,
type PBScoreDocument,
type ScoreDocument,
} from "tachi-common";
import { bgc } from "./_util";
@@ -67,12 +72,62 @@ const ARCAEA_COLORS: GPTClientImplementation<GamesForGroup["arcaea"]>["classColo
},
};
// Returns 0 for MAX PM, -10 for MAX-10, and -10k if undefined/not applicable
const MaxPureDelta = (sc: PBScoreDocument<"arcaea"> | ScoreDocument<"arcaea">) =>
IsNullish(sc.scoreData.judgements.pure) || sc.scoreData.lamp !== "PURE MEMORY"
? -10000
: sc.scoreData.score - sc.scoreData.judgements.pure - 10_000_000;
const ARCAEA_SCORE_HEADERS: GPTClientImplementation<GamesForGroup["arcaea"]>["scoreHeaders"] = [
["Score", "Score", NumericSOV((x) => x.scoreData.score)],
["Far - Lost", "Far - Lost", NumericSOV((x) => x.scoreData.score)],
[
"Judgements",
"Judgements",
NumericSOV((sc) =>
sc.scoreData.lamp !== "PURE MEMORY"
? sc.scoreData.score - 20_000_000
: MaxPureDelta(sc),
),
],
["Lamp", "Lamp", NumericSOV((x) => x.scoreData.enumIndexes.lamp)],
];
const ArcaeaJudgementCell = ({
score,
}: {
score: PBScoreDocument<"arcaea"> | ScoreDocument<"arcaea">;
}) => {
const judgements = score.scoreData.judgements;
if (IsNullish(judgements.far) || IsNullish(judgements.lost)) {
return <td>No Data.</td>;
}
if (score.scoreData.lamp === "PURE MEMORY") {
const delta = MaxPureDelta(score);
return (
<td>
<strong>
{delta < 0 ? (
<span style={{ color: COLOUR_SET.blue }}>MAX{delta}</span>
) : (
<span style={{ color: COLOUR_SET.vibrantBlue }}>MAX</span>
)}
</strong>
</td>
);
}
return (
<td>
<strong>
<span style={{ color: COLOUR_SET.vibrantYellow }}>{judgements.far}</span>-
<span style={{ color: COLOUR_SET.red }}>{judgements.lost}</span>
</strong>
</td>
);
};
const ArcaeaCoreCells: GPTClientImplementation<GamesForGroup["arcaea"]>["scoreCoreCells"] = ({
sc,
}) => (
@@ -90,7 +145,16 @@ const ArcaeaCoreCells: GPTClientImplementation<GamesForGroup["arcaea"]>["scoreCo
const ArcaeaRatingCell: GPTClientImplementation<GamesForGroup["arcaea"]>["ratingCell"] = ({
sc,
rating,
}) => <RatingCell rating={rating} score={sc} />;
}) => {
const ptt = sc.calculatedData.potential ?? 0;
return (
<QuickTooltip tooltipContent={<div className="fs-5">{ptt.toFixed(6)}</div>}>
<td>
<div className="underline-on-hover">{FormatScoreRating("arcaea", rating, ptt)}</div>
</td>
</QuickTooltip>
);
};
export const ARCAEA_TOUCH_IMPL: GPTClientImplementation<"arcaea"> = {
sessionImportantScoreCount: 30,