@@ -14,11 +14,7 @@ export default function SupportMePage() {
people like you.
- If you want to support {TachiConfig.NAME} development, you can donate to my{" "}
- Ko-fi.
-
-
- Alternatively, you can star the{" "}
+ You can star the{" "}
GitHub Repo. This
makes me look cool to employers!
diff --git a/typescript/client/src/app/routes/DashboardRoutes.tsx b/typescript/client/src/app/routes/DashboardRoutes.tsx
index da698d5e8..053b45ca6 100644
--- a/typescript/client/src/app/routes/DashboardRoutes.tsx
+++ b/typescript/client/src/app/routes/DashboardRoutes.tsx
@@ -1,3 +1,4 @@
+import CreditsPage from "#app/pages/dashboard/misc/CreditsPage";
import MyProposalsPage from "#app/pages/dashboard/proposals/MyProposalsPage";
import ProposalsPage from "#app/pages/dashboard/proposals/ProposalsPage";
import SearchPage from "#app/pages/dashboard/search/SearchPage";
@@ -95,6 +96,10 @@ export default function DashboardRoutes() {
+
+
+
+
{/*
*/}
diff --git a/typescript/client/src/app/routes/ImportRoutes.tsx b/typescript/client/src/app/routes/ImportRoutes.tsx
index 0b83e02ec..e3829e8f7 100644
--- a/typescript/client/src/app/routes/ImportRoutes.tsx
+++ b/typescript/client/src/app/routes/ImportRoutes.tsx
@@ -19,6 +19,7 @@ import MikadoPage from "#app/pages/dashboard/import/MikadoPage";
import OngekiArtemisExportPage from "#app/pages/dashboard/import/OngekiArtemisExportPage";
import OngekiInoharaPage from "#app/pages/dashboard/import/OngekiInoharaPage";
import OngekiSiteImportPage from "#app/pages/dashboard/import/OngekiSiteImportPage";
+import RizuPage from "#app/pages/dashboard/import/RizuPage";
import SaekawaPage from "#app/pages/dashboard/import/SaekawaPage";
import SDVXEamCSVPage from "#app/pages/dashboard/import/SDVXEamCSVPage";
import SilentHookPage from "#app/pages/dashboard/import/SilentHookPage";
@@ -255,6 +256,10 @@ export default function ImportRoutes() {
+
+
+
+
diff --git a/typescript/client/src/components/game/ClassBadge.tsx b/typescript/client/src/components/game/ClassBadge.tsx
index 9b41b46e1..fe9d6dd0b 100644
--- a/typescript/client/src/components/game/ClassBadge.tsx
+++ b/typescript/client/src/components/game/ClassBadge.tsx
@@ -45,8 +45,10 @@ export default function ClassBadge
({
);
} else {
+ const styleWithMaybeShine = classStyle as { shine?: boolean } & React.CSSProperties;
+ const { shine, ...badgeStyle } = styleWithMaybeShine;
badgeComponent = (
-
+
{data.display}
);
diff --git a/typescript/client/src/components/game/charts/ChartInfoFormat.tsx b/typescript/client/src/components/game/charts/ChartInfoFormat.tsx
index 94433359f..208aae27e 100644
--- a/typescript/client/src/components/game/charts/ChartInfoFormat.tsx
+++ b/typescript/client/src/components/game/charts/ChartInfoFormat.tsx
@@ -185,7 +185,9 @@ function ChartInfoMiddle({
const diff = FormatDifficultySearch(chart);
const gameName =
game === "ongeki" ? "オンゲキ" : game === "maimaidx" ? "maimai" : gameGroupConfig.name;
- const formattedTitle = song.title.replace(/-/gu, " ");
+ const formattedTitle = song.title
+ .replace(/([!?,]){4,}/gu, (m) => m[0].repeat(3))
+ .replace(/-/gu, " ");
let search = `${gameName} ${formattedTitle}`;
diff --git a/typescript/client/src/components/game/songs/IIDXStyleSongChartInfoFormat.tsx b/typescript/client/src/components/game/songs/IIDXStyleSongChartInfoFormat.tsx
index a12d22a47..c7dbc04f4 100644
--- a/typescript/client/src/components/game/songs/IIDXStyleSongChartInfoFormat.tsx
+++ b/typescript/client/src/components/game/songs/IIDXStyleSongChartInfoFormat.tsx
@@ -16,9 +16,14 @@ export default function IIDXStyleSongChartInfoFormat({
game: V3Game;
song: SongDocument<"bms" | "chunithm" | "iidx" | "maimaidx" | "ongeki" | "pms" | "popn">;
}) {
+ const genre =
+ game === "ongeki"
+ ? ((song as SongDocument<"ongeki">).data.flavorGenre ?? song.data.genre)
+ : song.data.genre;
+
return (
<>
- {song.data.genre}
+ {genre}
{song.title}
{song.artist}
{chart && ({LevelText(chart)})
}
diff --git a/typescript/client/src/components/layout/footer/Footer.tsx b/typescript/client/src/components/layout/footer/Footer.tsx
index fdd7f0231..583908cbd 100644
--- a/typescript/client/src/components/layout/footer/Footer.tsx
+++ b/typescript/client/src/components/layout/footer/Footer.tsx
@@ -63,6 +63,14 @@ export function Footer() {
>
GDPR
+ window.scrollTo(0, 0)}
+ to="/credits"
+ >
+ Credits
+
{import.meta.env.VITE_DISCORD && (
x.scoreData.platinumStars * 100000 + x.scoreData.platinumScore),
+ // __related is attached when rendering table rows with chart context
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any -- NumericSOV row shape
+ NumericSOV((x: any) => {
+ if (x.__related?.chart?.data !== undefined) {
+ return x.scoreData.platinumScore / x.__related.chart.data.maxPlatScore;
+ }
+ return x.scoreData.platinumStars * 100000 + x.scoreData.platinumScore;
+ }),
],
["Judgements", "Notes", NumericSOV((x) => x.scoreData.judgements.cbreak ?? 0)],
[
diff --git a/typescript/client/src/lib/games/_util.ts b/typescript/client/src/lib/games/_util.ts
index c9e8e0877..1ab77302d 100644
--- a/typescript/client/src/lib/games/_util.ts
+++ b/typescript/client/src/lib/games/_util.ts
@@ -36,12 +36,6 @@ export const RAINBOW_GRADIENT = {
color: "var(--bs-dark)",
} as const;
-export const RAINBOW_SHINY_GRADIENT = {
- background:
- "linear-gradient(-45deg, #ff8697, #ff9dbf, #9e81d0, #87caff, #7dae80, #ffffa7, #ffd88a, #ffab8d, #ff8697)",
- color: "var(--bs-dark)",
-} as const;
-
export const RAINBOW_EX_GRADIENT = {
background: "linear-gradient(-45deg, #0fa091, #0f98d5, #67087f, #d9007e, #f56e06)",
color: "var(--bs-light)",
diff --git a/typescript/client/src/lib/types.ts b/typescript/client/src/lib/types.ts
index 7c1e5e8d2..b71c75118 100644
--- a/typescript/client/src/lib/types.ts
+++ b/typescript/client/src/lib/types.ts
@@ -65,13 +65,13 @@ export type GPTClassColours = {
// css properties => css
// null -> no styling
[V in ClassConfigs[GPT][C]["values"][number]["id"]]:
+ | ({ shine?: boolean } & CSSProperties)
| "danger"
| "info"
| "primary"
| "secondary"
| "success"
| "warning"
- | CSSProperties
| null;
};
};
diff --git a/typescript/client/src/styles/utilities/animations.scss b/typescript/client/src/styles/utilities/animations.scss
index 0db45da03..dd62ab4dd 100644
--- a/typescript/client/src/styles/utilities/animations.scss
+++ b/typescript/client/src/styles/utilities/animations.scss
@@ -6,3 +6,35 @@
opacity: 1;
}
}
+
+@keyframes shine {
+ 0% {
+ top: -150%;
+ left: -150%;
+ }
+ 100% {
+ top: 150%;
+ left: 150%;
+ }
+}
+
+.shine {
+ position: relative;
+ overflow: hidden;
+}
+
+.shine::before {
+ background: linear-gradient(
+ transparent,
+ rgba(255, 255, 255, 0.5) 50%,
+ transparent
+ );
+ content: "";
+ display: block;
+ width: 150%;
+ height: 2rem;
+ position: absolute;
+ transform: rotate(-45deg);
+ animation: shine 4s infinite ease-in-out;
+ z-index: 100;
+}
\ No newline at end of file
diff --git a/typescript/common/src/config/game-support/ongeki.ts b/typescript/common/src/config/game-support/ongeki.ts
index e3f1882d4..731c31e52 100644
--- a/typescript/common/src/config/game-support/ongeki.ts
+++ b/typescript/common/src/config/game-support/ongeki.ts
@@ -23,7 +23,8 @@ export const GAME_GROUP_ONGEKI_CONF = {
"LUNATIC",
"ボーナストラック",
]),
- duration: z.number(),
+ duration: z.number().nullable(),
+ flavorGenre: z.string().optional(),
}),
} as const satisfies INTERNAL_GAME_GROUP_CONFIG;
@@ -39,7 +40,8 @@ export const OngekiColours = [
ClassValue("PLATINUM", "鉑", "Platinum: 18.000~18.999 Rating"),
ClassValue("RAINBOW", "虹", "Rainbow: 19.000~19.999 Rating"),
ClassValue("RAINBOW_SHINY", "虹(光)", "Rainbow Shiny: 20.000~20.999 Rating"),
- ClassValue("RAINBOW_EX", "虹(極)", "Rainbow Extreme: 21.000~ Rating"),
+ ClassValue("RAINBOW_EX", "虹(極)", "Rainbow Extreme: 21.000~21.999 Rating"),
+ ClassValue("RAINBOW_EX_TRUE", "虹(極)・真", "Rainbow Extreme (True): 22.000~ Rating"),
];
export const GAME_ONGEKI_CONF = {
@@ -228,11 +230,11 @@ export const GAME_ONGEKI_CONF = {
"オンゲキ bright MEMORY Act.3",
"オンゲキ Re:Fresh",
]),
+ isBonusTrack: z.boolean(),
isReMaster: z.boolean().optional(),
- maxPlatScore: z.number().int(),
- inGameID: z.number().int(),
+ maxPlatScore: z.number().int().nonnegative(),
+ inGameID: z.number().int().nonnegative().nullable(),
chartViewURL: z.string().optional(),
- isBonusTrack: z.boolean().optional(),
}),
preferences: z.strictObject({}),
diff --git a/typescript/common/src/constants/game.ts b/typescript/common/src/constants/game.ts
index ede5a2fde..9ee014504 100644
--- a/typescript/common/src/constants/game.ts
+++ b/typescript/common/src/constants/game.ts
@@ -612,6 +612,7 @@ export enum ONGEKI_COLOURS {
PURPLE = 4,
RAINBOW = 9,
RAINBOW_EX = 11,
+ RAINBOW_EX_TRUE = 12,
RAINBOW_SHINY = 10,
RED = 3,
SILVER = 6,
diff --git a/typescript/server/src/game-implementations/games/jubeat.ts b/typescript/server/src/game-implementations/games/jubeat.ts
index 829932841..53b9df77c 100644
--- a/typescript/server/src/game-implementations/games/jubeat.ts
+++ b/typescript/server/src/game-implementations/games/jubeat.ts
@@ -106,7 +106,7 @@ export async function GetBestJubilityOnSongs(
return Promise.all(rows.rows.map((row) => ToPbScoreDocument(row)));
}
-const CURRENT_JUBEAT_HOT_VERSION: Versions["jubeat"] = "ave";
+const CURRENT_JUBEAT_HOT_VERSION: Versions["jubeat"] = "beyond";
export async function GetPBsForJubility(userID: integer) {
const hotSongRows = await DB.selectFrom("song")
diff --git a/typescript/server/src/game-implementations/games/ongeki.test.ts b/typescript/server/src/game-implementations/games/ongeki.test.ts
index cfa2f5caf..a27670fae 100644
--- a/typescript/server/src/game-implementations/games/ongeki.test.ts
+++ b/typescript/server/src/game-implementations/games/ongeki.test.ts
@@ -293,6 +293,8 @@ describe("ONGEKI_IMPL", () => {
c(19, "RAINBOW");
c(20, "RAINBOW_SHINY");
c(21, "RAINBOW_EX");
+ c(22, "RAINBOW_EX_TRUE");
+ c(23, "RAINBOW_EX_TRUE");
});
});
diff --git a/typescript/server/src/game-implementations/games/ongeki.ts b/typescript/server/src/game-implementations/games/ongeki.ts
index f488205a2..b51c034a7 100644
--- a/typescript/server/src/game-implementations/games/ongeki.ts
+++ b/typescript/server/src/game-implementations/games/ongeki.ts
@@ -16,8 +16,13 @@ import {
import { GoalFmtScore, GoalOutOfFmtScore, GradeGoalFormatter } from "./_common";
-const isUnranked = (chart: ChartDocument<"ongeki">) =>
- (chart.data.inGameID >= 7000 && chart.data.inGameID < 8000) || chart.levelNum === 0.0;
+const isUnranked = (chart: ChartDocument<"ongeki">) => {
+ const ig = chart.data.inGameID;
+ return (
+ (ig !== null && ig >= 7000 && ig < 8000) ||
+ chart.levelNum === 0.0
+ );
+};
const starCount = (platinumScore: number, maxPlatinumScore: number) => {
const pct = Math.floor((platinumScore / maxPlatinumScore) * 100);
@@ -113,7 +118,9 @@ export const ONGEKI_IMPL: GameImplementation<"ongeki"> = {
return { colour: null };
}
- if (rating >= 21) {
+ if (rating >= 22) {
+ return { colour: "RAINBOW_EX_TRUE" };
+ } else if (rating >= 21) {
return { colour: "RAINBOW_EX" };
} else if (rating >= 20) {
return { colour: "RAINBOW_SHINY" };
@@ -230,9 +237,11 @@ export const ONGEKI_IMPL: GameImplementation<"ongeki"> = {
}
}
- if (s.scoreData.bellLamp === "FULL BELL" && s.scoreData.noteLamp === "LOSS") {
- return "Cannot have a LOSS with a FULL BELL.";
- }
+ // LMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAO
+ // if (s.scoreData.bellLamp === "FULL BELL" && s.scoreData.noteLamp === "LOSS") {
+ // return "Cannot have a LOSS with a FULL BELL.";
+ // }
+ // LMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAO
if (s.scoreData.platinumScore > chart.data.maxPlatScore) {
return `Cannot have ${s.scoreData.platinumScore}/${chart.data.maxPlatScore} Platinum Score.`;
diff --git a/typescript/server/src/lib/builtin-clients/builtin-clients.ts b/typescript/server/src/lib/builtin-clients/builtin-clients.ts
index ebaf69c94..bf95068df 100644
--- a/typescript/server/src/lib/builtin-clients/builtin-clients.ts
+++ b/typescript/server/src/lib/builtin-clients/builtin-clients.ts
@@ -240,6 +240,47 @@ EnableGraphs = true
#
# If present, an * matches everyone else`,
},
+ {
+ clientID: "CXRizu",
+ requestedPermissions: ["submit_score"],
+ name: "Rizu",
+ redirectUri: null,
+ webhookUri: null,
+ apiKeyFilename: "Rizu.cfg",
+ apiKeyTemplate: `[General]
+
+## Whether to enable score submissions
+# Setting type: Boolean
+# Default value: true
+Enable = true
+
+## Timeout for score submission in seconds
+# Setting type: Int32
+# Default value: 30
+NetworkTimeout = 30
+
+## Folder for storing imports that failed due to network errors.
+## Leave empty to disable
+# Setting type: String
+# Default value: UserData/Rizu/FailedImports
+FailedImportsFolder = UserData/Rizu/FailedImports
+
+[Keys]
+
+## Kamaitachi API keys to use for score submissions, in the format
+## of \` = \`. The \`default\` key is used as fallback
+## if an access code does not have an API key set, and can be removed.
+# Setting type: String
+# Default value:
+default = %%TACHI_KEY%%
+
+[Tachi]
+
+## Tachi instance base URL
+# Setting type: String
+# Default value: https://kamai.tachi.ac
+BaseUrl = ${ServerConfig.OUR_URL}`,
+ },
];
const BokuDefaultClients: DefaultClients = [
diff --git a/typescript/server/src/lib/score-import/import-types/common/api-cg/jb/converter.ts b/typescript/server/src/lib/score-import/import-types/common/api-cg/jb/converter.ts
index c0967bdc8..1358d4552 100644
--- a/typescript/server/src/lib/score-import/import-types/common/api-cg/jb/converter.ts
+++ b/typescript/server/src/lib/score-import/import-types/common/api-cg/jb/converter.ts
@@ -119,6 +119,8 @@ function ConvertVersion(ver: number): Versions["jubeat"] {
return "festo";
case 11:
return "ave";
+ case 12:
+ return "beyond";
}
throw new InvalidScoreFailure(`Unknown Game Version ${ver}.`);
diff --git a/typescript/server/src/services/pg/seeds.ts b/typescript/server/src/services/pg/seeds.ts
index 4c61322c1..7aa360a4e 100644
--- a/typescript/server/src/services/pg/seeds.ts
+++ b/typescript/server/src/services/pg/seeds.ts
@@ -9,6 +9,7 @@ import {
type SEEDS_QuestlineDocument,
type SEEDS_SongDocument,
type SEEDS_TableDocument,
+ type V3Game,
} from "tachi-common";
/* eslint-disable no-await-in-loop */
import type {
diff --git a/typescript/server/src/test-utils/test-data.ts b/typescript/server/src/test-utils/test-data.ts
index 24b723ad4..856a81d48 100644
--- a/typescript/server/src/test-utils/test-data.ts
+++ b/typescript/server/src/test-utils/test-data.ts
@@ -719,8 +719,9 @@ export const CHUNITHMBBKKSong: SongDocument<"chunithm"> = {
altTitles: [],
artist: "nora2r",
data: {
- duration: 128.541,
genre: "VARIETY",
+ duration: 128.541,
+ displayVersion: "CHUNITHM",
},
id: "S19d35e0b935765ded25",
searchTerms: [],
@@ -736,7 +737,6 @@ export const CHUNITHMBBKKChart: ChartDocument<"chunithm"> = {
level: "3",
data: {
inGameID: 3,
- displayVersion: "CHUNITHM",
},
isPrimary: true,
versions: ["paradiselost"],
@@ -1485,6 +1485,7 @@ export const TestingOngekiChart: ChartDocument<"ongeki"> = {
displayVersion: "オンゲキ bright MEMORY Act.3",
inGameID: 2137,
maxPlatScore: 1000,
+ isBonusTrack: false,
},
difficulty: "MASTER",
isPrimary: true,
@@ -1537,6 +1538,7 @@ export const TestingOngekiChartConverter: ChartDocument<"ongeki"> = {
displayVersion: "オンゲキ bright",
inGameID: 678,
maxPlatScore: 2768,
+ isBonusTrack: false,
},
difficulty: "MASTER",
isPrimary: true,
@@ -1552,6 +1554,7 @@ export const TestingChunithmSongConverter: SongDocument<"chunithm"> = {
data: {
genre: "POPS & ANIME",
duration: 120,
+ displayVersion: "CHUNITHM CRYSTAL PLUS",
},
id: "s956",
searchTerms: [],
@@ -1562,7 +1565,6 @@ export const TestingChunithmChartConverter: ChartDocument<"chunithm"> = {
game: "chunithm",
chartID: "fbba26a6a223b1dd0bf8ef139cfee83114b91086",
data: {
- displayVersion: "CHUNITHM CRYSTAL PLUS",
inGameID: 956,
},
difficulty: "MASTER",
@@ -1579,6 +1581,7 @@ export const TestingChunithmWESongConverter: SongDocument<"chunithm"> = {
data: {
duration: 135.275,
genre: "VARIETY",
+ displayVersion: "CHUNITHM NEW PLUS",
},
id: "S19d35e0c127c7e441ce",
searchTerms: ["xl techno more dance"],
@@ -1588,7 +1591,6 @@ export const TestingChunithmWESongConverter: SongDocument<"chunithm"> = {
export const TestingChunithmWEChartConverter: ChartDocument<"chunithm"> = {
game: "chunithm",
data: {
- displayVersion: "CHUNITHM NEW PLUS",
inGameID: 8235,
},
difficulty: "割☆4",