Revision 5043d5d0
Added by Leszek Koltunski about 3 years ago
| src/main/java/org/distorted/objects/TwistyBandaged2Bar.java | ||
|---|---|---|
| 101 | 101 |
// PUBLIC API |
| 102 | 102 |
// TODO |
| 103 | 103 |
|
| 104 |
public void randomizeNewScramble(int[] scramble, Random rnd, int oldRotAxis, int oldRow, |
|
| 105 |
int numScramble, int remScrambles, int remDoubleScrambles) |
|
| 104 |
public void randomizeNewScramble(int[][] scramble, Random rnd, int num) |
|
| 106 | 105 |
{
|
| 107 |
if( numScramble==1 )
|
|
| 106 |
if( num==0 )
|
|
| 108 | 107 |
{
|
| 109 |
scramble[0] = rnd.nextInt(ROTATION_AXIS.length); |
|
| 108 |
scramble[num][0] = rnd.nextInt(ROTATION_AXIS.length);
|
|
| 110 | 109 |
} |
| 111 | 110 |
else |
| 112 | 111 |
{
|
| 113 | 112 |
int newVector = rnd.nextInt(ROTATION_AXIS.length-1); |
| 114 |
scramble[0] = (newVector>=oldRotAxis ? newVector+1 : newVector);
|
|
| 113 |
scramble[num][0] = (newVector>=scramble[num-1][0] ? newVector+1 : newVector);
|
|
| 115 | 114 |
} |
| 116 | 115 |
|
| 117 | 116 |
float rowFloat = rnd.nextFloat(); |
| ... | ... | |
| 120 | 119 |
{
|
| 121 | 120 |
if( rowFloat<=mRowChances[row] ) |
| 122 | 121 |
{
|
| 123 |
scramble[1] = row; |
|
| 122 |
scramble[num][1] = row;
|
|
| 124 | 123 |
break; |
| 125 | 124 |
} |
| 126 | 125 |
} |
| 127 | 126 |
|
| 128 |
int random = rnd.nextInt(remScrambles); |
|
| 129 |
int result = random<remDoubleScrambles ? 2:1; |
|
| 130 |
int sign = rnd.nextInt(2); |
|
| 131 |
|
|
| 132 |
scramble[2] = sign==0 ? result : -result; |
|
| 127 |
switch( rnd.nextInt(4) ) |
|
| 128 |
{
|
|
| 129 |
case 0: scramble[num][2] = -2; break; |
|
| 130 |
case 1: scramble[num][2] = -1; break; |
|
| 131 |
case 2: scramble[num][2] = 1; break; |
|
| 132 |
case 3: scramble[num][2] = 2; break; |
|
| 133 |
} |
|
| 133 | 134 |
} |
| 134 | 135 |
|
| 135 | 136 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Refactor the automatic scrambling. From now on, it is not needed to care about single and double turns when randomizing a new turn.