Project

General

Profile

« Previous | Next » 

Revision 61f5c489

Added by Leszek Koltunski 12 months ago

Rearrange the objects and produce new JSONs.

View differences:

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

  		




  31
  31
  
    
  CUBE_7 ( TwistyCuboid.class         , 42, R.drawable.cube_7, true,   100, new InitData(new int[] {7,7,7})),


  		




  
  32
  
    
  FISH_3 ( TwistyFisher.class         , 24, R.drawable.fish_3, true,    50, new InitData(new int[] {3,3,3})),


  		




  
  33
  
    
  WIND_3 ( TwistyWindmill.class       , 24, R.drawable.wind_3, true,    50, new InitData(new int[] {3,3,3})),


  		




  
  34
  
    
  AXIS_3 ( TwistyAxis.class           , 24, R.drawable.axis_3, true,    60, new InitData(new int[] {3,3,3})),


  		




  
  35
  
    
  VOID_3 ( TwistyVoid.class           , 17, R.drawable.void_3, true,    70, new InitData(new int[] {3,3,3})),


  		




  
  36
  
    

  		




  
  37
  
    
  CA_333 ( TwistyCamouflage.class     ,487, R.drawable.ca_333, true,    50, new InitData(new int[] {4,4,4}, TwistyCamouflage.CAM_333)),


  		




  32
  38
  
    
  BAN1_3 ( TwistyBandagedCuboid.class , 16, R.drawable.ban1_3, true,     0, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_1)),


  		




  33
  39
  
    
  BAN2_3 ( TwistyBandagedCuboid.class , 20, R.drawable.ban2_3, true,    50, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_2)),


  		




  34
  40
  
    
  BAN3_3 ( TwistyBandagedCuboid.class , 16, R.drawable.ban3_3, true,    50, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_3)),


  		




  35
  41
  
    
  BAN4_3 ( TwistyBandagedCuboid.class , 22, R.drawable.ban4_3, true,    60, new InitData(new int[] {3,3,3}, TwistyBandagedCuboid.POS_4)),


  		




  36
  42
  
    

  		




  
  43
  
    
  BAN5_4 ( TwistyBandagedCuboid.class , 48, R.drawable.ban5_4, true,    50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_5)),


  		




  
  44
  
    
  BAN6_4 ( TwistyBandagedCuboid.class ,487, R.drawable.ban6_4, true,    50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_6)),


  		




  37
  45
  
    
  CU_323 ( TwistyCuboid.class         , 15, R.drawable.cu_323, true,    40, new InitData(new int[] {3,2,3})),


  		




  38
  46
  
    
  CU_232 ( TwistyCuboid.class         , 16, R.drawable.cu_232, true,     0, new InitData(new int[] {2,3,2})),


  		




  39
  47
  
    
  CU_343 ( TwistyCuboid.class         , 23, R.drawable.cu_343, true,    50, new InitData(new int[] {3,4,3})),


  		




  40
  
  
    
  SQU1_3 ( TwistySquare1.class        , 24, R.drawable.squ1_3, true,    70, new InitData(new int[] {3,2,3})),


  		




  41
  
  
    
  SQU2_3 ( TwistySquare2.class        , 24, R.drawable.squ2_3, true,    70, new InitData(new int[] {3,2,3})),


  		




  42
  48
  
    

  		




  43
  49
  
    
  MORP_2 ( TwistyMorphix.class        , 12, R.drawable.morp_2, true,     0, new InitData(new int[] {2,2,2})),


  		




  44
  50
  
    
  MORP_3 ( TwistyMorphix.class        , 17, R.drawable.morp_3, true ,   60, new InitData(new int[] {3,3,3})),


  		




  45
  51
  
    
  MORP_4 ( TwistyMorphix.class        , 24, R.drawable.morp_4, true ,   70, new InitData(new int[] {4,4,4})),


  		




  46
  52
  
    
  JING_2 ( TwistyJing.class           , 11, R.drawable.jing_2, true,    50, new InitData(new int[] {2,2,2,2})),


  		




  47
  
  
    
  PYRA_3 ( TwistyPyraminx.class       , 11, R.drawable.pyra_3, true,     0, new InitData(new int[] {3,3,3,3})),


  		




  
  53
  
    
  PDUO_2 ( TwistyPyraminxDuo.class    ,  4, R.drawable.pduo_2, true,     0, new InitData(new int[] {2,2,2,2})),


  		




  48
  54
  
    

  		




  
  55
  
    
  PYRA_3 ( TwistyPyraminx.class       , 11, R.drawable.pyra_3, true,     0, new InitData(new int[] {3,3,3,3})),


  		




  49
  56
  
    
  PYRA_4 ( TwistyPyraminx.class       , 17, R.drawable.pyra_4, true,    50, new InitData(new int[] {4,4,4,4})),


  		




  50
  57
  
    
  PYRA_5 ( TwistyPyraminx.class       , 23, R.drawable.pyra_5, true,    70, new InitData(new int[] {5,5,5,5})),


  		




  
  58
  
    
  ICOS_2 ( TwistyIcosamate.class      , 30, R.drawable.icos_2, true,    60, new InitData(new int[] {2,2,2,2,2,2})),


  		




  
  59
  
    
  ICOS_3 ( TwistyIcosamate.class      , 40, R.drawable.icos_3, true,    70, new InitData(new int[] {3,3,3,3,3,3})),


  		




  
  60
  
    

  		




  51
  61
  
    
  CRYS_3 ( TwistyCrystal.class        , 27, R.drawable.crys_3, true,    70, new InitData(new int[] {3,3,3,3,3,3})),


  		




  52
  62
  
    
  STAR_3 ( TwistyStarminx.class       , 27, R.drawable.star_3, true,    80, new InitData(new int[] {3,3,3,3,3,3})),


  		




  53
  63
  
    
  PENT_2 ( TwistyPentultimate.class   , 21, R.drawable.pent_2, true,    80, new InitData(new int[] {2,2,2,2,2,2})),


  		




  54
  
  
    

  		




  55
  64
  
    
  ULTI_2 ( TwistyUltimate.class       , 18, R.drawable.ulti_2, true,    70, new InitData(new int[] {2,2,2,2})),


  		




  56
  65
  
    
  KILO_3 ( TwistyKilominx.class       , 18, R.drawable.kilo_3, true,    50, new InitData(new int[] {3,3,3,3,3,3})),


  		




  
  66
  
    

  		




  57
  67
  
    
  MEGA_3 ( TwistyMegaminx.class       , 21, R.drawable.mega_3, true,     0, new InitData(new int[] {3,3,3,3,3,3})),


  		




  58
  68
  
    
  KILO_5 ( TwistyKilominx.class       , 33, R.drawable.kilo_5, true,    80, new InitData(new int[] {5,5,5,5,5,5})),


  		




  59
  69
  
    
  MEGA_5 ( TwistyMegaminx.class       , 40, R.drawable.mega_5, true,   100, new InitData(new int[] {5,5,5,5,5,5})),


  		




  
  70
  
    
  MIXU_3 ( TwistyMixup3x3.class       , 24, R.drawable.mixu_3, true,    70, new InitData(new int[] {3,3,3})),


  		




  
  71
  
    
  MIXP_3 ( TwistyMixup3x3Plus.class   , 28, R.drawable.mixp_3, true,    70, new InitData(new int[] {3,3,3})),


  		




  60
  72
  
    

  		




  61
  73
  
    
  TRAJ_3 ( TwistyTrajber.class        , 17, R.drawable.traj_3, true,    50, new InitData(new int[] {3,3,3})),


  		




  62
  74
  
    
  TRAJ_4 ( TwistyTrajber.class        , 24, R.drawable.traj_4, true,    60, new InitData(new int[] {4,4,4})),


  		




  ......




  64
  76
  
    
  DIAM_3 ( TwistyDiamond.class        , 24, R.drawable.diam_3, true,    60, new InitData(new int[] {3,3,3,3})),


  		




  65
  77
  
    
  DIAM_4 ( TwistyDiamond.class        , 32, R.drawable.diam_4, true,    80, new InitData(new int[] {4,4,4,4})),


  		




  66
  78
  
    

  		




  
  79
  
    
  PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, true,    40, new InitData(new int[] {3,3,3})),


  		




  
  80
  
    
  BALL_4 ( TwistyMasterball.class     , 28, R.drawable.ball_4, true,    70, new InitData(new int[] {4,2,2,2,2})),


  		




  
  81
  
    
  SQU0_3 ( TwistySquare0.class        , 18, R.drawable.squ0_3, true,    40, new InitData(new int[] {3,2,3})),


  		




  
  82
  
    
  SQU1_3 ( TwistySquare1.class        , 24, R.drawable.squ1_3, true,    70, new InitData(new int[] {3,2,3})),


  		




  
  83
  
    
  SQU2_3 ( TwistySquare2.class        , 24, R.drawable.squ2_3, true,    70, new InitData(new int[] {3,2,3})),


  		




  
  84
  
    

  		




  67
  85
  
    
  CRA1_2 ( TwistyCrazy2x2.class       , 16, R.drawable.cra1_2, true ,   50, new InitData(new int[] {2,2,2})),


  		




  68
  86
  
    
  CRA1_3 ( TwistyCrazy3x3.class       , 22, R.drawable.cra1_3, true ,   50, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.CRAZY  )),


  		




  69
  87
  
    
  CRA2_3 ( TwistyCrazy3x3.class       , 22, R.drawable.cra2_3, true ,   80, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MERCURY)),


  		




  ......




  88
  106
  
    
  SKEW_3 ( TwistySkewb.class          , 21, R.drawable.skew_3, true,    70, new InitData(new int[] {3,3,3,3})),


  		




  89
  107
  
    
  CONT_2 ( TwistyContainer.class      , 12, R.drawable.cont_2, true,    40, new InitData(new int[] {2,2,2,2})),


  		




  90
  108
  
    

  		




  91
  
  
    
  FISH_3 ( TwistyFisher.class         , 24, R.drawable.fish_3, true,    50, new InitData(new int[] {3,3,3})),


  		




  92
  
  
    
  WIND_3 ( TwistyWindmill.class       , 24, R.drawable.wind_3, true,    50, new InitData(new int[] {3,3,3})),


  		




  93
  
  
    
  AXIS_3 ( TwistyAxis.class           , 24, R.drawable.axis_3, true,    60, new InitData(new int[] {3,3,3})),


  		




  94
  
  
    
  VOID_3 ( TwistyVoid.class           , 17, R.drawable.void_3, true,    70, new InitData(new int[] {3,3,3})),


  		




  95
  
  
    
  MIXU_3 ( TwistyMixup3x3.class       , 24, R.drawable.mixu_3, true,    70, new InitData(new int[] {3,3,3})),


  		




  96
  
  
    

  		




  97
  
  
    
  MIXP_3 ( TwistyMixup3x3Plus.class   , 28, R.drawable.mixp_3, true,    70, new InitData(new int[] {3,3,3})),


  		




  98
  109
  
    
  DINO_3 ( TwistyDino6.class          , 10, R.drawable.dino_3, true,     0, new InitData(new int[] {3,3,3,3})),


  		




  99
  110
  
    
  DIN4_3 ( TwistyDino4.class          ,  9, R.drawable.din4_3, true,    30, new InitData(new int[] {3,3,3,3})),


  		




  100
  
  
    
  PDUO_2 ( TwistyPyraminxDuo.class    ,  4, R.drawable.pduo_2, true,     0, new InitData(new int[] {2,2,2,2})),


  		




  101
  
  
    
  PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, true,    40, new InitData(new int[] {3,3,3})),


  		




  102
  
  
    

  		




  103
  
  
    
  BALL_4 ( TwistyMasterball.class     , 28, R.drawable.ball_4, true,    70, new InitData(new int[] {4,2,2,2,2})),


  		




  104
  
  
    
  BAN5_4 ( TwistyBandagedCuboid.class , 48, R.drawable.ban5_4, false,   50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_5)),


  		




  105
  
  
    
  BAN6_4 ( TwistyBandagedCuboid.class ,487, R.drawable.ban6_4, false,   50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_6)),


  		




  106
  
  
    
  CA_333 ( TwistyCamouflage.class     ,487, R.drawable.ca_333, false,   50, new InitData(new int[] {4,4,4}, TwistyCamouflage.CAM_333)),


  		




  107
  
  
    
  ICOS_2 ( TwistyIcosamate.class      , 30, R.drawable.icos_2, false,   60, new InitData(new int[] {2,2,2,2,2,2})),


  		




  108
  
  
    

  		




  109
  
  
    
  ICOS_3 ( TwistyIcosamate.class      , 40, R.drawable.icos_3, false,   70, new InitData(new int[] {3,3,3,3,3,3})),


  		




  110
  
  
    
  SQU0_3 ( TwistySquare0.class        , 18, R.drawable.squ0_3, false,   40, new InitData(new int[] {3,2,3})),


  		




  111
  111
  
    
  COIN_3 ( TwistyCoinTetrahedron.class, 15, R.drawable.coin_3, false,   40, new InitData(new int[] {3,3,3,3})),


  		




  112
  112
  
    
  ;


  		




  113
  113
  
    

  		












Also available in:  Unified diff