-
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: initial ongeki support * feat: initial ongeki seeds * chore: link to a basic score exporter * fix: unhardcode the colSpan of score dropdowns Fixes ongeki and doesn't break chunithm * fix: make bellCount optional to match judgements and damage * docs: add a page for Ongeki * feat: ongeki seeder * feat: implement isHot Also restore Arcaea to test.conf.json5 (it was a mistake) * fix: add isHot to the seeder * fix: proper handling of re:masters Also change non-full-bell from an empty string to "NONE", for clarity * docs: document the re:master fix * feat: update rg-stats to 0.5.5 enables ongeki calcs * chore: lockfile * fix: get rid of scales as they're unused * fix: update name->NAME * minrelevantvalue should be one of the values? * fix: add property that must be there? * fix: jesus christ the tests are loud * better docs on mrv * fix: remove platdelta, make platscore optional * fix: grade B tests oh my god * fix: rating check * fix: pb merge check * fix: pb merge check #2 * fix: use nowrap in all lamp cells * fix: tidy up platcell * fix: all of these MUST be part of scoreID * fix: remove unused code * feat: remove note counts & isHot * chore: bump rg-stats --------- Co-authored-by: zkldi <20380519+zkldi@users.noreply.github.com>
- Loading branch information
Showing
39 changed files
with
82,721 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
client/src/app/pages/dashboard/import/OngekiArtemisExportPage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import useSetSubheader from "components/layout/header/useSetSubheader"; | ||
import Divider from "components/util/Divider"; | ||
import ExternalLink from "components/util/ExternalLink"; | ||
import { TachiConfig } from "lib/config"; | ||
import React from "react"; | ||
|
||
export default function OngekiArtemisExport() { | ||
useSetSubheader(["Import Scores", "O.N.G.E.K.I. ARTEMiS Exporter"]); | ||
|
||
return ( | ||
<div> | ||
<h1 className="text-center mb-4">What is the ARTEMiS Exporter?</h1> | ||
<div> | ||
The Artemis Exporter is a script that will export your O.N.G.E.K.I. scores from an | ||
ARTEMiS instance to a BATCH-MANUAL JSON for import to {TachiConfig.NAME}. You will | ||
need direct access to the server instance. | ||
</div> | ||
<Divider /> | ||
<h1 className="text-center my-4">Setup Instructions</h1> | ||
Instructions are available on{" "} | ||
<ExternalLink href="https://gist.github.com/nyairobi/ffdf9e674f31987b1ffbd38d31b55f6c"> | ||
the GitHub gist | ||
</ExternalLink> | ||
. | ||
</div> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
client/src/components/tables/cells/OngekiJudgementCell.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import { IsNullish } from "util/misc"; | ||
import React from "react"; | ||
import { COLOUR_SET, PBScoreDocument, ScoreDocument } from "tachi-common"; | ||
|
||
export default function OngekiJudgementCell({ | ||
score, | ||
}: { | ||
score: ScoreDocument<"ongeki:Single"> | PBScoreDocument<"ongeki:Single">; | ||
}) { | ||
const judgements = score.scoreData.judgements; | ||
|
||
if ( | ||
IsNullish(judgements.miss) || | ||
IsNullish(judgements.hit) || | ||
IsNullish(judgements.break) || | ||
IsNullish(judgements.cbreak) | ||
) { | ||
return <td>No Data.</td>; | ||
} | ||
|
||
return ( | ||
<td> | ||
<strong> | ||
<div> | ||
<span style={{ color: COLOUR_SET.gold }}>{judgements.cbreak}</span>- | ||
<span style={{ color: COLOUR_SET.orange }}>{judgements.break}</span>- | ||
<span style={{ color: COLOUR_SET.vibrantBlue }}>{judgements.hit}</span>- | ||
<span style={{ color: COLOUR_SET.gray }}>{judgements.miss}</span> | ||
</div> | ||
<div> | ||
<span style={{ color: COLOUR_SET.vibrantYellow }}> | ||
{score.scoreData.optional.bellCount ?? "?"}/ | ||
{score.scoreData.optional.totalBellCount ?? "?"} | ||
</span> | ||
<span style={{ color: COLOUR_SET.red, marginLeft: "0.5em" }}> | ||
{score.scoreData.optional.damage ?? "?"} | ||
</span> | ||
</div> | ||
</strong> | ||
</td> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import { ChangeOpacity } from "util/color-opacity"; | ||
import React from "react"; | ||
|
||
export default function OngekiLampCell({ | ||
lamp1, | ||
lamp2, | ||
colour, | ||
}: { | ||
lamp1: string; | ||
lamp2: string; | ||
colour: string; | ||
}) { | ||
let content = <div>{lamp1}</div>; | ||
|
||
if (lamp2 !== "NONE") { | ||
if (lamp1 === "CLEAR") { | ||
content = <div>{lamp2}</div>; | ||
} else { | ||
content = ( | ||
<span> | ||
<div>{lamp1}</div> | ||
<div>{lamp2}</div> | ||
</span> | ||
); | ||
} | ||
} | ||
|
||
return ( | ||
<td | ||
style={{ | ||
backgroundColor: ChangeOpacity(colour, 0.2), | ||
whiteSpace: "nowrap", | ||
}} | ||
> | ||
<strong>{content}</strong> | ||
</td> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.