mirror of https://github.com/hykilpikonna/AquaDX
refactor: don't add unnecessary game types
parent
d28b9bf5a8
commit
344f62c275
|
@ -42,7 +42,6 @@ export interface CardSummary {
|
||||||
ongeki: CardSummaryGame | null
|
ongeki: CardSummaryGame | null
|
||||||
diva: CardSummaryGame | null
|
diva: CardSummaryGame | null
|
||||||
wacca: CardSummaryGame | null
|
wacca: CardSummaryGame | null
|
||||||
auto: CardSummaryGame | null // let's pretend this just doesn't exist
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { DATA_HOST } from "./config"
|
import { DATA_HOST } from "./config"
|
||||||
import type { MusicMeta } from "./generalTypes"
|
import type { MusicMeta } from "./generalTypes"
|
||||||
|
|
||||||
export type GameName = 'mai2' | 'chu3' | 'ongeki' | 'wacca' | 'auto'
|
export type GameName = 'mai2' | 'chu3' | 'ongeki' | 'wacca'
|
||||||
|
|
||||||
const multTable = {
|
const multTable = {
|
||||||
'mai2': [
|
'mai2': [
|
||||||
|
@ -68,8 +68,6 @@ const multTable = {
|
||||||
[ 1.0, 0, 'C' ],
|
[ 1.0, 0, 'C' ],
|
||||||
[ 0.0, 0, 'D' ]
|
[ 0.0, 0, 'D' ]
|
||||||
],
|
],
|
||||||
|
|
||||||
'auto': []
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getMult(achievement: number, game: GameName) {
|
export function getMult(achievement: number, game: GameName) {
|
||||||
|
|
|
@ -30,14 +30,14 @@
|
||||||
registerChart()
|
registerChart()
|
||||||
|
|
||||||
export let username: string;
|
export let username: string;
|
||||||
export let game: GameName = "auto"
|
export let game: GameName | "auto" = "auto"
|
||||||
let calElement: HTMLElement
|
let calElement: HTMLElement
|
||||||
let error: string;
|
let error: string;
|
||||||
let me: AquaNetUser
|
let me: AquaNetUser
|
||||||
title(`User ${username}`)
|
title(`User ${username}`)
|
||||||
const rounding = useLocalStorage("rounding", true);
|
const rounding = useLocalStorage("rounding", true);
|
||||||
|
|
||||||
const titleText = GAME_TITLE[game]
|
const titleText = game != "auto" ? GAME_TITLE[game] : "?"
|
||||||
|
|
||||||
interface MusicAndPlay extends MusicMeta, GenericGamePlaylog {}
|
interface MusicAndPlay extends MusicMeta, GenericGamePlaylog {}
|
||||||
|
|
||||||
|
@ -122,6 +122,7 @@
|
||||||
else error = t("UserHome.InvalidGame", {game})
|
else error = t("UserHome.InvalidGame", {game})
|
||||||
|
|
||||||
const setRival = (isAdd: boolean) => {
|
const setRival = (isAdd: boolean) => {
|
||||||
|
if (game == "auto") return;
|
||||||
isLoading = true
|
isLoading = true
|
||||||
GAME.setRival(game, username, isAdd).then(() => {
|
GAME.setRival(game, username, isAdd).then(() => {
|
||||||
d!.user.rival = isAdd
|
d!.user.rival = isAdd
|
||||||
|
@ -309,12 +310,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<RatingComposition title="B30" comp={d.user.ratingComposition.best30} {allMusics} {game}/>
|
<!-- I don't like doing this but it may be preferable to gaslighting the types -->
|
||||||
<RatingComposition title="B35" comp={d.user.ratingComposition.best35} {allMusics} {game}/>
|
|
||||||
<RatingComposition title="B15" comp={d.user.ratingComposition.best15} {allMusics} {game}/>
|
<RatingComposition title="B30" comp={d.user.ratingComposition.best30} {allMusics} game={game != "auto" ? game : "mai2"}/>
|
||||||
|
<RatingComposition title="B35" comp={d.user.ratingComposition.best35} {allMusics} game={game != "auto" ? game : "mai2"}/>
|
||||||
|
<RatingComposition title="B15" comp={d.user.ratingComposition.best15} {allMusics} game={game != "auto" ? game : "mai2"}/>
|
||||||
<!-- <RatingComposition title="Hot 10" comp={d.user.ratingComposition.hot10} {allMusics} {game}/> -->
|
<!-- <RatingComposition title="Hot 10" comp={d.user.ratingComposition.hot10} {allMusics} {game}/> -->
|
||||||
<!-- <RatingComposition title="N10" comp={d.user.ratingComposition.next10} {allMusics} {game}/> -->
|
<!-- <RatingComposition title="N10" comp={d.user.ratingComposition.next10} {allMusics} {game}/> -->
|
||||||
<RatingComposition title="Recent 10" comp={d.user.ratingComposition.recent10} {allMusics} {game} top={10}/>
|
<RatingComposition title="Recent 10" comp={d.user.ratingComposition.recent10} {allMusics} game={game != "auto" ? game : "mai2"} top={10}/>
|
||||||
|
|
||||||
<div class="recent">
|
<div class="recent">
|
||||||
<h2>{t('UserHome.RecentScores')}</h2>
|
<h2>{t('UserHome.RecentScores')}</h2>
|
||||||
|
@ -335,12 +338,12 @@
|
||||||
{r.notes?.[r.level === 10 ? 0 : r.level]?.lv?.toFixed(1) ?? r.worldsEndTag ?? '-'}
|
{r.notes?.[r.level === 10 ? 0 : r.level]?.lv?.toFixed(1) ?? r.worldsEndTag ?? '-'}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
<span class={`rank-${getMult(r.achievement, game)[2].toString()[0]}`}>
|
<span class={`rank-${getMult(r.achievement, game != "auto" ? game : "mai2")[2].toString()[0]}`}>
|
||||||
<span class="rank-text">{("" + getMult(r.achievement, game)[2]).replace("p", "+")}</span>
|
<span class="rank-text">{("" + getMult(r.achievement, game != "auto" ? game : "mai2")[2]).replace("p", "+")}</span>
|
||||||
<span class="rank-num" use:tooltip={(r.achievement / 10000).toFixed(4)}>
|
<span class="rank-num" use:tooltip={(r.achievement / 10000).toFixed(4)}>
|
||||||
{
|
{
|
||||||
rounding.value ?
|
rounding.value ?
|
||||||
roundFloor(r.achievement, game, 1) :
|
roundFloor(r.achievement, game != "auto" ? game : "mai2", 1) :
|
||||||
(r.achievement / 10000).toFixed(4)
|
(r.achievement / 10000).toFixed(4)
|
||||||
}%
|
}%
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in New Issue