Revision 8de56b9d
Added by Leszek Koltunski over 3 years ago
src/main/java/org/distorted/objects/ObjectList.java | ||
---|---|---|
93 | 93 |
30 |
94 | 94 |
), |
95 | 95 |
|
96 |
ULTI ( |
|
97 |
new int[][] { |
|
98 |
{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} , |
|
99 |
}, |
|
100 |
TwistyUltimate.class, |
|
101 |
new MovementUltimate(), |
|
102 |
3, |
|
103 |
30 |
|
104 |
), |
|
105 |
|
|
106 |
DIAM ( |
|
107 |
new int[][] { |
|
108 |
{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} , |
|
109 |
{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} , |
|
110 |
{4 , 32, 32, 0, R.drawable.ui_small_diam3, R.drawable.ui_medium_diam3, R.drawable.ui_big_diam3, R.drawable.ui_huge_diam3} , |
|
111 |
}, |
|
112 |
TwistyDiamond.class, |
|
113 |
new MovementDiamond(), |
|
114 |
3, |
|
115 |
60 |
|
116 |
), |
|
117 |
|
|
96 | 118 |
DINO ( |
97 | 119 |
new int[][] { |
98 | 120 |
{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} , |
99 | 121 |
}, |
100 | 122 |
TwistyDino6.class, |
101 | 123 |
new MovementDino(), |
102 |
3,
|
|
124 |
4,
|
|
103 | 125 |
60 |
104 | 126 |
), |
105 | 127 |
|
... | ... | |
109 | 131 |
}, |
110 | 132 |
TwistyDino4.class, |
111 | 133 |
new MovementDino(), |
112 |
3,
|
|
134 |
4,
|
|
113 | 135 |
60 |
114 | 136 |
), |
115 | 137 |
|
... | ... | |
119 | 141 |
}, |
120 | 142 |
TwistyRedi.class, |
121 | 143 |
new MovementRedi(), |
122 |
3,
|
|
144 |
4,
|
|
123 | 145 |
60 |
124 | 146 |
), |
125 | 147 |
|
... | ... | |
129 | 151 |
}, |
130 | 152 |
TwistyHelicopter.class, |
131 | 153 |
new MovementHelicopter(), |
132 |
3,
|
|
154 |
4,
|
|
133 | 155 |
60 |
134 | 156 |
), |
135 | 157 |
|
... | ... | |
140 | 162 |
}, |
141 | 163 |
TwistySkewb.class, |
142 | 164 |
new MovementSkewb(), |
143 |
4,
|
|
165 |
5,
|
|
144 | 166 |
60 |
145 | 167 |
), |
146 | 168 |
|
... | ... | |
150 | 172 |
}, |
151 | 173 |
TwistyIvy.class, |
152 | 174 |
new MovementIvy(), |
153 |
4,
|
|
175 |
5,
|
|
154 | 176 |
60 |
155 | 177 |
), |
156 | 178 |
|
... | ... | |
160 | 182 |
}, |
161 | 183 |
TwistyRex.class, |
162 | 184 |
new MovementRex(), |
163 |
4,
|
|
185 |
5,
|
|
164 | 186 |
60 |
165 | 187 |
), |
166 | 188 |
|
... | ... | |
170 | 192 |
}, |
171 | 193 |
TwistyBandagedFused.class, |
172 | 194 |
new MovementCube(), |
173 |
5,
|
|
195 |
6,
|
|
174 | 196 |
60 |
175 | 197 |
), |
176 | 198 |
|
... | ... | |
180 | 202 |
}, |
181 | 203 |
TwistyBandaged2Bar.class, |
182 | 204 |
new MovementCube(), |
183 |
5,
|
|
205 |
6,
|
|
184 | 206 |
60 |
185 | 207 |
), |
186 | 208 |
|
... | ... | |
190 | 212 |
}, |
191 | 213 |
TwistyBandaged3Plate.class, |
192 | 214 |
new MovementCube(), |
193 |
5,
|
|
215 |
6,
|
|
194 | 216 |
60 |
195 | 217 |
), |
196 | 218 |
|
... | ... | |
200 | 222 |
}, |
201 | 223 |
TwistyBandagedEvil.class, |
202 | 224 |
new MovementCube(), |
203 |
5, |
|
204 |
60 |
|
205 |
), |
|
206 |
|
|
207 |
DIAM ( |
|
208 |
new int[][] { |
|
209 |
{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} , |
|
210 |
{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} , |
|
211 |
}, |
|
212 |
TwistyDiamond.class, |
|
213 |
new MovementDiamond(), |
|
214 | 225 |
6, |
215 | 226 |
60 |
216 | 227 |
), |
... | ... | |
221 | 232 |
}, |
222 | 233 |
TwistySquare1.class, |
223 | 234 |
new MovementSquare(), |
224 |
6,
|
|
235 |
7,
|
|
225 | 236 |
60 |
226 | 237 |
), |
227 | 238 |
|
... | ... | |
231 | 242 |
}, |
232 | 243 |
TwistySquare2.class, |
233 | 244 |
new MovementSquare(), |
234 |
6,
|
|
245 |
7,
|
|
235 | 246 |
60 |
236 | 247 |
), |
237 | 248 |
|
238 |
ULTI ( |
|
239 |
new int[][] { |
|
240 |
{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} , |
|
241 |
}, |
|
242 |
TwistyUltimate.class, |
|
243 |
new MovementUltimate(), |
|
244 |
7, |
|
245 |
30 |
|
246 |
), |
|
247 | 249 |
; |
248 | 250 |
|
249 | 251 |
public static final int NUM_OBJECTS = values().length; |
... | ... | |
656 | 658 |
case 2: return new TwistyPyraminx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
657 | 659 |
case 3: return new TwistyKilominx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
658 | 660 |
case 4: return new TwistyMegaminx (size, quat, texture, mesh, effects, moves, res, scrWidth); |
659 |
case 5: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
660 |
case 6: return new TwistyDino4 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
661 |
case 7: return new TwistyRedi (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
662 |
case 8: return new TwistyHelicopter (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
663 |
case 9: return new TwistySkewb (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
664 |
case 10: return new TwistyIvy (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
665 |
case 11: return new TwistyRex (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
666 |
case 12: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
667 |
case 13: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
668 |
case 14: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
669 |
case 15: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
670 |
case 16: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
671 |
case 17: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
672 |
case 18: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
673 |
case 19: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
661 |
case 5: return new TwistyUltimate (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
662 |
case 6: return new TwistyDiamond (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
663 |
case 7: return new TwistyDino6 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
664 |
case 8: return new TwistyDino4 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
665 |
case 9: return new TwistyRedi (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
666 |
case 10: return new TwistyHelicopter (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
667 |
case 11: return new TwistySkewb (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
668 |
case 12: return new TwistyIvy (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
669 |
case 13: return new TwistyRex (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
670 |
case 14: return new TwistyBandagedFused (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
671 |
case 15: return new TwistyBandaged2Bar (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
672 |
case 16: return new TwistyBandaged3Plate(size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
673 |
case 17: return new TwistyBandagedEvil (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
674 |
case 18: return new TwistySquare1 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
675 |
case 19: return new TwistySquare2 (size, quat, texture, mesh, effects, moves, res, scrWidth);
|
|
674 | 676 |
} |
675 | 677 |
|
676 | 678 |
return null; |
Also available in: Unified diff
Add Master FTO.