Update dates and scrambles for 2024.

cubing · Oct 23, 2024 · 08940b4 · 08940b4
1 parent 68af915
commit 08940b4
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -37,3 +37,7 @@ lint:
 .PHONY: format
 format:
 	npx @biomejs/biome format --write ./src ./script
+
+.PHONY: generate-scrambles
+generate-scrambles:
+	bun run "script/generate-scrambles.ts"
diff --git a/script/generate-scrambles.ts b/script/generate-scrambles.ts
@@ -35,3 +35,7 @@ write(
   file(join(outputDir, "scrambles.json")),
   JSON.stringify(allScrambles, null, "  "),
 );
+
+console.log(`
+Scrambles have been written to: ${outputDir}
+`);
diff --git a/src/static/2024/scrambles-2024.zip b/src/static/2024/scrambles-2024.zip
diff --git a/src/static/index.html b/src/static/index.html
@@ -35,14 +35,14 @@ <h1>The 20th Annual<br>Negative Time Solving Contest</h1>
     <table class="events">
       <tr>
         <td>Europe¹</td>
-        <td><b>Oct. 29, 2023</b></td>
+        <td><b>Oct. 27, 4</b></td>
         <td>
           <!-- <a href="https://www.facebook.com/events/167548628844000/">RSVP on Facebook</a> -->
         </td>
       </tr>
       <tr>
         <td>North America¹</td>
-        <td><b>Nov. 5, 2023</b></td>
+        <td><b>Nov. 3, 2024</b></td>
         <td>
           <!-- <a href="https://www.facebook.com/events/583790966222150/">RSVP on Facebook</a> -->
         </td>
@@ -120,18 +120,18 @@ <h1><a href="#rules" class="section-link">🔗</a> The Rules</h1>
 
     <section id="scramble-for-3x3x3">
       <h1><a class="section-link" href="#scramble-for-3x3x3">🔗</a> Scramble for 3×3×3</h1>
-      <p>The 3x3x3 scramble for 2023 is below. This is the <b>only</b> Negative Time Solving 3x3x3 speedsolve scramble
+      <p>The 3x3x3 scramble for 2024 is below. This is the <b>only</b> Negative Time Solving 3x3x3 speedsolve scramble
         for
-        2023. Do not use it before the real attempt:</p>
+        2024. Do not use it before the real attempt:</p>
       <div class="scramble">
-        <a href="https://alpha.twizzle.net/edit/?alg=U+R+U+B+U2+F%27+D2+R2+D2+B2+R2+U%27+F%27+D+B+L%27+B+L+F">
-          U R U B U2 F' D2 R2 D2 B2 R2 U' F' D B L' B L F
+        <a href="https://alpha.twizzle.net/edit/?alg=F2+L2+F+R2+D+L+B2+R+B%27+R2+U+F2+D+B2+D2+L2+D%27+L2+B2+D+L2">
+          F2 L2 F R2 D L B2 R B' R2 U F2 D B2 D2 L2 D' L2 B2 D L2
         </a>
         <div style="display: grid; place-content: center;">
           <button onclick="document.querySelector('#scramble-viewer').style.display ='inherit'; this.remove();"
             style="margin-top: 0.5em; font-size: 1em;">Show
             scramble</button>
-          <twisty-player id="scramble-viewer" alg="U R U B U2 F' D2 R2 D2 B2 R2 U' F' D B L' B L F"
+          <twisty-player id="scramble-viewer" alg="F2 L2 F R2 D L B2 R B' R2 U F2 D B2 D2 L2 D' L2 B2 D L2"
             style="width: 384px; display: none;" visualization="2D" control-panel="none" background="none">
           </twisty-player>
         </div>
@@ -141,8 +141,8 @@ <h1><a class="section-link" href="#scramble-for-3x3x3">🔗</a> Scramble for 3×
     <section id="scrambles-for-other-events">
       <h1><a class="section-link" href="#scrambles-for-other-events">🔗</a> Scrambles for other events</h1>
 
-      <p>Scrambles for 2023 for all WCA events, as well as FTO, Kilominx, Master Tetraminx, and Redi Cube, are <a
-          href="./2023/scrambles-2023.zip">this ZIP file</a>, and you can also view the scramble for a given event
+      <p>Scrambles for 2024 for all WCA events, as well as FTO, Kilominx, Master Tetraminx, and Redi Cube, are <a
+          href="./2024/scrambles-2024.zip">this ZIP file</a>, and you can also view the scramble for a given event
         below. For any other challenges, use your own scrambles.</p>
 
       <div style="display: grid; place-content: center; width: 100%; grid-template-columns: 1fr;">
@@ -151,62 +151,62 @@ <h1><a class="section-link" href="#scrambles-for-other-events">🔗</a> Scramble
           other scrambles</button>
         <section id="show-other-scrambles" style="display: none; width: 100%;">
           <select style="width: 100%;">
-            <option data-puzzle="3x3x3" data-scramble="L' U' R B' L2 F2 D2 U2 L2 D' U2 R B R' F' D L R' B2 Rw2 Uw'">
+            <option data-puzzle="3x3x3" data-scramble="U2 B R L2 U' L2 F2 L F' U D B2 U F2 U2 L2 U R2 U2 B2 L' Rw">
               3x3x3
               Blindfolded
             </option>
             <option data-puzzle="3x3x3"
-              data-scramble="R' U' F L D' F' D B2 L' U' B2 D' B' L U2 F2 U' B2 R2 U' F2 D' F2 R' U' F">
+              data-scramble="R' U' F U' L2 R U B2 D' B L' U' B F2 D2 B2 D' B2 U B2 D' R2 D' B2 R2 D2 B2 R' U' F">
               3x3x3 Fewest Moves</option>
-            <option data-puzzle="3x3x3" data-scramble="D F2 R2 U' F2 L2 B2 R2 B R2 F' D B U R' B L R F">3x3x3
+            <option data-puzzle="3x3x3" data-scramble="D2 F' R U' B' R F D' R2 D' L2 B2 U2 R2 U F2 L2 D B2 F">3x3x3
               One-Handed
             </option>
-            <option data-puzzle="2x2x2" data-scramble="U R' U2 F2 R2 F' U' R' U' R2 U'">2x2x2</option>
+            <option data-puzzle="2x2x2" data-scramble="R' U' F U2 L2 U' F U' F2 L' F'">2x2x2</option>
             <option data-puzzle="4x4x4"
-              data-scramble="F2 L' D2 F2 B2 R' B2 L F D L' D2 U' B' U F' B' L F2 Uw2 Fw2 Uw2 B' U2 Rw2 L2 R Uw2 Fw2 B D2 R' F Uw' U' R B2 Rw D' L' Uw' Fw' D R' B' x'">
+              data-scramble="U2 L2 B' U2 F L2 B' L2 B' R2 B2 U2 L D F L D' F2 D2 U Rw2 U Fw2 Uw2 U F2 R B2 Uw2 U2 R Uw2 Fw' D' L2 Uw2 Rw' F R2 Uw' D' Fw Uw'">
               4x4x4 Blindfolded</option>
             <option data-puzzle="4x4x4"
-              data-scramble="D2 U B2 D R2 D B2 F2 R2 B2 L U B D' U' F U R' B2 D Rw2 Fw2 U' R2 Fw2 L' D2 Rw2 Fw2 F2 D' B' Rw2 Uw2 Fw' R2 Rw Fw B2 Rw Fw Rw' D B">
+              data-scramble="R2 D2 B' U2 R2 B2 D2 F R2 B' L2 F' D B L D2 B D2 L2 R U2 Rw2 Uw2 R D2 R2 Uw2 Fw2 U2 F' L' F2 Rw2 F Uw' L Fw2 L B' Rw Fw' F' D Fw' Rw2 D'">
               4x4x4</option>
             <option data-puzzle="5x5x5"
-              data-scramble="Fw Lw' U Lw' D Bw2 Dw' D2 Fw2 L2 Bw Uw2 L2 U2 Bw' U F2 D2 R Lw' U B2 U2 Bw2 Uw2 U2 R' B Bw' R Rw F' D U Bw' Uw' L2 Lw' Rw' Bw2 Rw L2 Lw2 Fw2 F' Dw' Fw' Dw' F2 Uw2 D F' D2 Dw Fw2 Uw2 Rw2 R D' R 3Fw' 3Uw'">
+              data-scramble="Lw' Uw D Dw Lw' Bw D' Fw2 Rw' Dw' Lw Fw' Dw2 Bw' U Uw R' Fw D' L2 Fw Bw L Fw2 R2 D' F' Lw Uw Rw' F' U2 L2 B L' R2 U' D2 Fw Lw' Fw2 Dw Rw' Dw2 L2 Rw' Dw2 F Dw' F' B2 U Uw F2 B D' Bw2 Uw2 Bw' D' 3Fw 3Uw">
               5x5x5 Blindfolded</option>
             <option data-puzzle="5x5x5"
-              data-scramble="B' L' D' Fw2 D2 Lw Bw' U' Lw' F R2 U' Dw B2 F' R F' U2 Rw Dw' L Lw Rw Dw' D2 Uw2 U' Lw B' Rw2 D Fw Rw' Dw L2 B' L2 Lw Fw Dw2 R B2 D2 Lw2 L2 Fw Dw2 B2 R2 D' Bw L F2 Rw2 Dw' B' U2 R2 Lw Fw'">
+              data-scramble="Uw' B' Uw' R Dw Fw2 Bw2 D2 Lw' Dw Fw' Lw2 U2 L' B D2 B Dw' F2 B R2 Fw' U Rw B' Lw' R2 Bw R2 Dw2 R2 D2 Fw2 Lw2 Dw Rw2 Uw' Rw2 Dw2 Lw R2 F B' L Fw' B2 R Bw2 L2 D2 F D2 Fw2 R2 Bw R Dw' Bw Lw2 Bw'">
               5x5x5</option>
             <option data-puzzle="6x6x6"
-              data-scramble="U2 Fw' Uw D Lw' B2 3Fw2 Uw Rw2 L' Dw 3Rw2 3Fw2 D' L Rw' Fw2 Dw2 F' Rw' R F2 Lw' F2 3Fw' Dw2 3Rw' D Lw2 3Rw' Rw 3Uw L U 3Uw' B Rw2 3Rw' F Lw B U Bw' 3Fw U Uw2 Lw L Uw' R' F2 3Rw' R Uw' Rw2 Bw2 3Uw F2 Rw2 Uw 3Fw Bw U' 3Uw' B2 U Uw' L2 B2 3Uw2 3Fw Rw2 B R2 3Fw Uw F' Bw2 R L">
+              data-scramble="Uw2 L2 D2 3Uw' B' Lw' F Rw2 U2 Fw2 Rw2 D' 3Rw Dw2 3Rw2 Bw Dw2 3Rw 3Uw' D2 R B Uw B' Bw' 3Rw2 Bw' Rw2 U' F2 D' L2 3Fw2 Uw R2 3Uw' L2 3Fw' D L' B' Bw' U' Fw2 Lw Bw Rw' Fw' R' 3Fw' U L2 Rw 3Uw D' 3Uw Rw2 Bw' U D' Rw' B' U' D' U' Lw2 Rw2 F2 R 3Uw' B Dw2 Rw' Dw2 3Uw' F U 3Uw2 L2 3Rw'">
               6x6x6</option>
             <option data-puzzle="7x7x7"
-              data-scramble="Uw2 R2 3Lw U 3Rw2 Bw' 3Fw' 3Dw Uw' Bw2 Fw2 3Uw' R' B Uw' 3Lw Uw L B D' Dw2 U' 3Lw L2 3Dw' 3Bw F' R F' Dw' Bw' L' 3Lw2 3Rw' 3Dw2 L Fw' Bw Rw2 3Dw2 Rw 3Fw 3Dw Bw2 D' 3Rw2 D 3Fw2 3Uw Uw' 3Bw2 Bw2 R' Fw' F Bw' 3Fw Lw U' Bw' 3Lw R' 3Rw2 F' Fw2 3Fw' L' 3Bw B2 Bw2 3Lw Dw 3Uw' Fw Lw2 3Bw2 Uw 3Rw Lw 3Fw2 3Lw' Fw F' 3Uw' 3Bw2 3Rw2 3Uw' 3Bw2 Lw2 3Bw F' Uw 3Rw Rw' U' L' Fw' 3Uw 3Bw' B2">
+              data-scramble="Uw2 3Lw' R B2 Lw2 Dw Uw Fw 3Uw Rw 3Bw Dw' 3Uw Lw2 D Uw' F' U' Uw2 Bw 3Rw Uw F 3Bw' 3Uw2 Bw Uw B2 3Bw2 U 3Fw' 3Uw2 Dw' 3Rw' B2 Rw' Uw' Fw2 3Dw' Lw2 3Bw' U' Fw' 3Bw' 3Uw L2 3Dw2 Uw 3Uw' 3Rw D2 R Rw' 3Bw' L2 Dw2 3Lw' 3Uw' 3Rw D' U2 Lw2 Fw' D Dw2 3Uw' Dw2 3Uw2 Bw' Rw F2 3Rw 3Dw Uw2 3Dw 3Uw B' Uw2 F2 3Lw2 Rw2 Fw2 3Dw' U 3Fw2 Lw Uw2 R Bw2 3Rw2 3Dw2 3Uw F2 L Rw' B' Lw' R' 3Rw2 Uw">
               7x7x7</option>
             <option data-puzzle="clock"
-              data-scramble="UR1- DR5- DL5+ UL5- U4- R0+ D1+ L3+ ALL4- y2 U2- R5+ D4+ L4- ALL4- DL">
+              data-scramble="UR4- DR5+ DL3+ UL1+ U0+ R6+ D1+ L5+ ALL3- y2 U1- R2+ D6+ L5- ALL6+">
               Clock</option>
             <option selected data-puzzle="fto"
-              data-scramble="U' R' F' L' F L R U' L U L U' L R' L' F' L F R F L U' R' F' R L F' U L' F' BR' D' R' F BL BR">
+              data-scramble="D B' L R' L' R' D' R' BL B R' D B' D L BL B BL' D' R F R' BL' F R' BR F">
               Face-Turning Octahedron</option>
             <option data-puzzle="kilominx"
-              data-scramble="L' x2 U L2' U2' R F' L BL2 U BR x2 R2 BL2' L2' U BL2' U BR2' BL L' U2 F' U' F U2' R2' F' U F' U2 F2">
+              data-scramble="R2 BL2 x2 U2' BL2 L' F L' F R2 U2' x2 L BL2 U' R2 BR2 BL2' L2 U F2 U F' R2' F R U F U' R' F2">
               Kilominx
             </option>
-            <option data-puzzle="master_tetraminx" data-scramble="b r' L' b u U' B l r' L B' l r u b l">
+            <option data-puzzle="master_tetraminx" data-scramble="u L' r L' R b' B u R b' R b r b u r' l' u">
               Master
               Tetraminx</option>
-            <option data-puzzle="megaminx" data-scramble="R-- D++ R-- D++ R-- D-- R-- D++ R-- D++ U
-R++ D-- R-- D-- R-- D-- R++ D++ R++ D-- U'
-R-- D++ R-- D++ R++ D-- R-- D++ R++ D-- U'
-R++ D-- R++ D++ R-- D++ R-- D-- R-- D-- U'
-R-- D++ R++ D++ R++ D-- R++ D-- R-- D-- U'
-R++ D++ R++ D++ R++ D++ R++ D-- R++ D-- U'
-R++ D++ R++ D++ R-- D-- R++ D++ R++ D++ U">
+            <option data-puzzle="megaminx" data-scramble="R++ D-- R-- D++ R-- D++ R++ D++ R-- D-- U'
+R-- D-- R++ D-- R-- D-- R++ D++ R-- D-- U'
+R-- D-- R-- D-- R++ D++ R-- D-- R++ D++ U
+R++ D-- R-- D++ R-- D-- R-- D++ R++ D-- U'
+R++ D++ R-- D++ R++ D-- R++ D++ R++ D++ U
+R-- D-- R++ D-- R-- D++ R-- D++ R-- D-- U'
+R-- D++ R++ D-- R-- D++ R++ D++ R++ D-- U'">
               Megaminx</option>
-            <option data-puzzle="pyraminx" data-scramble="U' L B R U' B R B' L B' U' l r' b">Pyraminx</option>
-            <option data-puzzle="redi_cube" data-scramble="B U B' D' L' D' L' U' UL' U' UL' U F UR F' UL' UR'">Redi Cube
+            <option data-puzzle="pyraminx" data-scramble="R U B R L B U B' L u l'">Pyraminx</option>
+            <option data-puzzle="redi_cube" data-scramble="F L R' UR U' B' L' D' U' UL UR U UL' F UR U">Redi Cube
             </option>
-            <option data-puzzle="skewb" data-scramble="U R B L R' U L' B' R L U">Skewb</option>
+            <option data-puzzle="skewb" data-scramble="">Skewb</option>
             <option data-puzzle="square1"
-              data-scramble="(1,0) / (0,-3) / (0,-3) / (-1,-4) / (-3,0) / (3,0) / (4,0) / (-3,0) / (3,-2) / (2,0) / (-2,-4) / (3,-2) / (-2,0) /">
+              data-scramble="(0, 5) / (0, 3) / (6, -3) / (4, -5) / (5, -4) / (3, 0) / (0, -5) / (-3, -3) / (-2, -5) / (6, -2) / (0, -4) / (2, 0)">
               Square-1</option>
           </select>
           <twisty-alg-viewer for="other-challenges-player" style="width: 75%; margin: 1em auto; font-size: 1.25em;">
@@ -232,16 +232,16 @@ <h1><a class="section-link" href="#scrambles-for-other-events">🔗</a> Scramble
     <section id="results">
       <h1><a class="section-link" href="#results">🔗</a> Results</h1>
 
-      <p>Please submit your results for 2023 using this link:</p>
+      <p>Please submit your results for 2024 using this link:</p>
 
       <p class="result-submission-link">
         <a
-          href="https://docs.google.com/forms/d/e/1FAIpQLScriQse1ilgtYiC1Mlvt83AT9sNWljuCucJT832EGa9KJfTig/viewform?usp=sf_link">2023
+          href="https://docs.google.com/forms/d/e/1FAIpQLSdHaBHyM80C2St3uWXv2y2kLcwrC06s4fwdb9Q1A2S0OOVWxQ/viewform?usp=sf_link">2024
           result submission form</a>
       </p>
 
       <p>Come
-        back after November 2023 to see everyone's results. Past results are at:</p>
+        back after November 2024 to see everyone's results. Past results are at:</p>
 
       <ul>
         <li><a href="./2023/">2023</a></li>