Skip to content

Commit

Permalink
chore: some cleanup before adding new feature ;) dropping redundant ifs
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnnikaStein
AnnikaStein committed Dec 14, 2023
1 parent 7c9e23a commit 050f924
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 185 deletions.
43 changes: 0 additions & 43 deletions SkewbSkills/info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,62 +30,19 @@
<div class="dropdown-content">
<a href="#" class="active">Infopage and Download</a>
<a href="skskweb.html">SkewbSkillsWeb</a>
<!--<a href="https://github.com/AnnikaStein/SkewbSkills">View on Github</a>-->
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Resources
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<!--<a href="SkewbSkills/info.html">Infopage and Download</a>-->
<a href="../Resources/algs.html">Algorithms</a>
<a href="../Resources/tech.html">Techniques</a>
<a href="../Resources/math.html">Math</a>
<a href="../Resources/about.html">About</a>
<!--<a href="https://github.com/AnnikaStein/SkewbSkills">View on Github</a>-->
</div>
</div>
<!--<div class="dropdown">
<button class="dropbtn">Learn
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Sarah Strong's Method(s)</a>
<a href="#">Notation & Fingertricks</a>
<a href="#">Algs</a>
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Practice
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Own tools</a>
<a href="#">Other tools</a>
<a href="#">Competition Advice</a>
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Analysis
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Daily Average of 5</a>
<a href="#">Official solve analysis</a>
<a href="#">Long term trends</a>
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Maths
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Groups</a>
<a href="#">The Skewb Group</a>
<a href="#">The Cube Group</a>
</div>
</div>-->
<a href="javascript:void(0);" style="height:1rem;" class="icon" onclick="respNav()">&#9776;</a>
</nav>
<header><img src="../pics/codingHeader.png"></header>
Expand Down
100 changes: 16 additions & 84 deletions SkewbSkills/skewbskillsscripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,9 @@ function changescrlen() {
function changescrlenAlg() {
// style of the buttons according to the
// states of the checkboxes
// placeholder for scrambles
var auxscrl = [];
// default = solved Skewb, trivial scramble
if (document.getElementById("l4c").checked == false
|| document.getElementById("l5c").checked == false
|| document.getElementById("pi3s").checked == false
Expand All @@ -1025,6 +1028,17 @@ function changescrlenAlg() {
} else {
document.getElementById("toggleAll").style.color = 'black';
}
var buttons = document.getElementsByName("btngroup");
var atleastonechecked = false;
for (var i=0; i<buttons.length; i++) {
if (buttons[i].checked === true) {
atleastonechecked = true;
break;
}
}
if (atleastonechecked === false) {
auxscrl.push("R R'");
}
} else {
document.getElementById("toggleAll").style.color = 'green';

Expand Down Expand Up @@ -1078,39 +1092,6 @@ function changescrlenAlg() {
}

// get the correct scrambles
var auxscrl = [];
if (document.getElementById("l4c").checked == false
&& document.getElementById("l5c").checked == false
&& document.getElementById("pi3s").checked == false
&& document.getElementById("pihu").checked == false
&& document.getElementById("pihz").checked == false
&& document.getElementById("pio").checked == false
&& document.getElementById("piswirl").checked == false
&& document.getElementById("pivu").checked == false
&& document.getElementById("piwat").checked == false
&& document.getElementById("pix").checked == false
&& document.getElementById("pizconj").checked == false
&& document.getElementById("p3s").checked == false
&& document.getElementById("phu").checked == false
&& document.getElementById("phzpure").checked == false
&& document.getElementById("po").checked == false
&& document.getElementById("pswirl").checked == false
&& document.getElementById("pvu").checked == false
&& document.getElementById("pwat").checked == false
&& document.getElementById("px").checked == false
&& document.getElementById("pzconj").checked == false) {
var buttons = document.getElementsByName("btngroup");
var atleastonechecked = false;
for (var i=0; i<buttons.length; i++) {
if (buttons[i].checked === true) {
atleastonechecked = true;
break;
}
}
if (atleastonechecked === false) {
auxscrl.push("R R'");
}
}

if (document.getElementById("l4c").checked === true) {
for (var i = 0; i < scrl4c.length; i++) {
Expand Down Expand Up @@ -1266,58 +1247,7 @@ function changescrlenOL() {
// add both together
var completeScr = [];
completeScr.push(transftoWCA(auxscrlOL1[0]) + auxscrlOL2[0]);
/*
for (var k = 0; k < auxscrlOL1.length; k++) {
for (var l = 0; l < auxscrlOL2.length; l++) {
completeScr.push(transftoWCA(auxscrlOL1[k]) + auxscrlOL2[l]);
}
}*/

/*
// grab all L2L scrambles
var auxscrlOL1 = [];
for (var i = 0; i < allAlgs.length; i++) {
auxscrlOL1.push((allAlgs.slice(0))[i]);
}
// grab out of the possible FL scrambles corresponding to scrlenlabelOL
var auxscrlOL2 = [];
if (scrlenOL === 1) {
var auxscr1OL = newscramble1list.slice(0);
auxscrlOL2 = auxscr1OL;
}
if (scrlenOL === 2) {
var auxscr2OL = newscramble2list.slice(0);
auxscrlOL2 = auxscr2OL;
}
if (scrlenOL === 3) {
var auxscr3OL = newscramble3list.slice(0);
auxscrlOL2 = auxscr3OL;
}
if (scrlenOL === 4) {
var auxscr4OL = newscramble4list.slice(0);
auxscrlOL2 = auxscr4OL;
}
if (scrlenOL === 5) {
var auxscr5OL = newscramble5list.slice(0);
auxscrlOL2 = auxscr5OL;
}
if (scrlenOL === 6) {
var auxscr6OL = newscramble6list.slice(0);
auxscrlOL2 = auxscr6OL;
}
if (scrlenOL === 7) {
var auxscr7OL = newscramble7list.slice(0);
auxscrlOL2 = auxscr7OL;
}
var completeScr = [];
for (var k = 0; k < auxscrlOL1.length; k++) {
for (var l = 0; l < auxscrlOL2.length; l++) {
completeScr.push(transftoWCA(auxscrlOL1[k]) + auxscrlOL2[l]);
}
}
shuffle(completeScr);*/
scramblelistOL = completeScr;
}
// grab new scrambles when button is clicked, if array is empty, get new ones; write scramble and
Expand Down Expand Up @@ -1369,6 +1299,8 @@ function ScramblePlusColourAlg() {
}

var scramblezumanzeigenAlg = scramblelistAlg[scramblelistAlg.length - 1];
// this could be a place to read the corresponding entry in a DB to looku
// hints for the case (with scramblezumanzeigenAlg)
scramblelistAlg.pop();
// get random int for top site color: 0, 1, 2, 3: /, x, x2, x' | 4, 5: z, z'
// get random int for side color: 0, 1, 2, 3: /, y, y2, y'
Expand Down
58 changes: 0 additions & 58 deletions SkewbSkills/skskweb.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,73 +30,27 @@
<div class="dropdown-content">
<a href="info.html">Infopage and Download</a>
<a href="#" class="active">SkewbSkillsWeb</a>
<!--<a href="https://github.com/AnnikaStein/SkewbSkills">View on Github</a>-->
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Resources
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<!--<a href="SkewbSkills/info.html">Infopage and Download</a>-->
<a href="../Resources/algs.html">Algorithms</a>
<a href="../Resources/tech.html">Techniques</a>
<a href="../Resources/math.html">Math</a>
<a href="../Resources/about.html">About</a>
<!--<a href="https://github.com/AnnikaStein/SkewbSkills">View on Github</a>-->
</div>
</div>
<!--<div class="dropdown">
<button class="dropbtn">Learn
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Sarah Strong's Method(s)</a>
<a href="#">Notation & Fingertricks</a>
<a href="#">Algs</a>
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Practice
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Own tools</a>
<a href="#">Other tools</a>
<a href="#">Competition Advice</a>
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Analysis
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Daily Average of 5</a>
<a href="#">Official solve analysis</a>
<a href="#">Long term trends</a>
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Maths
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="#">Groups</a>
<a href="#">The Skewb Group</a>
<a href="#">The Cube Group</a>
</div>
</div> -->
<a href="javascript:void(0);" style="height:1rem;" class="icon" onclick="respNav()">&#9776;</a>
</nav>
<header><img src="../pics/mainHeader.png" id="mainHeader">
<img src="../pics/skskHeader922.png" id="mainHeader922">
<img src="../pics/skskHeader2560.png" id="mainHeader2560"></header>
<article id="art">
<h1>SkewbSkillsWeb</h1>
<!--<h5><em>The HTML / CSS / JavaScript solution for all non-Windows users and / or those that do not want to download
anything!</em></h5>-->
<aside id="left">
<!--Buttons-->
<button type="button" class="resp2" onclick="toggleFLT()" id="toggleFLTbut"
title="This generates short scramble sequences that can be directly solved by finding a fixed length solution to the first layer.">
First Layer Trainer</button>
Expand Down Expand Up @@ -167,18 +121,6 @@ <h1>SkewbSkillsWeb</h1>
</tr>
</div>
<div id="additionalOLT" style="display: none;">
<!--<tr>
<th>
<input type="checkbox" id="shufflescrchecker" onclick="changescrlen()"> Shuffle scrambles
</th>
</tr>
<br>
<tr>
<th>
<input type="checkbox" id="anycolourchecker"> Use all colours
</th>
</tr>
<br><br>-->
<tr>
<th>
Change number of additionally applied moves after inverse L2L algorithm
Expand Down

0 comments on commit 050f924

Please sign in to comment.