Bite 5

songs.schema.json

@@ -45,6 +45,12 @@
         },
         "lvlMax": {
           "type": "integer"
+        },
+        "useWeights": {
+          "type": "boolean"
+        },
+        "weights": {
+          "type": "array"
         }
       }
     },
@@ -56,15 +62,20 @@
         "difficulties",
         "lowerLvlBound",
         "upperLvlBound",
-        "flags"
+        "flags",
+        "useWeights",
+        "weights"
       ],
       "additionalProperties": false,
       "properties": {
         "style": { "type": "string" },
         "difficulties": { "$ref": "#/$defs/uniqueStringArr" },
         "flags": { "$ref": "#/$defs/uniqueStringArr" },
         "lowerLvlBound": { "type": "integer" },
-        "upperLvlBound": { "type": "integer" }
+        "upperLvlBound": { "type": "integer" },
+        "chartCount": { "type": "integer" },
+        "useWeights": { "type": "boolean" },
+        "weights": { "type": "array", "items": { "type": "number" } }
       }
     },
     "i18n": {

src/app.tsx

@@ -18,7 +18,7 @@ import { ThemeSyncWidget } from "./theme-toggle";
 export function App() {
   return (
     <ConfigStateManager>
-      <DrawStateManager defaultDataSet="a20plus">
+      <DrawStateManager defaultDataSet="1-wild-19-21">
         <ThemeSyncWidget />
         <UpdateManager />
         <Header />

src/apply-default-config.tsx

@@ -14,15 +14,26 @@ export function ApplyDefaultConfig({ defaults }: Props) {
     }
 
     update((config) => {
-      const { lowerLvlBound, upperLvlBound, flags, difficulties, style } =
-        defaults;
+      const {
+        lowerLvlBound,
+        upperLvlBound,
+        flags,
+        difficulties,
+        style,
+        chartCount,
+        useWeights,
+        weights,
+      } = defaults;
       return {
         ...config,
+        chartCount: chartCount || config.chartCount,
         lowerBound: lowerLvlBound,
         upperBound: upperLvlBound,
         flags: new Set(flags),
         difficulties: new Set(difficulties),
         style,
+        useWeights,
+        weights
       };
     });
   }, [defaults, update]);

src/config-state.tsx

@@ -30,7 +30,7 @@ export class ConfigStateManager extends Component<Props, ConfigState> {
       lowerBound: 0,
       useWeights: false,
       orderByAction: true,
-      weights: [],
+      weights: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0],
       forceDistribution: true,
       style: "",
       difficulties: new Set(),

src/drawing-list.css

@@ -16,6 +16,7 @@
   padding: 10px;
   overflow: hidden;
   flex-wrap: wrap;
+  justify-content: center;
 }
 
 .sectionLabel {

src/drawing-list.tsx

@@ -7,7 +7,7 @@ import { ConfigStateContext } from "./config-state";
 import { EligibleChartsList } from "./eligible-charts-list";
 import { Callout, NonIdealState } from "@blueprintjs/core";
 import { IconNames } from "@blueprintjs/icons";
-import logo from "./assets/ddr-tools-256.png";
+import logo from "./assets/bite5.png";
 
 const renderDrawing = (drawing: Drawing) => (
   <DrawnSet key={drawing.id} drawing={drawing} />
@@ -27,13 +27,11 @@ export function DrawingList() {
     return (
       <div className={styles.empty}>
         <NonIdealState
-          icon={<img src={logo} height={128} />}
-          title="DDR Tools"
-          description="Click 'Draw' above to draw some songs at random. Chose from other games in the top left menu."
+          icon={<img src={logo} height={256} />}
+          title="The Beast in the East 5 SMX Card Draw"
           action={
-            <Callout intent="primary" icon={IconNames.WRENCH}>
-              DDR Card Draw now has a new name and and URL. Look for more new
-              features coming soon!
+            <Callout intent="danger" icon={IconNames.ArrowTopLeft}>
+              Choose a tournament round, then click 'Draw'
             </Callout>
           }
         />

src/drawn-set.css

@@ -3,4 +3,5 @@
   padding: 10px;
   overflow: hidden;
   flex-wrap: wrap;
+  justify-content: center;
 }

src/drawn-set.tsx

@@ -1,5 +1,6 @@
 import { memo, useContext, useState } from "react";
 import { SongCard } from "./song-card";
+import { ProgressBar } from "@blueprintjs/core";
 import styles from "./drawn-set.css";
 import {
   Drawing,

src/eligible-charts-list.tsx

@@ -60,6 +60,13 @@ export function EligibleChartsList() {
   let charts = Array.from(eligibleCharts(configState, gameData.songs));
   const songs = new Set<string>();
   const cards = charts
+    .sort((a, b) => {
+      if (a.level === b.level){
+        return a.name < b.name ? -1 : 1
+      } else {
+        return a.level < b.level ? -1 : 1
+      }
+    })
     .map((chart, index) => {
       songs.add(songKeyFromChart(chart));
       if (isDisplayFiltered && chart.flags.every((f) => f !== currentTab)) {

src/header.tsx

@@ -47,7 +47,7 @@ export function Header() {
           <Button icon={IconNames.MENU} />
         </Popover2>
         <Navbar.Divider />
-        <Tooltip2 content="Change Song Data" placement="bottom">
+        <Tooltip2 content="Change Difficulty Range" placement="bottom">
           <VersionSelect />
         </Tooltip2>
       </Navbar.Group>

src/hooks/useDataSets.ts

@@ -6,8 +6,6 @@ export const available = process.env.DATA_FILES as unknown as Array<{
   display: string;
 }>;
 
-available.sort((a, b) => (a.display < b.display ? -1 : 1));
-
 export function useDataSets() {
   const { dataSetName, loadGameData } = useContext(DrawStateContext);
   const current = available.find((s) => s.name === dataSetName) || available[0];

src/index.ejs

@@ -3,14 +3,14 @@
   <head>
     <meta charset="UTF-8" />
     <meta property="og:site_name" content="DDR.tools" />
-    <meta property="og:title" content="DDR Tools - card draw and more!" />
+    <meta property="og:title" content="The Beast in the East 5 SMX Card Draw" />
     <meta
       property="og:description"
-      content="Tools for music game tournaments and training"
+      content="Custom card draw for The Beast in the East 5 StepManiaX Tournament"
     />
     <meta property="og:image" content="/ddr-tools-128.png" />
-    <meta name="theme-color" content="#28b6ea" />
-    <title>DDR Tools - card draw and more!</title>
+    <meta name="theme-color" content="#d12f25" />
+    <title>The Beast in the East 5 SMX Card Draw</title>
   </head>
   <body></body>
 </html>

src/models/SongData.ts

@@ -43,6 +43,8 @@ export interface GameData {
      */
     flags: string[];
     lvlMax: number;
+    useWeights?: boolean;
+    weights?: unknown[];
   };
   /**
    * Defines the default configuration for this game
@@ -53,6 +55,9 @@ export interface GameData {
     flags: UniqueStringArr;
     lowerLvlBound: number;
     upperLvlBound: number;
+    chartCount?: number;
+    useWeights: boolean;
+    weights: number[];
   };
   /**
    * Set of localized values for display of any styles, difficulties, or flags

src/song-card/song-card.css

@@ -1,8 +1,8 @@
 @import url("https://fonts.googleapis.com/css?family=Russo+One");
 
 .chart {
-  display: flex !important;
-  flex: 1 0 0;
+  display: flex;
+  flex: 0 0 19%;
   text-align: center;
   border: 2px solid black;
   border-radius: 5px;
@@ -42,7 +42,7 @@
 }
 
 .name {
-  font-size: 120%;
+  font-size: 140%;
 }
 .nameTranslation {
   font-size: 75%;
@@ -72,12 +72,13 @@
 }
 
 .vetoed {
-  opacity: 0.8;
+  /* opacity: 0.8;
   transform: scale(0.9);
   transform-origin: center;
   filter: grayscale(75%);
   border-color: red;
-  box-shadow: 0px 0px 5px red;
+  box-shadow: 0px 0px 5px red; */
+  display: none;
 }
 
 .protected {

src/song-card/song-card.tsx

@@ -29,6 +29,7 @@ interface Props {
   replacedBy?: Player;
   replacedWith?: DrawnChart;
   iconCallbacks?: IconCallbacks;
+  turnOrder?:number;
 }
 
 export function SongCard(props: Props) {
@@ -39,6 +40,7 @@ export function SongCard(props: Props) {
     replacedBy,
     replacedWith,
     iconCallbacks,
+    turnOrder,
   } = props;
 
   const [showingIconMenu, setShowIconMenu] = useState(false);
@@ -72,7 +74,7 @@ export function SongCard(props: Props) {
   let jacketBg = {};
   if (jacket) {
     jacketBg = {
-      backgroundImage: `linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url("jackets/${jacket}")`,
+      backgroundImage: `linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url("jackets/${jacket}")`,
     };
   }
 

src/songs/smx.json → src/songs/1-wild-19-21.json

@@ -16,14 +16,17 @@
   },
   "defaults": {
     "style": "solo",
-    "difficulties": ["wild", "hard"],
+    "difficulties": ["wild"],
     "flags": [],
-    "lowerLvlBound": 18,
-    "upperLvlBound": 22
+    "lowerLvlBound": 19,
+    "upperLvlBound": 21,
+    "chartCount": 7,
+    "useWeights": true,
+    "weights": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 2]
   },
   "i18n": {
     "en": {
-      "name": "StepManiaX",
+      "name": "Wild Mode | 19 - 21",
       "solo": "Solo",
       "basic": "Basic",
       "easy": "Easy",
@@ -13305,4 +13308,4 @@
       ]
     }
   ]
-}
+}