From 4f847d8bbdd517840e07766059b8d33b6eb341f7 Mon Sep 17 00:00:00 2001 From: Meta-link Date: Mon, 26 Dec 2022 17:46:00 +0100 Subject: [PATCH 1/3] Add missing colors to SDVX dans and volforce levels --- common/src/game-classes.ts | 98 +++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/common/src/game-classes.ts b/common/src/game-classes.ts index 67a8b8944..8e7a8c071 100644 --- a/common/src/game-classes.ts +++ b/common/src/game-classes.ts @@ -194,61 +194,61 @@ export const BMSScratchDans: Array = [ ]; export const SDVXDans: Array = [ - mouseoverCSS("DAN_1", "LV.01", "1st Dan"), - mouseoverCSS("DAN_2", "LV.02", "2nd Dan"), - mouseoverCSS("DAN_3", "LV.03", "3rd Dan"), - mouseoverCSS("DAN_4", "LV.04", "4th Dan"), - mouseoverCSS("DAN_5", "LV.05", "5th Dan"), - mouseoverCSS("DAN_6", "LV.06", "6th Dan"), - mouseoverCSS("DAN_7", "LV.07", "7th Dan"), - mouseoverCSS("DAN_8", "LV.08", "8th Dan"), - mouseoverCSS("DAN_9", "LV.09", "9th Dan"), + mouseoverCSS("DAN_1", "LV.01", "1st Dan", "red"), + mouseoverCSS("DAN_2", "LV.02", "2nd Dan", "paleBlue"), + mouseoverCSS("DAN_3", "LV.03", "3rd Dan", "gold"), + mouseoverCSS("DAN_4", "LV.04", "4th Dan", "gray"), + mouseoverCSS("DAN_5", "LV.05", "5th Dan", "teal"), + mouseoverCSS("DAN_6", "LV.06", "6th Dan", "blue"), + mouseoverCSS("DAN_7", "LV.07", "7th Dan", "vibrantPink"), + mouseoverCSS("DAN_8", "LV.08", "8th Dan", "pink"), + mouseoverCSS("DAN_9", "LV.09", "9th Dan", "white"), mouseoverVariant("DAN_10", "LV.10", "10th Dan", "warning"), mouseoverVariant("DAN_11", "LV.11", "11th Dan", "danger"), mouseoverCSS("INF", "LV.INF", "Inf. Dan", "purple", "gold"), ]; export const SDVXVFClasses: Array = [ - mouseoverCSS("SIENNA_I", "Sienna I", "0 - 2.499VF"), - mouseoverCSS("SIENNA_II", "Sienna II", "2.5 - 4.999VF"), - mouseoverCSS("SIENNA_III", "Sienna III", "5.0 - 7.499VF"), - mouseoverCSS("SIENNA_IV", "Sienna IV", "7.5 - 9.999VF"), - mouseoverCSS("COBALT_I", "Cobalt I", "10 - 10.499VF"), - mouseoverCSS("COBALT_II", "Cobalt II", "10.5 - 10.999VF"), - mouseoverCSS("COBALT_III", "Cobalt III", "11 - 11.499VF"), - mouseoverCSS("COBALT_IV", "Cobalt IV", "11.5 - 11.999VF"), - mouseoverCSS("DANDELION_I", "Dandelion I", "12 - 12.499VF"), - mouseoverCSS("DANDELION_II", "Dandelion II", "12.5 - 12.999VF"), - mouseoverCSS("DANDELION_III", "Dandelion III", "13 - 13.499VF"), - mouseoverCSS("DANDELION_IV", "Dandelion IV", "13.5 - 13.999VF"), - mouseoverCSS("CYAN_I", "Cyan I", "14 - 14.249VF"), - mouseoverCSS("CYAN_II", "Cyan II", "14.25 - 14.499VF"), - mouseoverCSS("CYAN_III", "Cyan III", "14.5 - 14.749VF"), - mouseoverCSS("CYAN_IV", "Cyan IV", "14.75 - 14.999VF"), - mouseoverCSS("SCARLET_I", "Scarlet I", "15 - 15.249VF"), - mouseoverCSS("SCARLET_II", "Scarlet II", "15.25 - 15.499VF"), - mouseoverCSS("SCARLET_III", "Scarlet III", "15.5 - 15.749VF"), - mouseoverCSS("SCARLET_IV", "Scarlet IV", "15.75 - 15.999VF"), - mouseoverCSS("CORAL_I", "Coral I", "16 - 16.249VF"), - mouseoverCSS("CORAL_II", "Coral II", "16.25 - 16.499VF"), - mouseoverCSS("CORAL_III", "Coral III", "16.5 - 16.749VF"), - mouseoverCSS("CORAL_IV", "Coral IV", "16.75 - 16.999VF"), - mouseoverCSS("ARGENTO_I", "Argento I", "17 - 17.249VF"), - mouseoverCSS("ARGENTO_II", "Argento II", "17.25 - 17.499VF"), - mouseoverCSS("ARGENTO_III", "Argento III", "17.5 - 17.749VF"), - mouseoverCSS("ARGENTO_IV", "Argento IV", "17.75 - 17.999VF"), - mouseoverCSS("ELDORA_I", "Eldora I", "18 - 18.249VF"), - mouseoverCSS("ELDORA_II", "Eldora II", "18.25 - 18.499VF"), - mouseoverCSS("ELDORA_III", "Eldora III", "18.5 - 18.749VF"), - mouseoverCSS("ELDORA_IV", "Eldora IV", "18.75 - 18.999VF"), - mouseoverCSS("CRIMSON_I", "Crimson I", "19 - 19.249VF"), - mouseoverCSS("CRIMSON_II", "Crimson II", "19.25 - 19.499VF"), - mouseoverCSS("CRIMSON_III", "Crimson III", "19.5 - 19.749VF"), - mouseoverCSS("CRIMSON_IV", "Crimson IV", "19.75 - 19.999VF"), - mouseoverCSS("IMPERIAL_I", "Imperial I", "20 - 20.999VF"), - mouseoverCSS("IMPERIAL_II", "Imperial II", "21 - 21.999VF"), - mouseoverCSS("IMPERIAL_III", "Imperial III", "22 - 22.999VF"), - mouseoverCSS("IMPERIAL_IV", "Imperial IV", ">23VF"), + mouseoverCSS("SIENNA_I", "Sienna I", "0 - 2.499VF", "red"), + mouseoverCSS("SIENNA_II", "Sienna II", "2.5 - 4.999VF", "red"), + mouseoverCSS("SIENNA_III", "Sienna III", "5.0 - 7.499VF", "red"), + mouseoverCSS("SIENNA_IV", "Sienna IV", "7.5 - 9.999VF", "red"), + mouseoverCSS("COBALT_I", "Cobalt I", "10 - 10.499VF", "paleBlue"), + mouseoverCSS("COBALT_II", "Cobalt II", "10.5 - 10.999VF", "paleBlue"), + mouseoverCSS("COBALT_III", "Cobalt III", "11 - 11.499VF", "paleBlue"), + mouseoverCSS("COBALT_IV", "Cobalt IV", "11.5 - 11.999VF", "paleBlue"), + mouseoverCSS("DANDELION_I", "Dandelion I", "12 - 12.499VF", "gold"), + mouseoverCSS("DANDELION_II", "Dandelion II", "12.5 - 12.999VF", "gold"), + mouseoverCSS("DANDELION_III", "Dandelion III", "13 - 13.499VF", "gold"), + mouseoverCSS("DANDELION_IV", "Dandelion IV", "13.5 - 13.999VF", "gold"), + mouseoverCSS("CYAN_I", "Cyan I", "14 - 14.249VF", "teal"), + mouseoverCSS("CYAN_II", "Cyan II", "14.25 - 14.499VF", "teal"), + mouseoverCSS("CYAN_III", "Cyan III", "14.5 - 14.749VF", "teal"), + mouseoverCSS("CYAN_IV", "Cyan IV", "14.75 - 14.999VF", "teal"), + mouseoverCSS("SCARLET_I", "Scarlet I", "15 - 15.249VF", "vibrantPink"), + mouseoverCSS("SCARLET_II", "Scarlet II", "15.25 - 15.499VF", "vibrantPink"), + mouseoverCSS("SCARLET_III", "Scarlet III", "15.5 - 15.749VF", "vibrantPink"), + mouseoverCSS("SCARLET_IV", "Scarlet IV", "15.75 - 15.999VF", "vibrantPink"), + mouseoverCSS("CORAL_I", "Coral I", "16 - 16.249VF", "pink"), + mouseoverCSS("CORAL_II", "Coral II", "16.25 - 16.499VF", "pink"), + mouseoverCSS("CORAL_III", "Coral III", "16.5 - 16.749VF", "pink"), + mouseoverCSS("CORAL_IV", "Coral IV", "16.75 - 16.999VF", "pink"), + mouseoverCSS("ARGENTO_I", "Argento I", "17 - 17.249VF", "white"), + mouseoverCSS("ARGENTO_II", "Argento II", "17.25 - 17.499VF", "white"), + mouseoverCSS("ARGENTO_III", "Argento III", "17.5 - 17.749VF", "white"), + mouseoverCSS("ARGENTO_IV", "Argento IV", "17.75 - 17.999VF", "white"), + mouseoverCSS("ELDORA_I", "Eldora I", "18 - 18.249VF", "warning"), + mouseoverCSS("ELDORA_II", "Eldora II", "18.25 - 18.499VF", "warning"), + mouseoverCSS("ELDORA_III", "Eldora III", "18.5 - 18.749VF", "warning"), + mouseoverCSS("ELDORA_IV", "Eldora IV", "18.75 - 18.999VF", "warning"), + mouseoverCSS("CRIMSON_I", "Crimson I", "19 - 19.249VF", "vibrantRed"), + mouseoverCSS("CRIMSON_II", "Crimson II", "19.25 - 19.499VF", "vibrantRed"), + mouseoverCSS("CRIMSON_III", "Crimson III", "19.5 - 19.749VF", "vibrantRed"), + mouseoverCSS("CRIMSON_IV", "Crimson IV", "19.75 - 19.999VF", "vibrantRed"), + mouseoverCSS("IMPERIAL_I", "Imperial I", "20 - 20.999VF", "vibrantPurple"), + mouseoverCSS("IMPERIAL_II", "Imperial II", "21 - 21.999VF", "vibrantPurple"), + mouseoverCSS("IMPERIAL_III", "Imperial III", "22 - 22.999VF", "vibrantPurple"), + mouseoverCSS("IMPERIAL_IV", "Imperial IV", ">23VF", "vibrantPurple"), ]; export const CHUNITHMColours = [ From 99352f2c5a09f7fec51b2c1b9a18f5ee37516c51 Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Mon, 26 Dec 2022 17:14:14 +0000 Subject: [PATCH 2/3] feat: class badge visualiser --- .../games/_game/_playtype/GPTDevInfo.tsx | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/client/src/app/pages/dashboard/games/_game/_playtype/GPTDevInfo.tsx b/client/src/app/pages/dashboard/games/_game/_playtype/GPTDevInfo.tsx index 392ae02c4..90867f90a 100644 --- a/client/src/app/pages/dashboard/games/_game/_playtype/GPTDevInfo.tsx +++ b/client/src/app/pages/dashboard/games/_game/_playtype/GPTDevInfo.tsx @@ -1,8 +1,11 @@ +import ClassBadge from "components/game/ClassBadge"; import useSetSubheader from "components/layout/header/useSetSubheader"; import Card from "components/layout/page/Card"; +import MiniTable from "components/tables/components/MiniTable"; import DebugContent from "components/util/DebugContent"; import React from "react"; -import { FormatGame, GetGameConfig, GetGamePTConfig } from "tachi-common"; +import { FormatGame, GetGameConfig, GetGamePTConfig, IDStrings, gameClasses } from "tachi-common"; +import { GameClassSets } from "tachi-common/game-classes"; import { GamePT } from "types/react"; export default function GPTDevInfo({ game, playtype }: GamePT) { @@ -23,6 +26,29 @@ export default function GPTDevInfo({ game, playtype }: GamePT) { + +
+ {Object.entries(gptConfig.classHumanisedFormat).map(([classSet, value]) => ( +
+ + {value.map((e, i) => ( + + {e.id} + + + + + ))} + +
+ ))} +
+ ); } From 97002865cb4d355c96f33874b8a77f7dee1c425e Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Mon, 26 Dec 2022 17:22:31 +0000 Subject: [PATCH 3/3] fix: tidy up colours and make sure text colour is legible --- common/src/game-classes.ts | 95 +++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/common/src/game-classes.ts b/common/src/game-classes.ts index 8e7a8c071..f6ed0bd1a 100644 --- a/common/src/game-classes.ts +++ b/common/src/game-classes.ts @@ -1,6 +1,7 @@ // Classes refer to things like dans. // Not the JS construct. +import { COLOUR_SET } from "./constants/colour-set"; import type { IDStrings, integer } from "./types"; export interface ClassInfo { @@ -194,61 +195,61 @@ export const BMSScratchDans: Array = [ ]; export const SDVXDans: Array = [ - mouseoverCSS("DAN_1", "LV.01", "1st Dan", "red"), - mouseoverCSS("DAN_2", "LV.02", "2nd Dan", "paleBlue"), - mouseoverCSS("DAN_3", "LV.03", "3rd Dan", "gold"), + mouseoverCSS("DAN_1", "LV.01", "1st Dan", COLOUR_SET.red), + mouseoverCSS("DAN_2", "LV.02", "2nd Dan", COLOUR_SET.paleBlue), + mouseoverCSS("DAN_3", "LV.03", "3rd Dan", "gold", "black"), mouseoverCSS("DAN_4", "LV.04", "4th Dan", "gray"), - mouseoverCSS("DAN_5", "LV.05", "5th Dan", "teal"), + mouseoverCSS("DAN_5", "LV.05", "5th Dan", COLOUR_SET.teal, "black"), mouseoverCSS("DAN_6", "LV.06", "6th Dan", "blue"), - mouseoverCSS("DAN_7", "LV.07", "7th Dan", "vibrantPink"), - mouseoverCSS("DAN_8", "LV.08", "8th Dan", "pink"), - mouseoverCSS("DAN_9", "LV.09", "9th Dan", "white"), + mouseoverCSS("DAN_7", "LV.07", "7th Dan", COLOUR_SET.vibrantPink, "black"), + mouseoverCSS("DAN_8", "LV.08", "8th Dan", "pink", "black"), + mouseoverCSS("DAN_9", "LV.09", "9th Dan", "white", "black"), mouseoverVariant("DAN_10", "LV.10", "10th Dan", "warning"), mouseoverVariant("DAN_11", "LV.11", "11th Dan", "danger"), mouseoverCSS("INF", "LV.INF", "Inf. Dan", "purple", "gold"), ]; export const SDVXVFClasses: Array = [ - mouseoverCSS("SIENNA_I", "Sienna I", "0 - 2.499VF", "red"), - mouseoverCSS("SIENNA_II", "Sienna II", "2.5 - 4.999VF", "red"), - mouseoverCSS("SIENNA_III", "Sienna III", "5.0 - 7.499VF", "red"), - mouseoverCSS("SIENNA_IV", "Sienna IV", "7.5 - 9.999VF", "red"), - mouseoverCSS("COBALT_I", "Cobalt I", "10 - 10.499VF", "paleBlue"), - mouseoverCSS("COBALT_II", "Cobalt II", "10.5 - 10.999VF", "paleBlue"), - mouseoverCSS("COBALT_III", "Cobalt III", "11 - 11.499VF", "paleBlue"), - mouseoverCSS("COBALT_IV", "Cobalt IV", "11.5 - 11.999VF", "paleBlue"), - mouseoverCSS("DANDELION_I", "Dandelion I", "12 - 12.499VF", "gold"), - mouseoverCSS("DANDELION_II", "Dandelion II", "12.5 - 12.999VF", "gold"), - mouseoverCSS("DANDELION_III", "Dandelion III", "13 - 13.499VF", "gold"), - mouseoverCSS("DANDELION_IV", "Dandelion IV", "13.5 - 13.999VF", "gold"), - mouseoverCSS("CYAN_I", "Cyan I", "14 - 14.249VF", "teal"), - mouseoverCSS("CYAN_II", "Cyan II", "14.25 - 14.499VF", "teal"), - mouseoverCSS("CYAN_III", "Cyan III", "14.5 - 14.749VF", "teal"), - mouseoverCSS("CYAN_IV", "Cyan IV", "14.75 - 14.999VF", "teal"), - mouseoverCSS("SCARLET_I", "Scarlet I", "15 - 15.249VF", "vibrantPink"), - mouseoverCSS("SCARLET_II", "Scarlet II", "15.25 - 15.499VF", "vibrantPink"), - mouseoverCSS("SCARLET_III", "Scarlet III", "15.5 - 15.749VF", "vibrantPink"), - mouseoverCSS("SCARLET_IV", "Scarlet IV", "15.75 - 15.999VF", "vibrantPink"), - mouseoverCSS("CORAL_I", "Coral I", "16 - 16.249VF", "pink"), - mouseoverCSS("CORAL_II", "Coral II", "16.25 - 16.499VF", "pink"), - mouseoverCSS("CORAL_III", "Coral III", "16.5 - 16.749VF", "pink"), - mouseoverCSS("CORAL_IV", "Coral IV", "16.75 - 16.999VF", "pink"), - mouseoverCSS("ARGENTO_I", "Argento I", "17 - 17.249VF", "white"), - mouseoverCSS("ARGENTO_II", "Argento II", "17.25 - 17.499VF", "white"), - mouseoverCSS("ARGENTO_III", "Argento III", "17.5 - 17.749VF", "white"), - mouseoverCSS("ARGENTO_IV", "Argento IV", "17.75 - 17.999VF", "white"), - mouseoverCSS("ELDORA_I", "Eldora I", "18 - 18.249VF", "warning"), - mouseoverCSS("ELDORA_II", "Eldora II", "18.25 - 18.499VF", "warning"), - mouseoverCSS("ELDORA_III", "Eldora III", "18.5 - 18.749VF", "warning"), - mouseoverCSS("ELDORA_IV", "Eldora IV", "18.75 - 18.999VF", "warning"), - mouseoverCSS("CRIMSON_I", "Crimson I", "19 - 19.249VF", "vibrantRed"), - mouseoverCSS("CRIMSON_II", "Crimson II", "19.25 - 19.499VF", "vibrantRed"), - mouseoverCSS("CRIMSON_III", "Crimson III", "19.5 - 19.749VF", "vibrantRed"), - mouseoverCSS("CRIMSON_IV", "Crimson IV", "19.75 - 19.999VF", "vibrantRed"), - mouseoverCSS("IMPERIAL_I", "Imperial I", "20 - 20.999VF", "vibrantPurple"), - mouseoverCSS("IMPERIAL_II", "Imperial II", "21 - 21.999VF", "vibrantPurple"), - mouseoverCSS("IMPERIAL_III", "Imperial III", "22 - 22.999VF", "vibrantPurple"), - mouseoverCSS("IMPERIAL_IV", "Imperial IV", ">23VF", "vibrantPurple"), + mouseoverCSS("SIENNA_I", "Sienna I", "0 - 2.499VF", COLOUR_SET.red), + mouseoverCSS("SIENNA_II", "Sienna II", "2.5 - 4.999VF", COLOUR_SET.red), + mouseoverCSS("SIENNA_III", "Sienna III", "5.0 - 7.499VF", COLOUR_SET.red), + mouseoverCSS("SIENNA_IV", "Sienna IV", "7.5 - 9.999VF", COLOUR_SET.red), + mouseoverCSS("COBALT_I", "Cobalt I", "10 - 10.499VF", COLOUR_SET.paleBlue), + mouseoverCSS("COBALT_II", "Cobalt II", "10.5 - 10.999VF", COLOUR_SET.paleBlue), + mouseoverCSS("COBALT_III", "Cobalt III", "11 - 11.499VF", COLOUR_SET.paleBlue), + mouseoverCSS("COBALT_IV", "Cobalt IV", "11.5 - 11.999VF", COLOUR_SET.paleBlue), + mouseoverCSS("DANDELION_I", "Dandelion I", "12 - 12.499VF", COLOUR_SET.gold, "black"), + mouseoverCSS("DANDELION_II", "Dandelion II", "12.5 - 12.999VF", COLOUR_SET.gold, "black"), + mouseoverCSS("DANDELION_III", "Dandelion III", "13 - 13.499VF", COLOUR_SET.gold, "black"), + mouseoverCSS("DANDELION_IV", "Dandelion IV", "13.5 - 13.999VF", COLOUR_SET.gold, "black"), + mouseoverCSS("CYAN_I", "Cyan I", "14 - 14.249VF", COLOUR_SET.teal, "black"), + mouseoverCSS("CYAN_II", "Cyan II", "14.25 - 14.499VF", COLOUR_SET.teal, "black"), + mouseoverCSS("CYAN_III", "Cyan III", "14.5 - 14.749VF", COLOUR_SET.teal, "black"), + mouseoverCSS("CYAN_IV", "Cyan IV", "14.75 - 14.999VF", COLOUR_SET.teal, "black"), + mouseoverCSS("SCARLET_I", "Scarlet I", "15 - 15.249VF", COLOUR_SET.vibrantPink, "black"), + mouseoverCSS("SCARLET_II", "Scarlet II", "15.25 - 15.499VF", COLOUR_SET.vibrantPink, "black"), + mouseoverCSS("SCARLET_III", "Scarlet III", "15.5 - 15.749VF", COLOUR_SET.vibrantPink, "black"), + mouseoverCSS("SCARLET_IV", "Scarlet IV", "15.75 - 15.999VF", COLOUR_SET.vibrantPink, "black"), + mouseoverCSS("CORAL_I", "Coral I", "16 - 16.249VF", COLOUR_SET.pink, "black"), + mouseoverCSS("CORAL_II", "Coral II", "16.25 - 16.499VF", COLOUR_SET.pink, "black"), + mouseoverCSS("CORAL_III", "Coral III", "16.5 - 16.749VF", COLOUR_SET.pink, "black"), + mouseoverCSS("CORAL_IV", "Coral IV", "16.75 - 16.999VF", COLOUR_SET.pink, "black"), + mouseoverCSS("ARGENTO_I", "Argento I", "17 - 17.249VF", COLOUR_SET.white, "black"), + mouseoverCSS("ARGENTO_II", "Argento II", "17.25 - 17.499VF", COLOUR_SET.white, "black"), + mouseoverCSS("ARGENTO_III", "Argento III", "17.5 - 17.749VF", COLOUR_SET.white, "black"), + mouseoverCSS("ARGENTO_IV", "Argento IV", "17.75 - 17.999VF", COLOUR_SET.white, "black"), + mouseoverVariant("ELDORA_I", "Eldora I", "18 - 18.249VF", "warning"), + mouseoverVariant("ELDORA_II", "Eldora II", "18.25 - 18.499VF", "warning"), + mouseoverVariant("ELDORA_III", "Eldora III", "18.5 - 18.749VF", "warning"), + mouseoverVariant("ELDORA_IV", "Eldora IV", "18.75 - 18.999VF", "warning"), + mouseoverCSS("CRIMSON_I", "Crimson I", "19 - 19.249VF", COLOUR_SET.vibrantRed), + mouseoverCSS("CRIMSON_II", "Crimson II", "19.25 - 19.499VF", COLOUR_SET.vibrantRed), + mouseoverCSS("CRIMSON_III", "Crimson III", "19.5 - 19.749VF", COLOUR_SET.vibrantRed), + mouseoverCSS("CRIMSON_IV", "Crimson IV", "19.75 - 19.999VF", COLOUR_SET.vibrantRed), + mouseoverCSS("IMPERIAL_I", "Imperial I", "20 - 20.999VF", COLOUR_SET.vibrantPurple), + mouseoverCSS("IMPERIAL_II", "Imperial II", "21 - 21.999VF", COLOUR_SET.vibrantPurple), + mouseoverCSS("IMPERIAL_III", "Imperial III", "22 - 22.999VF", COLOUR_SET.vibrantPurple), + mouseoverCSS("IMPERIAL_IV", "Imperial IV", ">23VF", COLOUR_SET.vibrantPurple), ]; export const CHUNITHMColours = [