Revision 89e078c8
Added by Leszek Koltunski almost 2 years ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 48 | 48 |
CU_343 ( TwistyCuboid.class , 23, R.drawable.cu_343, true, new InitData(new int[] {3,4,3})),
|
| 49 | 49 |
SQU1_3 ( TwistySquare1.class , 24, R.drawable.squ1_3, true, new InitData(new int[] {3,2,3})),
|
| 50 | 50 |
SQU2_3 ( TwistySquare2.class , 24, R.drawable.squ2_3, true, new InitData(new int[] {3,2,3})),
|
| 51 |
ULTI_2 ( TwistyUltimate.class , 18, R.drawable.ulti_2, true, new InitData(new int[] {2,2,2,2})),
|
|
| 52 |
KILO_3 ( TwistyKilominx.class , 18, R.drawable.kilo_3, true, new InitData(new int[] {3,3,3,3,3,3})),
|
|
| 53 |
MEGA_3 ( TwistyMegaminx.class , 21, R.drawable.mega_3, true, new InitData(new int[] {3,3,3,3,3,3})),
|
|
| 54 |
KILO_5 ( TwistyKilominx.class , 33, R.drawable.kilo_5, true, new InitData(new int[] {5,5,5,5,5,5})),
|
|
| 55 |
MEGA_5 ( TwistyMegaminx.class , 37, R.drawable.mega_5, true, new InitData(new int[] {5,5,5,5,5,5})),
|
|
| 56 | 51 |
MORP_2 ( TwistyMorphix.class , 12, R.drawable.morp_2, true, new InitData(new int[] {2,2,2})),
|
| 57 | 52 |
JING_2 ( TwistyJing.class , 11, R.drawable.jing_2, true, new InitData(new int[] {2,2,2,2})),
|
| 58 | 53 |
PYRA_3 ( TwistyPyraminx.class , 10, R.drawable.pyra_3, true, new InitData(new int[] {3,3,3,3})),
|
| ... | ... | |
| 63 | 58 |
DIAM_2 ( TwistyDiamond.class , 12, R.drawable.diam_2, true, new InitData(new int[] {2,2,2,2})),
|
| 64 | 59 |
DIAM_3 ( TwistyDiamond.class , 24, R.drawable.diam_3, true, new InitData(new int[] {3,3,3,3})),
|
| 65 | 60 |
DIAM_4 ( TwistyDiamond.class , 32, R.drawable.diam_4, true, new InitData(new int[] {4,4,4,4})),
|
| 61 |
ULTI_2 ( TwistyUltimate.class , 18, R.drawable.ulti_2, true, new InitData(new int[] {2,2,2,2})),
|
|
| 62 |
KILO_3 ( TwistyKilominx.class , 18, R.drawable.kilo_3, true, new InitData(new int[] {3,3,3,3,3,3})),
|
|
| 63 |
MEGA_3 ( TwistyMegaminx.class , 21, R.drawable.mega_3, true, new InitData(new int[] {3,3,3,3,3,3})),
|
|
| 64 |
KILO_5 ( TwistyKilominx.class , 33, R.drawable.kilo_5, true, new InitData(new int[] {5,5,5,5,5,5})),
|
|
| 65 |
MEGA_5 ( TwistyMegaminx.class , 37, R.drawable.mega_5, true, new InitData(new int[] {5,5,5,5,5,5})),
|
|
| 66 |
CRYS_3 ( TwistyCrystal.class , 27, R.drawable.crys_3, true, new InitData(new int[] {3,3,3,3,3,3})),
|
|
| 67 |
STAR_3 ( TwistyStarminx.class , 27, R.drawable.star_3, true, new InitData(new int[] {3,3,3,3,3,3})),
|
|
| 68 |
PENT_2 ( TwistyPentultimate.class , 21, R.drawable.pent_2, true, new InitData(new int[] {2,2,2,2,2,2})),
|
|
| 66 | 69 |
DINO_3 ( TwistyDino6.class , 10, R.drawable.dino_3, true, new InitData(new int[] {3,3,3,3})),
|
| 67 | 70 |
DIN4_3 ( TwistyDino4.class , 7, R.drawable.din4_3, true, new InitData(new int[] {3,3,3,3})),
|
| 68 | 71 |
MIRR_2 ( TwistyMirror.class , 12, R.drawable.mirr_2, true, new InitData(new int[] {2,2,2})),
|
| 69 | 72 |
MIRR_3 ( TwistyMirror.class , 17, R.drawable.mirr_3, true, new InitData(new int[] {3,3,3})),
|
| 70 | 73 |
MIRR_4 ( TwistyMirror.class , 24, R.drawable.mirr_4, true, new InitData(new int[] {4,4,4})),
|
| 71 |
FISH_3 ( TwistyFisher.class , 24, R.drawable.fish_3, true, new InitData(new int[] {3,3,3})),
|
|
| 72 |
WIND_3 ( TwistyWindmill.class , 24, R.drawable.wind_3, true, new InitData(new int[] {3,3,3})),
|
|
| 73 |
AXIS_3 ( TwistyAxis.class , 24, R.drawable.axis_3, true, new InitData(new int[] {3,3,3})),
|
|
| 74 | 74 |
IVY_2 ( TwistyIvy.class , 8, R.drawable.ivy_2 , true, new InitData(new int[] {2,2,2,2})),
|
| 75 | 75 |
REX_3 ( TwistyRex.class , 19, R.drawable.rex_3 , true, new InitData(new int[] {3,3,3,3})),
|
| 76 | 76 |
REDI_3 ( TwistyRedi.class , 16, R.drawable.redi_3, true, new InitData(new int[] {3,3,3,3})),
|
| ... | ... | |
| 78 | 78 |
SKEW_2 ( TwistySkewb.class , 11, R.drawable.skew_2, true, new InitData(new int[] {2,2,2,2})),
|
| 79 | 79 |
SKEW_3 ( TwistySkewb.class , 21, R.drawable.skew_3, true, new InitData(new int[] {3,3,3,3})),
|
| 80 | 80 |
CONT_2 ( TwistyContainer.class , 12, R.drawable.cont_2, true, new InitData(new int[] {2,2,2,2})),
|
| 81 |
FISH_3 ( TwistyFisher.class , 24, R.drawable.fish_3, true, new InitData(new int[] {3,3,3})),
|
|
| 82 |
WIND_3 ( TwistyWindmill.class , 24, R.drawable.wind_3, true, new InitData(new int[] {3,3,3})),
|
|
| 83 |
AXIS_3 ( TwistyAxis.class , 24, R.drawable.axis_3, true, new InitData(new int[] {3,3,3})),
|
|
| 84 |
VOID_3 ( TwistyVoid.class , 17, R.drawable.void_3, true, new InitData(new int[] {3,3,3})),
|
|
| 81 | 85 |
|
| 82 |
CRA1_2 ( TwistyCrazy2x2.class , 16, R.drawable.cra1_2, true, new InitData(new int[] {2,2,2} )),
|
|
| 83 |
CRA1_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra1_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.CRAZY )),
|
|
| 84 |
CRA2_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra2_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MERCURY)),
|
|
| 85 |
CRA3_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra3_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.VENUS )),
|
|
| 86 |
CRA4_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra4_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.EARTH )),
|
|
| 87 |
CRA5_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra5_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MARS )),
|
|
| 88 |
CRA6_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra6_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.JUPITER)),
|
|
| 89 |
CRA7_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra7_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.SATURN )),
|
|
| 90 |
CRA8_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra8_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.URANUS )),
|
|
| 91 |
CRA9_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra9_3, true, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.NEPTUNE)),
|
|
| 92 |
|
|
| 93 |
VOID_3 ( TwistyVoid.class , 17, R.drawable.void_3, false, new InitData(new int[] {3,3,3})), // wasDownloadableButNowIsBuiltIn()
|
|
| 94 |
CRYS_3 ( TwistyCrystal.class , 27, R.drawable.crys_3, false, new InitData(new int[] {3,3,3,3,3,3})), // function!
|
|
| 95 |
STAR_3 ( TwistyStarminx.class , 27, R.drawable.star_3, false, new InitData(new int[] {3,3,3,3,3,3})),
|
|
| 96 |
PENT_2 ( TwistyPentultimate.class , 21, R.drawable.pent_2, false, new InitData(new int[] {2,2,2,2,2,2})),
|
|
| 97 |
MIXU_3 ( TwistyMixup3x3.class , 24, R.drawable.mixu_3, false, new InitData(new int[] {3,3,3})),
|
|
| 86 |
MIXU_3 ( TwistyMixup3x3.class , 24, R.drawable.mixu_3, false, new InitData(new int[] {3,3,3})), // wasDownloadableButNowIsBuiltIn()
|
|
| 98 | 87 |
MIXP_3 ( TwistyMixup3x3Plus.class , 28, R.drawable.mixp_3, false, new InitData(new int[] {3,3,3})),
|
| 88 |
CRA1_2 ( TwistyCrazy2x2.class , 16, R.drawable.cra1_2, false, new InitData(new int[] {2,2,2} )),
|
|
| 89 |
CRA1_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra1_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.CRAZY )),
|
|
| 90 |
CRA2_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra2_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MERCURY)),
|
|
| 91 |
CRA3_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra3_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.VENUS )),
|
|
| 92 |
CRA4_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra4_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.EARTH )),
|
|
| 93 |
CRA5_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra5_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MARS )),
|
|
| 94 |
CRA6_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra6_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.JUPITER)),
|
|
| 95 |
CRA7_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra7_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.SATURN )),
|
|
| 96 |
CRA8_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra8_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.URANUS )),
|
|
| 97 |
CRA9_3 ( TwistyCrazy3x3.class , 22, R.drawable.cra9_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.NEPTUNE)),
|
|
| 99 | 98 |
; |
| 100 | 99 |
|
| 101 | 100 |
public static int NUM_OBJECTS; |
| ... | ... | |
| 141 | 140 |
|
| 142 | 141 |
public static boolean wasDownloadableButNowIsBuiltIn(int ord) |
| 143 | 142 |
{
|
| 144 |
return ((ord>=CONT_2.ordinal() && ord<NUM_OBJECTS) ||
|
|
| 143 |
return ((ord>=AXIS_3.ordinal() && ord<NUM_OBJECTS) ||
|
|
| 145 | 144 |
ord==MIRR_4.ordinal() || ord==FISH_3.ordinal() || |
| 146 |
ord==AXIS_3.ordinal() || ord==MORP_2.ordinal() ); |
|
| 145 |
ord==MORP_2.ordinal() || ord==CONT_2.ordinal() || |
|
| 146 |
ord==CRYS_3.ordinal() || ord==STAR_3.ordinal() || |
|
| 147 |
ord==PENT_2.ordinal() ); |
|
| 147 | 148 |
} |
| 148 | 149 |
|
| 149 | 150 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Make 4 puzzles built-in.