diff --git a/AquaNet/src/libs/generalTypes.ts b/AquaNet/src/libs/generalTypes.ts index 979ffd09..99e72948 100644 --- a/AquaNet/src/libs/generalTypes.ts +++ b/AquaNet/src/libs/generalTypes.ts @@ -42,7 +42,6 @@ export interface CardSummary { ongeki: CardSummaryGame | null diva: CardSummaryGame | null wacca: CardSummaryGame | null - auto: CardSummaryGame | null // let's pretend this just doesn't exist } diff --git a/AquaNet/src/libs/scoring.ts b/AquaNet/src/libs/scoring.ts index eb4c76ad..26bd59c6 100644 --- a/AquaNet/src/libs/scoring.ts +++ b/AquaNet/src/libs/scoring.ts @@ -1,7 +1,7 @@ import { DATA_HOST } from "./config" import type { MusicMeta } from "./generalTypes" -export type GameName = 'mai2' | 'chu3' | 'ongeki' | 'wacca' | 'auto' +export type GameName = 'mai2' | 'chu3' | 'ongeki' | 'wacca' const multTable = { 'mai2': [ @@ -68,8 +68,6 @@ const multTable = { [ 1.0, 0, 'C' ], [ 0.0, 0, 'D' ] ], - - 'auto': [] } export function getMult(achievement: number, game: GameName) { diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte index db833584..f58524d4 100644 --- a/AquaNet/src/pages/UserHome.svelte +++ b/AquaNet/src/pages/UserHome.svelte @@ -30,14 +30,14 @@ registerChart() export let username: string; - export let game: GameName = "auto" + export let game: GameName | "auto" = "auto" let calElement: HTMLElement let error: string; let me: AquaNetUser title(`User ${username}`) const rounding = useLocalStorage("rounding", true); - const titleText = GAME_TITLE[game] + const titleText = game != "auto" ? GAME_TITLE[game] : "?" interface MusicAndPlay extends MusicMeta, GenericGamePlaylog {} @@ -122,6 +122,7 @@ else error = t("UserHome.InvalidGame", {game}) const setRival = (isAdd: boolean) => { + if (game == "auto") return; isLoading = true GAME.setRival(game, username, isAdd).then(() => { d!.user.rival = isAdd @@ -309,12 +310,14 @@ - - - + + + + + - +

{t('UserHome.RecentScores')}

@@ -335,12 +338,12 @@ {r.notes?.[r.level === 10 ? 0 : r.level]?.lv?.toFixed(1) ?? r.worldsEndTag ?? '-'} - - {("" + getMult(r.achievement, game)[2]).replace("p", "+")} + + {("" + getMult(r.achievement, game != "auto" ? game : "mai2")[2]).replace("p", "+")} { rounding.value ? - roundFloor(r.achievement, game, 1) : + roundFloor(r.achievement, game != "auto" ? game : "mai2", 1) : (r.achievement / 10000).toFixed(4) }%