Revision 6cf89a3e
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objects/TwistyBandaged3Plate.java | ||
|---|---|---|
| 25 | 25 |
import org.distorted.library.main.DistortedTexture; |
| 26 | 26 |
import org.distorted.library.mesh.MeshSquare; |
| 27 | 27 |
import org.distorted.library.type.Static4D; |
| 28 |
import org.distorted.helpers.ScrambleStateGraph;
|
|
| 28 |
import org.distorted.helpers.ScrambleState; |
|
| 29 | 29 |
import org.distorted.main.R; |
| 30 | 30 |
|
| 31 | 31 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 62 | 62 |
{
|
| 63 | 63 |
super(size, quat, texture, mesh, effects, moves, ObjectList.BAN3, res, scrWidth); |
| 64 | 64 |
|
| 65 |
mStates = new ScrambleStateGraph[]
|
|
| 65 |
mStates = new ScrambleState[] |
|
| 66 | 66 |
{
|
| 67 |
new ScrambleStateGraph( new int[][] {{ 2,-1, 1, 2, 1, 6 }, { 0,-1, 5, 0, 1, 3 }, { 2,-1, 2, 2, 1, 4 }} ),
|
|
| 68 |
new ScrambleStateGraph( new int[][] {{ 2, 1, 0 }, { }, { 2, 1,10, 2, 2, 7 }} ),
|
|
| 69 |
new ScrambleStateGraph( new int[][] {{ }, { 0,-1,11, 0, 2, 8 }, { 2, 1, 0 }} ),
|
|
| 70 |
new ScrambleStateGraph( new int[][] {{ 2, 1,12, 2, 2, 9 }, { 0,-1, 0 }, { }} ),
|
|
| 71 |
new ScrambleStateGraph( new int[][] {{ 2,-1,10, 2, 2,13 }, { }, { 2,-1, 0 }} ),
|
|
| 72 |
new ScrambleStateGraph( new int[][] {{ }, { 0, 1, 0 }, { 2,-1,11, 2, 2,14 }} ),
|
|
| 73 |
new ScrambleStateGraph( new int[][] {{ 2,-1, 0 }, { 0, 1,12, 0, 2,15 }, { }} ),
|
|
| 74 |
new ScrambleStateGraph( new int[][] {{ }, { 2,-2, 7, 2,-1, 7, 2, 1, 7, 2, 2, 7}, { 2,-1,10, 2, 2, 1 }} ),
|
|
| 75 |
new ScrambleStateGraph( new int[][] {{ 0,-2, 8, 0,-1, 8, 0, 1, 8, 0, 2, 8}, { 0, 1,11, 0, 2, 2 }, { }} ),
|
|
| 76 |
new ScrambleStateGraph( new int[][] {{ 2,-1,12, 2, 2, 3 }, { }, { 0,-2, 9, 0,-1, 9, 0, 1, 9, 0, 2, 9}} ),
|
|
| 77 |
new ScrambleStateGraph( new int[][] {{ 2,-1,13, 2, 1, 4 }, { 2,-2,10, 2,-1,10, 2, 1,10, 2, 2,10}, { 2,-1, 1, 2, 1, 7 }} ),
|
|
| 78 |
new ScrambleStateGraph( new int[][] {{ 0,-2,11, 0,-1,11, 0, 1,11, 0, 2,11}, { 0,-1, 8, 0, 1, 2 }, { 2,-1,14, 2, 1, 5 }} ),
|
|
| 79 |
new ScrambleStateGraph( new int[][] {{ 2,-1, 3, 2, 1, 9 }, { 0,-1, 6, 0, 1,15 }, { 0,-2,12, 0,-1,12, 0, 1,12, 0, 2,12}} ),
|
|
| 80 |
new ScrambleStateGraph( new int[][] {{ 2, 1,10, 2, 2, 4 }, { 2,-2,13, 2,-1,13, 2, 1,13, 2, 2,13}, { }} ),
|
|
| 81 |
new ScrambleStateGraph( new int[][] {{ 0,-2,14, 0,-1,14, 0, 1,14, 0, 2,14}, { }, { 2, 1,11, 2, 2, 5 }} ),
|
|
| 82 |
new ScrambleStateGraph( new int[][] {{ }, { 0,-1,12, 0, 2, 6 }, { 0,-2,15, 0,-1,15, 0, 1,15, 0, 2,15}} )
|
|
| 67 |
new ScrambleState( new int[][] {{ 2,-1, 1, 2, 1, 6 }, { 0,-1, 5, 0, 1, 3 }, { 2,-1, 2, 2, 1, 4 }} ),
|
|
| 68 |
new ScrambleState( new int[][] {{ 2, 1, 0 }, { }, { 2, 1,10, 2, 2, 7 }} ),
|
|
| 69 |
new ScrambleState( new int[][] {{ }, { 0,-1,11, 0, 2, 8 }, { 2, 1, 0 }} ),
|
|
| 70 |
new ScrambleState( new int[][] {{ 2, 1,12, 2, 2, 9 }, { 0,-1, 0 }, { }} ),
|
|
| 71 |
new ScrambleState( new int[][] {{ 2,-1,10, 2, 2,13 }, { }, { 2,-1, 0 }} ),
|
|
| 72 |
new ScrambleState( new int[][] {{ }, { 0, 1, 0 }, { 2,-1,11, 2, 2,14 }} ),
|
|
| 73 |
new ScrambleState( new int[][] {{ 2,-1, 0 }, { 0, 1,12, 0, 2,15 }, { }} ),
|
|
| 74 |
new ScrambleState( new int[][] {{ }, { 2,-2, 7, 2,-1, 7, 2, 1, 7, 2, 2, 7}, { 2,-1,10, 2, 2, 1 }} ),
|
|
| 75 |
new ScrambleState( new int[][] {{ 0,-2, 8, 0,-1, 8, 0, 1, 8, 0, 2, 8}, { 0, 1,11, 0, 2, 2 }, { }} ),
|
|
| 76 |
new ScrambleState( new int[][] {{ 2,-1,12, 2, 2, 3 }, { }, { 0,-2, 9, 0,-1, 9, 0, 1, 9, 0, 2, 9}} ),
|
|
| 77 |
new ScrambleState( new int[][] {{ 2,-1,13, 2, 1, 4 }, { 2,-2,10, 2,-1,10, 2, 1,10, 2, 2,10}, { 2,-1, 1, 2, 1, 7 }} ),
|
|
| 78 |
new ScrambleState( new int[][] {{ 0,-2,11, 0,-1,11, 0, 1,11, 0, 2,11}, { 0,-1, 8, 0, 1, 2 }, { 2,-1,14, 2, 1, 5 }} ),
|
|
| 79 |
new ScrambleState( new int[][] {{ 2,-1, 3, 2, 1, 9 }, { 0,-1, 6, 0, 1,15 }, { 0,-2,12, 0,-1,12, 0, 1,12, 0, 2,12}} ),
|
|
| 80 |
new ScrambleState( new int[][] {{ 2, 1,10, 2, 2, 4 }, { 2,-2,13, 2,-1,13, 2, 1,13, 2, 2,13}, { }} ),
|
|
| 81 |
new ScrambleState( new int[][] {{ 0,-2,14, 0,-1,14, 0, 1,14, 0, 2,14}, { }, { 2, 1,11, 2, 2, 5 }} ),
|
|
| 82 |
new ScrambleState( new int[][] {{ }, { 0,-1,12, 0, 2, 6 }, { 0,-2,15, 0,-1,15, 0, 1,15, 0, 2,15}} )
|
|
| 83 | 83 |
}; |
| 84 | 84 |
} |
| 85 | 85 |
|
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.