Skip to content

Commit 4ff8cdb

Browse files
trexrushtrexrush
committed
fix/data: fix O/W perms breaking and more parity pll alg changes
1 parent 1faa0d1 commit 4ff8cdb

File tree

3 files changed

+50
-42
lines changed

3 files changed

+50
-42
lines changed

‎src/configs/algSheets/data/PLLPARITY_TREX.yml‎

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
opp:
22
algs:
33
-
4-
alg: "Uw2' r2 Uw2' r2 U2' r2"
4+
alg: Uw2' r2 Uw2' r2 U2' r2
55
-
6-
alg: "Rw2' F2 U2' Rw2 R2' U2' F2 Rw2"
6+
alg: Lw2' B2' U2 Lw2 L2' U2 B2' Lw2
7+
isLefty: true
78
adj:
89
algs:
910
-
@@ -27,16 +28,10 @@ Ob:
2728
alg: Lw U Lw' [LEFT DOUBLE BACK SEXY] Lw U' Lw2' U' Lw [LEFT DOUBLE UNSEXY] Lw' U Lw
2829
isLefty: true
2930
tags: ['Direct']
30-
-
31-
alg: M2' U M2' U M' U2 l2' U2 r2 Uw2 r2 Uw2 U2 M'
32-
note: opp into zperm
3331
W:
3432
algs:
3533
-
3634
alg: "[OPP] r2' l2' U' M U2' M' U' M2'"
37-
-
38-
setup: U
39-
alg: "[OPP] [Ua_PERM]"
4035
-
4136
alg: Rw R U Rw' R U' Rw' U' Rw U Rw U' Rw' U' Rw' R U Rw U2 R U' R' U' R2
4237
tags: ['Direct', 'Swag']
@@ -45,70 +40,71 @@ pJ:
4540
-
4641
alg: Lw U Lw2' U Lw U' Lw U L' U' L U' Lw' U 3Fw' [LEFT SEXY] 3Fw Lw' U' Lw L' U' L
4742
isLefty: true
48-
tag: ['Direct']
43+
tags: ['Direct']
4944
-
5045
alg: Lw L2' U L U' l' U L' U2' L U l' U' l U Lw F' Lw2' U Lw U Lw' U' Lw F
5146
isLefty: true
52-
tag: ['Direct']
47+
tags: ['Direct']
5348
pN:
5449
algs:
5550
-
5651
alg: 3Fw' L' U' L U 3Fw Lw' U' Lw L' U' L Lw U Lw2' U Lw U' Lw U L' U' L U' Lw'
5752
isLefty: true
58-
tag: ['Direct']
53+
tags: ['Direct']
5954
-
6055
alg: l' U' l U Lw F' Lw2' U Lw U Lw' U' Lw F [LEFTY SEXY] Lw D Lw' U2' Lw D' Lw'
6156
isLefty: true
62-
tag: ['Direct']
57+
tags: ['Direct']
6358
note: wide T perm sexy block comm
6459
M:
6560
algs:
6661
-
67-
alg: "[OPP] [LEFTY T_PERM]"
62+
alg: "[LEFT NEW_OPP] [LEFTY T_PERM]"
6863
isLefty: true
6964
Ka:
7065
algs:
7166
-
7267
setup: U'
73-
alg: "x Lw2 L' U' L D2' L' U L F2' r2' F2' D2' Lw2' x'"
68+
alg: x Lw2 L' U' L D2' L' U L F2' r2' F2' D2' Lw2' x'
7469
isLefty: true
7570
tags: ['Direct']
7671

7772
Kb:
7873
algs:
7974
-
80-
alg: "x' Lw2' L U L' D2' L U' L' B2' r2' B2' D2' Lw2 x"
75+
setup: U
76+
alg: x' Lw2' L U L' D2' L U' L' B2' r2' B2' D2' Lw2 x
8177
isLefty: true
8278
tags: ['Direct']
8379

8480
Ba:
8581
algs:
8682
-
87-
setup: U
88-
alg: "Lw U l' U Lw F Lw' U' L' U Lw F' Lw2' U' Lw2 U' Lw' U Lw' U Lw"
83+
alg: Lw U l' U Lw F Lw' U' L' U Lw F' Lw2' U' Lw2 U' Lw' U Lw' U Lw
8984
isLefty: true
9085
tags: ['Direct']
9186

9287
Bb:
9388
algs:
9489
-
95-
setup: U
96-
alg: "Lw' U' Lw F Lw' U' L U Lw F' L' U' Lw U Lw2' U Lw U' Lw U' Lw'"
90+
alg: Lw' U' Lw F Lw' U' L U Lw F' L' U' Lw U Lw2' U Lw U' Lw U' Lw'
9791
isLefty: true
9892
tags: ['Direct']
9993

10094
Ca:
10195
algs:
96+
-
97+
setup: U'
98+
alg: l' U Lw F' L' U' Lw F Lw' y L' U' L U L' U L U' Lw U L' U L U2 Lw'
99+
isLefty: true
102100
-
103101
setup: U2
104102
alg: "[OPP] [LEFT Ra_PERM]"
105103
isLefty: true
106-
-
107-
alg: l' U Lw F' L' U' Lw F Lw' y L' U' L U L' U L U' Lw U L' U L U2 Lw'
108-
isLefty: true
109104
Cb:
110105
algs:
111106
-
107+
setup: U'
112108
alg: r U' Lw' U 3Lw U Lw' U' Lw y L U L' U' L U' L' U Lw' U' L U' L' U2 Lw
113109
isLefty: true
114110
tags: ['Direct']
@@ -119,40 +115,40 @@ Cb:
119115
Da:
120116
algs:
121117
-
122-
alg: "Lw U Lw' U Lw' U' Lw2 U' Lw' U L F Lw' U' L' U Lw F' Lw' U Lw"
118+
alg: Lw U Lw' U Lw' U' Lw2 U' Lw' U L F Lw' U' L' U Lw F' Lw' U Lw
123119
isLefty: true
124120
tags: ['Direct']
125121

126122
-
127123
setup: U'
128-
alg: L' U' L U' [OPP] L F' L2' U L U L' U' L F
124+
alg: L' U' L U [LEFT NEW_OPP] L F' L2' U L U L' U' L F
129125
isLefty: true
130126
note: T perm with opp inside
131127
Db:
132128
algs:
133129
-
134130
setup: U2
135-
alg: "Lw' U' Lw U' Lw U Lw2' U Lw2 F Lw' U' L U Lw F' Lw' U' l U' Lw'"
131+
alg: Lw' U' Lw U' Lw U Lw2' U Lw2 F Lw' U' L U Lw F' Lw' U' l U' Lw'
136132
isLefty: true
137133
tags: ['Direct']
138134
note: inverse T perm with opp inside
139135

140136
Pa:
141137
algs:
142138
-
143-
setup: U'
139+
setup: U
144140
alg: (Lw2' D' Lw U2' Lw' D Lw U2' Lw) U (Lw U2' Lw D Lw' U2' Lw D' Lw2')
145141
isLefty: true
146142
tags: ['Direct']
147143
-
148-
setup: U'
144+
setup: U
149145
alg: F' Lw' U Lw U' 3Lw' U' Lw U r' U' Lw F 3Lw' U' Lw' U 3Lw
150146
isLefty: true
151147
tags: ['Direct']
152148
Pb:
153149
algs:
154150
-
155-
alg: 3Rw U Rw' U' 3Rw' F Rw U' l' U Rw U' 3Rw' U' Rw U Rw' F'
151+
alg: 3Lw' U' Lw U 3Lw F' Lw' U r U' Lw' U 3Lw U Lw' U' Lw F
156152
isLefty: true
157153
tags: ['Direct']
158154
-
@@ -163,41 +159,48 @@ Pb:
163159
Q:
164160
algs:
165161
-
166-
alg: F' L' U L U L' U' L F U2' [OPP] L' U' L U L F' L' F
167-
isLefty: true
168-
-
169-
alg: "[OPP] U' [LEFT E_PERM]"
162+
alg: F' L' U L U L' U' L F [LEFT NEW_OPP] L' U' L U L F' L' F
170163
isLefty: true
164+
171165
-
172166
alg: z' U2 L' F2 Lw2 U2 L F2' Lw2' L' F2 L2 U2 Lw2' L U2' z
173167
isLefty: true
174-
tags: ['Direct']
168+
tags: ['Direct', 'Swag']
175169
X:
176170
algs:
177171
-
178172
alg: '[OPP] [LEFT E_PERM]'
179173
isLefty: true
180-
-
181-
alg: '[LEFT E_PERM] [OPP]'
182-
isLefty: true
174+
note: theres prolly a good way to do this, need to edit this alg later
183175
Sa:
184176
algs:
177+
-
178+
alg: L U L' U2 (Lw2' D' Lw U2' Lw' D Lw U2' Lw) U (Lw U2' Lw D Lw' U2' Lw D' Lw2') L U' L'
179+
isLefty: true
180+
tags: ['Direct']
181+
note: also a setup to P perm, but the 2 commutators one
185182
-
186183
setup: U'
187184
alg: "L U L' U 3Lw' U' Lw U 3Lw F' Lw' U Rw R' U' Lw' U 3Lw U Lw' U' Lw F U' L U' L'"
188185
isLefty: true
189186
tags: ['Direct']
190-
note: "R' U' R U': Pa"
187+
note: "R' U' R U': Pa (Sebastian alg)"
191188
Sb:
192189
algs:
190+
-
191+
setup: U'
192+
alg: L' U' L (Lw2' D' Lw U2' Lw' D Lw U2' Lw) U (Lw U2' Lw D Lw' U2' Lw D' Lw2') U2' L' U L
193+
isLefty: true
194+
tags: ['Direct']
195+
note: also a setup to P perm, but the 2 commutators one
193196
-
194197
setup: U2
195198
alg: L' U' L y' 3Lw' U' Lw U 3Lw F' Lw' U Rw R' U' Lw' U 3Lw U Lw' U' Lw U F
196199
isLefty: true
197200
tags: ['Direct']
198-
note: R U R' y (Pa without F') U' F'
201+
note: R U R' y (Pa without F') U' F' (Sebastian alg)
199202
-
200203
setup: U
201204
alg: z' U2' L' U2 Lw2 F2' L U2 L' Lw2' U2 L2 F2' Lw' l' U2' z
202205
isLefty: true
203-
tags: ['Direct']
206+
tags: ['Direct', 'Swag']

‎src/configs/moveTranslations.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,26 +136,30 @@ const backWideMoves = [
136136
"Uw", "Rw", "Lw", "Dw", "Fw", "Bw", "2U", "2R", "2L", "2D", "2F", "2B",
137137
"Uw2'", "Rw2'", "Lw2'", "Dw2'", "Fw2'", "Bw2'", "2U2'", "2R2'", "2L2'", "2D2'", "2F2'", "2B2'",
138138
"Uw2", "Rw2", "Lw2", "Dw2", "Fw2", "Bw2", "2U2", "2R2", "2L2", "2D2", "2F2", "2B2",
139+
"3Uw'", "3Rw'", "3Lw'", "3Dw'", "3Fw'", "3Bw'",
140+
"3Uw", "3Rw", "3Lw", "3Dw", "3Fw", "3Bw",
141+
"3Uw2'", "3Rw2'", "3Lw2'", "3Dw2'", "3Fw2'", "3Bw2'",
142+
"3Uw2", "3Rw2", "3Lw2", "3Dw2", "3Fw2", "3Bw2",
139143
]
140144

141145
export const baseMoveGroups: modularPuzzleGroup<string[]> = {
142146
"3x3x3": [...tripleMoves, ...baseSlices, ...baseRotations, ...baseMoves],
143147
"2x2x2": [...baseRotations, ...baseMoves],
144-
"4x4x4": [...wideMoves, ...tripleMoves, ...baseRotations, ...baseMoves],
148+
"4x4x4": [...wideMoves, ...tripleMoves, ...baseSlices, ...baseRotations, ...baseMoves],
145149
"megaminx": [...baseMegaF, ...baseMega, ...baseRotations, ...baseMoves],
146150
}
147151
export const mirrorMoveGroups: modularPuzzleGroup<string[]> = {
148152
"3x3x3": [...tripleMirrorMoves, ...mirrorSlices, ...mirrorRotations, ...mirrorMoves],
149153
"2x2x2": [...mirrorRotations, ...mirrorMoves],
150-
"4x4x4": [...mirrorWideMoves, ...tripleMirrorMoves, ...mirrorRotations, ...mirrorMoves],
154+
"4x4x4": [...mirrorWideMoves, ...tripleMirrorMoves, ...mirrorSlices, ...mirrorRotations, ...mirrorMoves],
151155
"megaminx": [...mirrorMegaF, ...mirrorMega, ...mirrorRotations,...mirrorMoves],
152156
}
153157
// megaminx F would be mapped to B', (which is not intentional, should be BL' or BR'),
154158
// so earlier moves are set to take precedence and megaminx modules need to go first
155159
export const backMoveGroups: modularPuzzleGroup<string[]> = {
156160
"3x3x3": [ ...tripleBackMoves, ...backSlices, ...backRotations, ...backMoves],
157161
"2x2x2": [...backMoves, ...backRotations],
158-
"4x4x4": [...backWideMoves, ...tripleBackMoves, ...backRotations, ...backMoves],
162+
"4x4x4": [...backWideMoves, ...tripleBackMoves, ...backSlices, ...backRotations, ...backMoves],
159163
"megaminx": [...backRightMegaF, ...backMega, ...backRotations, ...backMoves],
160164
"megaminx-l": [...backLeftMegaF, ...backMega, ...backRotations, ...backMoves]
161165
}

‎src/configs/triggers.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ const zbllSubstitutes = [
4848

4949
const bigCubeSubstitutes = [
5050
{ name: "OPP", alg: "Uw2' r2 Uw2' r2 U2' r2" },
51+
{ name: "NEW_OPP", alg: "Rw2 B2 U2' Rw2' R2 U2' B2 Rw2'" },
5152
{ name: "DREW", alg: "Rw2 B2' Rw' U2 Rw' U2 x' U2' Rw' U2 Rw U2' Rw' U2 Rw2 U2 x" },
5253
{ name: "LUKE", alg: "Rw' U2' Rw U2 Rw' F2 Rw2 U2' Rw U2 Rw' U2' F2 Rw2 F2'" },
5354
{ name: "LUCAS", alg: "Rw U2 Rw x U2 Rw U2 Rw' U2 Lw U2 Rw' U2 Rw U2 Rw' U2 Rw'" },

0 commit comments

Comments
 (0)