Project

General

Profile

« Previous | Next » 

Revision 40111169

Added by Leszek Koltunski almost 2 years ago

Move 'bandaged' from the main menu to the object popup.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
40 40
  CUBE_6 ( TwistyCuboid.class        , 35, R.drawable.cube_6, true, new InitData(new int[] {6,6,6})),
41 41

  
42 42
  CUBE_7 ( TwistyCuboid.class        , 42, R.drawable.cube_7, true, new InitData(new int[] {7,7,7})),
43
  FISH_3 ( TwistyFisher.class        , 24, R.drawable.fish_3, true, new InitData(new int[] {3,3,3})),
44
  WIND_3 ( TwistyWindmill.class      , 24, R.drawable.wind_3, true, new InitData(new int[] {3,3,3})),
45
  AXIS_3 ( TwistyAxis.class          , 24, R.drawable.axis_3, true, new InitData(new int[] {3,3,3})),
46
  VOID_3 ( TwistyVoid.class          , 17, R.drawable.void_3, true, new InitData(new int[] {3,3,3})),
47

  
43 48
  BAN1_3 ( TwistyBandagedCuboid.class, 16, R.drawable.ban1_3, true, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_1)),
44 49
  BAN2_3 ( TwistyBandagedCuboid.class, 20, R.drawable.ban2_3, true, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_2)),
45 50
  BAN3_3 ( TwistyBandagedCuboid.class, 16, R.drawable.ban3_3, true, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_3)),
46 51
  BAN4_3 ( TwistyBandagedCuboid.class, 22, R.drawable.ban4_3, true, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_4)),
52
  // bandaged creator goes here
47 53

  
48 54
  CU_323 ( TwistyCuboid.class        , 15, R.drawable.cu_323, true, new InitData(new int[] {3,2,3})),
49 55
  CU_232 ( TwistyCuboid.class        , 16, R.drawable.cu_232, true, new InitData(new int[] {2,3,2})),
......
87 93
  SKEW_3 ( TwistySkewb.class         , 21, R.drawable.skew_3, true, new InitData(new int[] {3,3,3,3})),
88 94
  CONT_2 ( TwistyContainer.class     , 12, R.drawable.cont_2, true, new InitData(new int[] {2,2,2,2})),
89 95

  
90
  FISH_3 ( TwistyFisher.class        , 24, R.drawable.fish_3, true, new InitData(new int[] {3,3,3})),
91
  WIND_3 ( TwistyWindmill.class      , 24, R.drawable.wind_3, true, new InitData(new int[] {3,3,3})),
92
  AXIS_3 ( TwistyAxis.class          , 24, R.drawable.axis_3, true, new InitData(new int[] {3,3,3})),
93
  VOID_3 ( TwistyVoid.class          , 17, R.drawable.void_3, true, new InitData(new int[] {3,3,3})),
94

  
95 96
  MIXU_3 ( TwistyMixup3x3.class      , 24, R.drawable.mixu_3, false, new InitData(new int[] {3,3,3})),   // wasDownloadableButNowIsBuiltIn()
96 97
  MIXP_3 ( TwistyMixup3x3Plus.class  , 28, R.drawable.mixp_3, false, new InitData(new int[] {3,3,3})),
97 98
  CRA1_2 ( TwistyCrazy2x2.class      , 16, R.drawable.cra1_2, false, new InitData(new int[] {2,2,2})),

Also available in: Unified diff