Project

General

Profile

« Previous | Next » 

Revision 50ff73d9

Added by Leszek Koltunski about 3 years ago

Make Mixup & Mixup Plus built-in

View differences:

src/main/java/org/distorted/objectlib/main/ObjectType.java
83 83 
  SKEW_3 ( TwistySkewb.class         , 21, R.drawable.skew_3, true, new InitData(new int[] {3,3,3,3})),
84 84 
  CONT_2 ( TwistyContainer.class     , 12, R.drawable.cont_2, true, new InitData(new int[] {2,2,2,2})),
85 85 

  		




  86
  
  
    
  MIXU_3 ( TwistyMixup3x3.class      , 24, R.drawable.mixu_3, false, new InitData(new int[] {3,3,3})),   // wasDownloadableButNowIsBuiltIn()


  		




  87
  
  
    
  MIXP_3 ( TwistyMixup3x3Plus.class  , 28, R.drawable.mixp_3, false, new InitData(new int[] {3,3,3})),


  		




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


  		




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


  		




  88
  88
  
    
  CRA1_2 ( TwistyCrazy2x2.class      , 16, R.drawable.cra1_2, false, new InitData(new int[] {2,2,2})),


  		




  89
  89
  
    
  CRA1_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra1_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.CRAZY  )),


  		




  90
  90
  
    
  CRA2_3 ( TwistyCrazy3x3.class      , 22, R.drawable.cra2_3, false, new InitData(new int[] {3,3,3}, TwistyCrazy3x3.MERCURY)),


  		




  ......




  144
  144
  
    
             ord==MORP_2.ordinal() || ord==CONT_2.ordinal() ||


  		




  145
  145
  
    
             ord==CRYS_3.ordinal() || ord==STAR_3.ordinal() ||


  		




  146
  146
  
    
             ord==PENT_2.ordinal() || ord==AXIS_3.ordinal() ||


  		




  147
  
  
    
             ord==TRAJ_4.ordinal() || ord==VOID_3.ordinal()  );


  		




  
  147
  
    
             ord==TRAJ_4.ordinal() || ord==VOID_3.ordinal() ||


  		




  
  148
  
    
             ord==MIXU_3.ordinal() || ord== MIXP_3.ordinal() );


  		




  148
  149
  
    
    }


  		




  149
  150
  
    

  		




  150
  151
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff