Add non-WCA events.

cubing · Mar 5, 2022 · 1cd7a8f · 1cd7a8f
1 parent ff08a04
commit 1cd7a8f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/dev/index.html b/src/dev/index.html
@@ -55,6 +55,16 @@ <h1><a href="https://github.com/cubing/scramble-display"><code>&lt;scramble-disp
     </scramble-display>
     <scramble-display event="skewb" visualization="3D" checkered scramble="U L' R U' L U L' U' B U' B">
     </scramble-display>
+    <scramble-display event="fto" checkered scramble="F D BR R BR' R' D' R F R BR' D' F' D F BR F' L U' L U' F' L U' L R L' F' BR' U R' B' D BR' BL">
+    </scramble-display>
+    <scramble-display event="fto" checkered scramble="F D BR R BR' R' D' R F R BR' D' F' D F BR F' L U' L U' F' L U' L R L' F' BR' U R' B' D BR' BL">
+    </scramble-display>
+    <scramble-display event="kilominx" checkered scramble="BR2 x2 F2' U' F' BR U' BR2' BL' x2 R2' BL2' BR U' L2' BL2' BR BL' U2 R U' F' R F' U2' F' R' F2' U2' R2">
+    </scramble-display>
+    <scramble-display event="master_tetraminx" checkered scramble="l r' l' U' r' R' l r' U L' B' u' l b l' r u' b' u">
+    </scramble-display>
+    <scramble-display event="redi_cube" checkered scramble="UL B' D' F' UR' L UL' R D L' UL F UL U' UR U'">
+    </scramble-display>
   </div>
 
 </body>

diff --git a/src/scramble-display/ScrambleDisplay.ts b/src/scramble-display/ScrambleDisplay.ts
@@ -1,8 +1,6 @@
 import { Alg } from "cubing/alg";
-import { wcaEventInfo } from "cubing/puzzles";
-import {
-  TwistyPlayer,
-} from "cubing/twisty";
+import { eventInfo } from "cubing/puzzles";
+import { TwistyPlayer } from "cubing/twisty";
 import { mainStyleText } from "./css";
 
 export type Visualization = "2D" | "3D";
@@ -68,8 +66,8 @@ export class ScrambleDisplay extends HTMLElement {
   }
 
   public set event(eventID: EventID | null) {
-    const eventInfo = wcaEventInfo(eventID ?? DEFAULT_EVENT);
-    this.#twistyPlayer.puzzle = eventInfo?.puzzleID ?? "3x3x3";
+    const info = eventInfo(eventID ?? DEFAULT_EVENT);
+    this.#twistyPlayer.puzzle = info?.puzzleID ?? "3x3x3";
     this.#currentAttributes.eventID = eventID;
   }
   public get event(): EventID | null {

diff --git a/test/index.html b/test/index.html
@@ -54,6 +54,16 @@ <h1><a href="https://github.com/cubing/scramble-display"><code>&lt;scramble-disp
     </scramble-display>
     <scramble-display event="skewb" visualization="3D" checkered scramble="U L' R U' L U L' U' B U' B">
     </scramble-display>
+    <scramble-display event="fto" checkered scramble="F D BR R BR' R' D' R F R BR' D' F' D F BR F' L U' L U' F' L U' L R L' F' BR' U R' B' D BR' BL">
+    </scramble-display>
+    <scramble-display event="fto" checkered scramble="F D BR R BR' R' D' R F R BR' D' F' D F BR F' L U' L U' F' L U' L R L' F' BR' U R' B' D BR' BL">
+    </scramble-display>
+    <scramble-display event="kilominx" checkered scramble="BR2 x2 F2' U' F' BR U' BR2' BL' x2 R2' BL2' BR U' L2' BL2' BR BL' U2 R U' F' R F' U2' F' R' F2' U2' R2">
+    </scramble-display>
+    <scramble-display event="master_tetraminx" checkered scramble="l r' l' U' r' R' l r' U L' B' u' l b l' r u' b' u">
+    </scramble-display>
+    <scramble-display event="redi_cube" checkered scramble="UL B' D' F' UR' L UL' R D L' UL F UL U' UR U'">
+    </scramble-display>
   </div>
 
 </body>