update virtual fto keybinds

cs0x7f · Aug 30, 2024 · c5903b6 · c5903b6
1 parent 97d89a9
commit c5903b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/js/lib/poly3dlib.js b/src/js/lib/poly3dlib.js
@@ -980,11 +980,11 @@ var poly3d = (function() {
 				return ["[" + move + powfix + "]", move + powfix, move.toUpperCase() + powfix, move.toUpperCase() + 'w' + powfix][layer];
 			});
 		} else if (name == "fto") {
-			polyParam = [8, [-5, 1/3], [], [-5]];
-			parser = makeParser(/(?:^|\s*)\[?([URFDLT]|(?:B[RL]?))(')?(\])?(?:$|\s*)/g, function(m, p1, p2, p3) {
-				return [p3 || p1 == 'T' ? 0 : 1, p1 == 'T' ? 'URLF' : (p1[0] + p1.slice(1).toLowerCase()), p2 ? -1 : 1];
+			polyParam = [8, [-5, 1/3, -1/3], [], [-5]];
+			parser = makeParser(/(?:^|\s*)\[?([URFDLT]|(?:B[RL]?))(w)?(')?(\])?(?:$|\s*)/g, function(m, p1, p2, p3, p4) {
+				return [p4 || p1 == 'T' ? 0 : p2 ? 2 : 1, p1 == 'T' ? 'URLF' : (p1[0] + p1.slice(1).toLowerCase()), p3 ? -1 : 1];
 			}, function(layer, axis, pow) {
-				var move = (axis.length > 3 ? 'T' : axis.toUpperCase()) + (pow > 0 ? "" : "'");
+				var move = (axis.length > 3 ? 'T' : axis.toUpperCase()) + (layer == 2 ? 'w' : '') + (pow > 0 ? "" : "'");
 				return layer == 0 ? ('[' + move + ']') : move;
 			});
 		} else if (name == "klm" || name == "mgm" || name == "prc" || name == "giga") {

diff --git a/src/js/twisty/twistypoly.js b/src/js/twisty/twistypoly.js
@@ -200,7 +200,7 @@
 	twistyjs.registerTwisty("fto", function(scene, param) {
 		poly3d.getFamousPuzzle("fto", param);
 		var twisty = createCubeTwisty(scene, param);
-		bindKeyMap("I:R K:R' W:BR O:BR' S:D L:D' D:L E:L' J:U F:U' H:F G:F' ;:[U] A:[U'] T:[L'] Y:[R] N:[R'] B:[L] P:[F] Q:[F'] 0:T 1:T' 62:BR 63:R 64:[U2] 65:[U] 67:F2 69:F 41:L' 42:BR' 45:[U'] 46:[U2'] 47:F' 49:F2' 31:U2 32:U 36:R' 37:[F'] 39:R2' 12:U' 13:U2' 14:L 17:L2 19:[F] 91:[F'] 92:BR2 93:R2 94:F2' 96:F' 97:D2' 98:D' 73:[F] 72:BR2' 71:L2' 76:F2 74:F 79:D2 78:D 21:U 23:U' 24:BR 25:[R'] 26:BR' 27:BR2 28:[R2'] 29:BR2' 52:[R] 54:[U] 56:[U'] 58:[R'] 82:[R2] 85:[R] 87:D' 89:D", twisty);
+		bindKeyMap("I:R K:R' D:L E:L' J:U F:U' H:F G:F' S:D L:D' W:B O:B' 8:BR ,:BR' C:BL 3:BL' U:Rw M:Rw' R:Lw' V:Lw Y:[R] N:[R'] T:[L'] B:[L] ;:[U] A:[U'] P:T Q:T' 62:BR 63:R 64:[U2] 65:[U] 67:F2 69:F 41:L' 42:BR' 45:[U'] 46:[U2'] 47:F' 49:F2' 31:U2 32:U 36:R' 37:[F'] 39:R2' 12:U' 13:U2' 14:L 17:L2 19:[F] 91:[F'] 92:BR2 93:R2 94:F2' 96:F' 97:D2' 98:D' 73:[F] 72:BR2' 71:L2' 76:F2 74:F 79:D2 78:D 21:U 23:U' 24:BR 25:[R'] 26:BR' 27:BR2 28:[R2'] 29:BR2' 52:[R] 54:[U] 56:[U'] 58:[R'] 82:[R2] 85:[R] 87:D' 89:D", twisty);
 		return twisty;
 	});