Revision 6cf89a3e
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/TwistyJing.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.helpers.ObjectShape; |
| 25 | 25 |
import org.distorted.helpers.ObjectSticker; |
| 26 |
import org.distorted.helpers.ScrambleStateGraph;
|
|
| 26 |
import org.distorted.helpers.ScrambleState; |
|
| 27 | 27 |
import org.distorted.library.main.DistortedEffects; |
| 28 | 28 |
import org.distorted.library.main.DistortedTexture; |
| 29 | 29 |
import org.distorted.library.mesh.MeshSquare; |
| ... | ... | |
| 218 | 218 |
|
| 219 | 219 |
private int mCurrState; |
| 220 | 220 |
private int mIndexExcluded; |
| 221 |
private final ScrambleStateGraph[] mStates;
|
|
| 221 |
private final ScrambleState[] mStates; |
|
| 222 | 222 |
|
| 223 | 223 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 224 | 224 |
|
| ... | ... | |
| 229 | 229 |
|
| 230 | 230 |
int[] tmp = {0,-1,0, 0,1,0, 1,-1,0, 1,1,0 };
|
| 231 | 231 |
|
| 232 |
mStates = new ScrambleStateGraph[]
|
|
| 232 |
mStates = new ScrambleState[] |
|
| 233 | 233 |
{
|
| 234 |
new ScrambleStateGraph( new int[][] {tmp,tmp,tmp,tmp} )
|
|
| 234 |
new ScrambleState( new int[][] {tmp,tmp,tmp,tmp} )
|
|
| 235 | 235 |
}; |
| 236 | 236 |
} |
| 237 | 237 |
|
Also available in: Unified diff
Introduce pseudorandom balancing into scrambling in case of the two Dinos (from now on, the more times a particular (ax,layer) combination has been chosen already in the scrambling sequence, the less likely it is to be chosen next).
Fix Dino6 - isSolved(). Sadly, it cannot be the geeneric function - it needs to be another special case.