diff --git a/README.md b/README.md index 582f7e4..ce31e4b 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,14 @@ In `cuboidsScrambler` module: - `get_3x3x6_scramble()` 3x3x6 cuboid scramble - `get_3x3x7_scramble(n=40)` 3x3x7 cuboid scramble, where `n` is the length of the non-3x3 portion of the scramble +### Clock +In `clockScrambler` module: + +- `get_WCA_scramble()` Clock scramble (WCA notation) +- `get_Jaap_scramble()` Clock scramble (Jaap notation) +- `get_concise_scramble()` Clock scramble (concise notation) +- `get_efficient_pin_order_scramble()` Clock scramble (efficient pin order notation) + ### Big cubes In `bigCubesScrambler` module: diff --git a/pyTwistyScrambler/clockScrambler.py b/pyTwistyScrambler/clockScrambler.py new file mode 100644 index 0000000..718c9e0 --- /dev/null +++ b/pyTwistyScrambler/clockScrambler.py @@ -0,0 +1,23 @@ +from . import _UTIL_SCRAMBLER, trim + +#------------------------------------------------------------------------------ + +@trim +def get_WCA_scramble(): + """ Gets a WCA scramble for a Rubik's Clock. """ + return _UTIL_SCRAMBLER.call("util_scramble.getClockWCAScramble") + +@trim +def get_Jaap_scramble(): + """ Gets a Jaap-notation scramble for a Rubik's Clock. """ + return _UTIL_SCRAMBLER.call("util_scramble.getClockJaapScramble") + +@trim +def get_concise_scramble(): + """ Gets a concise-notation scramble for a Rubik's Clock. """ + return _UTIL_SCRAMBLER.call("util_scramble.getClockConciseScramble") + +@trim +def get_efficient_pin_order_scramble(): + """ Gets an efficient pin order scramble for a Rubik's Clock. """ + return _UTIL_SCRAMBLER.call("util_scramble.getClockEfficientPinOrderScramble") \ No newline at end of file diff --git a/pyTwistyScrambler/js_resources/utilscramble.js b/pyTwistyScrambler/js_resources/utilscramble.js index 99b658e..8be4cea 100644 --- a/pyTwistyScrambler/js_resources/utilscramble.js +++ b/pyTwistyScrambler/js_resources/utilscramble.js @@ -453,6 +453,18 @@ var util_scramble = (function(rn, rndEl, mega) { function getMegaminxOldStyleScramble(n){ return utilscramble("mgmo", n); } + function getClockWCAScramble(){ + return utilscramble("clkwca", 0); + } + function getClockJaapScramble(){ + return utilscramble("clk", 0); + } + function getClockConciseScramble(){ + return utilscramble("clkc", 0); + } + function getClockEfficientPinOrderScramble(){ + return utilscramble("clke", 0); + } function getSquareOneTurnMetricScramble(n){ return sq1_scramble(1, n); } @@ -466,6 +478,11 @@ var util_scramble = (function(rn, rndEl, mega) { getMegaminxOldStyleScramble: getMegaminxOldStyleScramble, getSquareOneTurnMetricScramble: getSquareOneTurnMetricScramble, getSquareOneTwistMetricScramble: getSquareOneTwistMetricScramble, + + getClockWCAScramble: getClockWCAScramble, + getClockJaapScramble: getClockJaapScramble, + getClockConciseScramble: getClockConciseScramble, + getClockEfficientPinOrderScramble: getClockEfficientPinOrderScramble, }