commit 8de56b9d5c1f1f04ab62d016614a4c9bea5b717e Author: Leszek Koltunski Date: Thu Jul 29 21:50:07 2021 +0200 Add Master FTO. diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java index 59ecf056..7f0e81f4 100644 --- a/src/main/java/org/distorted/objects/ObjectList.java +++ b/src/main/java/org/distorted/objects/ObjectList.java @@ -93,13 +93,35 @@ public enum ObjectList 30 ), + ULTI ( + new int[][] { + {2 , 18, 18, R.raw.ulti, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} , + }, + TwistyUltimate.class, + new MovementUltimate(), + 3, + 30 + ), + + DIAM ( + new int[][] { + {2 , 10, 12, R.raw.diam2, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} , + {3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} , + {4 , 32, 32, 0, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} , + }, + TwistyDiamond.class, + new MovementDiamond(), + 3, + 60 + ), + DINO ( new int[][] { {3 , 10, 10, R.raw.dino, R.drawable.ui_small_dino, R.drawable.ui_medium_dino, R.drawable.ui_big_dino, R.drawable.ui_huge_dino} , }, TwistyDino6.class, new MovementDino(), - 3, + 4, 60 ), @@ -109,7 +131,7 @@ public enum ObjectList }, TwistyDino4.class, new MovementDino(), - 3, + 4, 60 ), @@ -119,7 +141,7 @@ public enum ObjectList }, TwistyRedi.class, new MovementRedi(), - 3, + 4, 60 ), @@ -129,7 +151,7 @@ public enum ObjectList }, TwistyHelicopter.class, new MovementHelicopter(), - 3, + 4, 60 ), @@ -140,7 +162,7 @@ public enum ObjectList }, TwistySkewb.class, new MovementSkewb(), - 4, + 5, 60 ), @@ -150,7 +172,7 @@ public enum ObjectList }, TwistyIvy.class, new MovementIvy(), - 4, + 5, 60 ), @@ -160,7 +182,7 @@ public enum ObjectList }, TwistyRex.class, new MovementRex(), - 4, + 5, 60 ), @@ -170,7 +192,7 @@ public enum ObjectList }, TwistyBandagedFused.class, new MovementCube(), - 5, + 6, 60 ), @@ -180,7 +202,7 @@ public enum ObjectList }, TwistyBandaged2Bar.class, new MovementCube(), - 5, + 6, 60 ), @@ -190,7 +212,7 @@ public enum ObjectList }, TwistyBandaged3Plate.class, new MovementCube(), - 5, + 6, 60 ), @@ -200,17 +222,6 @@ public enum ObjectList }, TwistyBandagedEvil.class, new MovementCube(), - 5, - 60 - ), - - DIAM ( - new int[][] { - {2 , 10, 12, R.raw.diam2, R.drawable.ui_small_diam2, R.drawable.ui_medium_diam2, R.drawable.ui_big_diam2, R.drawable.ui_huge_diam2} , - {3 , 18, 24, R.raw.diam3, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} , - }, - TwistyDiamond.class, - new MovementDiamond(), 6, 60 ), @@ -221,7 +232,7 @@ public enum ObjectList }, TwistySquare1.class, new MovementSquare(), - 6, + 7, 60 ), @@ -231,19 +242,10 @@ public enum ObjectList }, TwistySquare2.class, new MovementSquare(), - 6, + 7, 60 ), - ULTI ( - new int[][] { - {2 , 18, 18, R.raw.ulti, R.drawable.ui_small_ulti, R.drawable.ui_medium_ulti, R.drawable.ui_big_ulti, R.drawable.ui_huge_ulti} , - }, - TwistyUltimate.class, - new MovementUltimate(), - 7, - 30 - ), ; public static final int NUM_OBJECTS = values().length; @@ -656,21 +658,21 @@ public enum ObjectList case 2: return new TwistyPyraminx (size, quat, texture, mesh, effects, moves, res, scrWidth); case 3: return new TwistyKilominx (size, quat, texture, mesh, effects, moves, res, scrWidth); case 4: return new TwistyMegaminx (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 5: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 6: return new TwistyDino4 (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 7: return new TwistyRedi (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 8: return new TwistyHelicopter (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 9: return new TwistySkewb (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 10: return new TwistyIvy (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 11: return new TwistyRex (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 12: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 13: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 14: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth); - case 15: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 16: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 17: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 18: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth); - case 19: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 5: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 6: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 7: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 8: return new TwistyDino4 (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 9: return new TwistyRedi (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 10: return new TwistyHelicopter (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 11: return new TwistySkewb (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 12: return new TwistyIvy (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 13: return new TwistyRex (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 14: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 15: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 16: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth); + case 17: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 18: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth); + case 19: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth); } return null;