Project

General

Profile

« Previous | Next » 

Revision fd271599

Added by Leszek Koltunski about 1 year ago

Make the Masterball built-in - we need to displace the old version of it with an old scrambling mechanism.

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
100 100
  PDUO_2 ( TwistyPyraminxDuo.class    ,  4, R.drawable.pduo_2, true,     0, new InitData(new int[] {2,2,2,2})),
101 101
  PDIA_3 ( TwistyPyraminxDiamond.class, 12, R.drawable.pdia_3, true,    40, new InitData(new int[] {3,3,3})),
102 102

  
103
  BALL_4 ( TwistyMasterball.class     , 28, R.drawable.ball_4, false,   70, new InitData(new int[] {4,2,2,2,2})),
103
  BALL_4 ( TwistyMasterball.class     , 28, R.drawable.ball_4, true,    70, new InitData(new int[] {4,2,2,2,2})),
104 104
  BAN5_4 ( TwistyBandagedCuboid.class , 48, R.drawable.ban5_4, false,   50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_5)),
105 105
  BAN6_4 ( TwistyBandagedCuboid.class ,487, R.drawable.ban6_4, false,   50, new InitData(new int[] {4,4,4}, TwistyBandagedCuboid.POS_6)),
106 106
  CA_333 ( TwistyCamouflage.class     ,487, R.drawable.ca_333, false,   50, new InitData(new int[] {4,4,4}, TwistyCamouflage.CAM_333)),
src/main/java/org/distorted/objectlib/objects/TwistyMasterball.java
117 117
      {
118 118
      mEdges = new int[][]
119 119
        {
120
          {0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,20,1,21,1,22,1,23,1,24,1,25,1,26,1,27,1},
120
          { 0,1, 1,1, 2,1, 3,1, 4,1, 5,1, 6,1, 7,1, 8,1, 9,1,
121
           10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,
122
           20,1,21,1,22,1,23,1,24,1,25,1,26,1,27,1
123
          },
124

  
121 125
          {28,2,29,2,30,2,31,2,32,2,33,2,34,2,35,2 },
122
          {0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,20,1,21,1,22,1,23,1,24,1,25,1,26,1,27,1,
123
           28,0,29,0,30,0,31,0,32,0,33,0,34,0,35,0 }
126

  
127
          { 0,1, 1,1, 2,1, 3,1, 4,1, 5,1, 6,1, 7,1, 8,1, 9,1,
128
           10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,
129
           20,1,21,1,22,1,23,1,24,1,25,1,26,1,27,1,
130
           28,0,29,0,30,0,31,0,32,0,33,0,34,0,35,0
131
          }
124 132
        };
125 133
      }
126 134

  

Also available in: Unified diff