commit 132841b6ff968361caa4101bc9c41471e4b721ad Author: Leszek Koltunski Date: Wed Jun 9 00:13:43 2021 +0200 Squares: add tutorials. Correct the order of objects in the tutorial dialog. diff --git a/src/main/java/org/distorted/objects/TwistySquare2.java b/src/main/java/org/distorted/objects/TwistySquare2.java index 0cddb112..694a8a9a 100644 --- a/src/main/java/org/distorted/objects/TwistySquare2.java +++ b/src/main/java/org/distorted/objects/TwistySquare2.java @@ -143,7 +143,6 @@ class TwistySquare2 extends TwistySquare { 2, 0, 0, 0, 0, 0 }, { 2, 0, 5, 0, 0, 0 }, { 2, 0, 1, 0, 0, 0 }, - { 0, 3, 4, 0, 0, 0 }, { 0, 3, 0, 0, 0, 0 }, { 0, 3, 5, 0, 0, 0 }, diff --git a/src/main/java/org/distorted/tutorials/TutorialList.java b/src/main/java/org/distorted/tutorials/TutorialList.java index ccf08f2d..56b777c0 100644 --- a/src/main/java/org/distorted/tutorials/TutorialList.java +++ b/src/main/java/org/distorted/tutorials/TutorialList.java @@ -129,6 +129,63 @@ public enum TutorialList } ), + KILO3( ObjectList.KILO, 3, + new String[][] { + {"gb","grgGgUSxiQg","How to Solve the Kilominx","Z3"}, + {"es","g6WMYjkCLok","Resolver Kilominx","Cuby"}, + {"ru","gjaknjuZXPs","Киломинкс как собрать","CUBES WORLD"}, + {"fr","F7z6LztN-7A","Résoudre le Kilominx","Twins Cuber"}, + {"de","fcmJdpLfZwk","Megaminx 2x2 lösen","JamesKnopf"}, + {"pl","tdWh8f8qpq4","Kilominx TUTORIAL PL","MrUK"}, + {"kr","8-X4GhQnE5I","2X2 킬로밍크스 TUTORIAL","큐브놀이터"}, + } + ), + + KILO5( ObjectList.KILO, 5, + new String[][] { + {"gb","VAnzC2SYVc4","How To Solve A Master Kilominx","Grizz Media"}, + {"es","ozINTg-61Fs","Tutorial Master Kilominx","RubikArt"}, + {"ru","0aemQayCZRc","Как собрать Мастер Киломинкс ч.1","Артем Мартиросов"}, + {"ru","ohOUFTx-oQI","Как собрать Мастер Киломинкс ч.2","Артем Мартиросов"}, + {"ru","YRXRdT2jCn8","Как собрать Мастер Киломинкс ч.3","Артем Мартиросов"}, + {"fr","usMiWt44aqo","Résolution du Master Kilominx","Asthalis"}, + {"pl","rdln0IG86_s","Master Kilominx TUTORIAL PL","MrUK"}, + {"kr","dvy-GxCjm5c","마스터 킬로밍크스 배우기 1","vincentcube"}, + {"kr","Jm0B12vNxsE","마스터 킬로밍크스 배우기 2","vincentcube"}, + {"kr","H1I18FVpr6g","마스터 킬로밍크스 배우기 3","vincentcube"}, + } + ), + + MEGA3( ObjectList.MEGA, 3, + new String[][] { + {"gb","j4x61L5Onzk","How to Solve the Megaminx","Z3"}, + {"es","xuKbT6Il0Ko","Resolver Megaminx","Cuby"}, + {"ru","WgoguOY3tKI","Как собрать Мегаминкс","Алексей Ярыгин"}, + {"fr","Ln1vl85puKo","Résoudre le Megaminx","Victor Colin"}, + {"de","d-GQD6CBdB8","Megaminx lösen","Pezcraft"}, + {"pl","BZTW6ApeRZE","Jak ułożyć: Megaminx","DżoDżo"}, + {"kr","2NUsMclrD-0","메가밍크스 예시솔빙","iamzoone"}, + } + ), + + MEGA5( ObjectList.MEGA, 5, + new String[][] { + {"gb","MNBMm8BnHtQ","Solve the Gigaminx Part 1","BeardedCubing"}, + {"gb","QrrP4GwqVMw","Solve the Gigaminx Part 2","BeardedCubing"}, + {"es","ex5EQMBxV1U","Tutorial Gigaminx","RubikArt"}, + {"ru","UJYK3SHjSGg","Как собрать Гигаминкс ч.1","Артем Мартиросов"}, + {"ru","-iBCpr4Gwsw","Как собрать Гигаминкс ч.2","Артем Мартиросов"}, + {"ru","4-dI7NCW8n8","Как собрать Гигаминкс ч.3","Артем Мартиросов"}, + {"fr","e485fh0V1dg","Résolution du Gigaminx","Asthalis"}, + {"de","APSAj4UtOAg","Megaminx 5x5 lösen","JamesKnopf"}, + {"pl","qbKLMCX1wKg","Jak ułożyć Gigaminxa cz.1","chomik19751"}, + {"pl","JQOXD3qleH4","Jak ułożyć Gigaminxa cz.2","chomik19751"}, + {"pl","WF2katJ22FA","Jak ułożyć Gigaminxa cz.3","chomik19751"}, + {"pl","jlyRrJjH4qQ","Jak ułożyć Gigaminxa cz.4","chomik19751"}, + {"kr","HfPFrWuz6z4","기가밍크스 gigaminx","큐브놀이터"}, + } + ), + DINO3 ( ObjectList.DINO, 3, new String[][] { {"gb","puTJZqFBQwo","Dino Skewb Cube Tutorial","Bearded Cubing"}, @@ -217,63 +274,6 @@ public enum TutorialList } ), - KILO3( ObjectList.KILO, 3, - new String[][] { - {"gb","grgGgUSxiQg","How to Solve the Kilominx","Z3"}, - {"es","g6WMYjkCLok","Resolver Kilominx","Cuby"}, - {"ru","gjaknjuZXPs","Киломинкс как собрать","CUBES WORLD"}, - {"fr","F7z6LztN-7A","Résoudre le Kilominx","Twins Cuber"}, - {"de","fcmJdpLfZwk","Megaminx 2x2 lösen","JamesKnopf"}, - {"pl","tdWh8f8qpq4","Kilominx TUTORIAL PL","MrUK"}, - {"kr","8-X4GhQnE5I","2X2 킬로밍크스 TUTORIAL","큐브놀이터"}, - } - ), - - KILO5( ObjectList.KILO, 5, - new String[][] { - {"gb","VAnzC2SYVc4","How To Solve A Master Kilominx","Grizz Media"}, - {"es","ozINTg-61Fs","Tutorial Master Kilominx","RubikArt"}, - {"ru","0aemQayCZRc","Как собрать Мастер Киломинкс ч.1","Артем Мартиросов"}, - {"ru","ohOUFTx-oQI","Как собрать Мастер Киломинкс ч.2","Артем Мартиросов"}, - {"ru","YRXRdT2jCn8","Как собрать Мастер Киломинкс ч.3","Артем Мартиросов"}, - {"fr","usMiWt44aqo","Résolution du Master Kilominx","Asthalis"}, - {"pl","rdln0IG86_s","Master Kilominx TUTORIAL PL","MrUK"}, - {"kr","dvy-GxCjm5c","마스터 킬로밍크스 배우기 1","vincentcube"}, - {"kr","Jm0B12vNxsE","마스터 킬로밍크스 배우기 2","vincentcube"}, - {"kr","H1I18FVpr6g","마스터 킬로밍크스 배우기 3","vincentcube"}, - } - ), - - MEGA3( ObjectList.MEGA, 3, - new String[][] { - {"gb","j4x61L5Onzk","How to Solve the Megaminx","Z3"}, - {"es","xuKbT6Il0Ko","Resolver Megaminx","Cuby"}, - {"ru","WgoguOY3tKI","Как собрать Мегаминкс","Алексей Ярыгин"}, - {"fr","Ln1vl85puKo","Résoudre le Megaminx","Victor Colin"}, - {"de","d-GQD6CBdB8","Megaminx lösen","Pezcraft"}, - {"pl","BZTW6ApeRZE","Jak ułożyć: Megaminx","DżoDżo"}, - {"kr","2NUsMclrD-0","메가밍크스 예시솔빙","iamzoone"}, - } - ), - - MEGA5( ObjectList.MEGA, 5, - new String[][] { - {"gb","MNBMm8BnHtQ","Solve the Gigaminx Part 1","BeardedCubing"}, - {"gb","QrrP4GwqVMw","Solve the Gigaminx Part 2","BeardedCubing"}, - {"es","ex5EQMBxV1U","Tutorial Gigaminx","RubikArt"}, - {"ru","UJYK3SHjSGg","Как собрать Гигаминкс ч.1","Артем Мартиросов"}, - {"ru","-iBCpr4Gwsw","Как собрать Гигаминкс ч.2","Артем Мартиросов"}, - {"ru","4-dI7NCW8n8","Как собрать Гигаминкс ч.3","Артем Мартиросов"}, - {"fr","e485fh0V1dg","Résolution du Gigaminx","Asthalis"}, - {"de","APSAj4UtOAg","Megaminx 5x5 lösen","JamesKnopf"}, - {"pl","qbKLMCX1wKg","Jak ułożyć Gigaminxa cz.1","chomik19751"}, - {"pl","JQOXD3qleH4","Jak ułożyć Gigaminxa cz.2","chomik19751"}, - {"pl","WF2katJ22FA","Jak ułożyć Gigaminxa cz.3","chomik19751"}, - {"pl","jlyRrJjH4qQ","Jak ułożyć Gigaminxa cz.4","chomik19751"}, - {"kr","HfPFrWuz6z4","기가밍크스 gigaminx","큐브놀이터"}, - } - ), - BAN1( ObjectList.BAN1, 3, new String[][] { {"gb","F_iJk_IvpVo","Bandaged Cube","CanChrisSolve"}, @@ -334,6 +334,32 @@ public enum TutorialList {"de","6bO0AcwY5K8","Face Turning Octahedron - Tutorial","GerCubing"}, {"pl","huWg-ZfP-KY","Octahedron cube TUTORIAL PL","MrUk"} } + ), + + SQUA1 ( ObjectList.SQU1, 3, + new String[][] { + {"gb","0tX-f6RLgac","How to Solve the Square-1","Z3"}, + {"es","mGtHDWj_i1o","Resolver SQUARE-1","Cuby"}, + {"ru","XguuJTUwJoE","Как собрать Скваер-1","Алексей Ярыгин"}, + {"fr","knRmTSa6aHQ","Comment résoudre le Square-1 (1/3)","Valentino Cube"}, + {"fr","y-0ZrAgzETI","Comment résoudre le Square-1 (2/3)","Valentino Cube"}, + {"fr","tYbE9GfEokw","Comment résoudre le Square-1 (3/3)","Valentino Cube"}, + {"de","p9DMIzNQ3b8","Square-1 Tutorial (1/2)","Pezcraft"}, + {"de","gM6E28JGmoo","Square-1 Tutorial (2/2)","Pezcraft"}, + {"pl","_0rsImrp9jc","Jak ułożyć: Square-1","DżoDżo"}, + {"kr","NcB50lWdQzE","스퀘어1 맞추는 방법","iamzoone"}, + } + ), + + SQUA2 ( ObjectList.SQU2, 3, + new String[][] { + {"gb","PPXojiFthEs","Square-2 Tutorial","SuperAntoniovivaldi"}, + {"es","IiMwc51xKBQ","Cómo resolver Square-2","skieur cubb"}, + {"ru","XZ6m8uF5oUk","Как собрать Square-2.","Илья Топор-Гилка"}, + {"fr","R-m9IgYAFPA","Tutoriel: résolution du Square-2","skieur cubb"}, + {"pl","SukHyoMzcgM","Square-2 TUTORIAL PL","MrUk"}, + {"kr","psG9Ar4pBrc","초보자를 위한 스퀘어2 해법","SlowCuberToumai"}, + } ); public static final int NUM_OBJECTS = values().length;