Revision b4223a92
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/json/JsonReader.java | ||
|---|---|---|
| 438 | 438 |
{
|
| 439 | 439 |
switch(mMovementType) |
| 440 | 440 |
{
|
| 441 |
case TouchControl.TC_TETRAHEDRON : mNumFaces = 4; break; |
|
| 442 |
case TouchControl.TC_HEXAHEDRON : mNumFaces = 6; break; |
|
| 443 |
case TouchControl.TC_OCTAHEDRON : mNumFaces = 8; break; |
|
| 444 |
case TouchControl.TC_DODECAHEDRON: mNumFaces =12; break; |
|
| 445 |
default : android.util.Log.e("D", "Error in parseTouchcontrol");
|
|
| 441 |
case TouchControl.TC_TETRAHEDRON : mNumFaces = 4; break; |
|
| 442 |
case TouchControl.TC_CHANGING_MIRROR: |
|
| 443 |
case TouchControl.TC_CHANGING_SQUARE: |
|
| 444 |
case TouchControl.TC_HEXAHEDRON : mNumFaces = 6; break; |
|
| 445 |
case TouchControl.TC_OCTAHEDRON : mNumFaces = 8; break; |
|
| 446 |
case TouchControl.TC_DODECAHEDRON : mNumFaces =12; break; |
|
| 447 |
default : android.util.Log.e("D", "Error in parseTouchcontrol");
|
|
| 446 | 448 |
} |
| 447 | 449 |
} |
| 448 | 450 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyBandaged2Bar.java | ||
|---|---|---|
| 120 | 120 |
|
| 121 | 121 |
public String getInventor() |
| 122 | 122 |
{
|
| 123 |
return "unknown";
|
|
| 123 |
return "Unknown";
|
|
| 124 | 124 |
} |
| 125 | 125 |
|
| 126 | 126 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 127 | 127 |
|
| 128 | 128 |
public int getYearOfInvention() |
| 129 | 129 |
{
|
| 130 |
return 2000;
|
|
| 130 |
return 0; |
|
| 131 | 131 |
} |
| 132 | 132 |
|
| 133 | 133 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 134 | 134 |
|
| 135 | 135 |
public int getComplexity() |
| 136 | 136 |
{
|
| 137 |
return 8;
|
|
| 137 |
return 2;
|
|
| 138 | 138 |
} |
| 139 | 139 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyBandaged3Plate.java | ||
|---|---|---|
| 127 | 127 |
|
| 128 | 128 |
public String getInventor() |
| 129 | 129 |
{
|
| 130 |
return "unknown";
|
|
| 130 |
return "Andreas Nortmann";
|
|
| 131 | 131 |
} |
| 132 | 132 |
|
| 133 | 133 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 134 | 134 |
|
| 135 | 135 |
public int getYearOfInvention() |
| 136 | 136 |
{
|
| 137 |
return 2000;
|
|
| 137 |
return 2005;
|
|
| 138 | 138 |
} |
| 139 | 139 |
|
| 140 | 140 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 141 | 141 |
|
| 142 | 142 |
public int getComplexity() |
| 143 | 143 |
{
|
| 144 |
return 8;
|
|
| 144 |
return 2;
|
|
| 145 | 145 |
} |
| 146 | 146 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedEvil.java | ||
|---|---|---|
| 251 | 251 |
|
| 252 | 252 |
public String getInventor() |
| 253 | 253 |
{
|
| 254 |
return "unknown";
|
|
| 254 |
return "Uwe Meffert";
|
|
| 255 | 255 |
} |
| 256 | 256 |
|
| 257 | 257 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 258 | 258 |
|
| 259 | 259 |
public int getYearOfInvention() |
| 260 | 260 |
{
|
| 261 |
return 2000;
|
|
| 261 |
return 1999;
|
|
| 262 | 262 |
} |
| 263 | 263 |
|
| 264 | 264 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 265 | 265 |
|
| 266 | 266 |
public int getComplexity() |
| 267 | 267 |
{
|
| 268 |
return 8;
|
|
| 268 |
return 3;
|
|
| 269 | 269 |
} |
| 270 | 270 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedFused.java | ||
|---|---|---|
| 120 | 120 |
|
| 121 | 121 |
public String getInventor() |
| 122 | 122 |
{
|
| 123 |
return "unknown";
|
|
| 123 |
return "Ting Huang";
|
|
| 124 | 124 |
} |
| 125 | 125 |
|
| 126 | 126 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 127 | 127 |
|
| 128 | 128 |
public int getYearOfInvention() |
| 129 | 129 |
{
|
| 130 |
return 2000;
|
|
| 130 |
return 2011;
|
|
| 131 | 131 |
} |
| 132 | 132 |
|
| 133 | 133 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 134 | 134 |
|
| 135 | 135 |
public int getComplexity() |
| 136 | 136 |
{
|
| 137 |
return 8;
|
|
| 137 |
return 1;
|
|
| 138 | 138 |
} |
| 139 | 139 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java | ||
|---|---|---|
| 759 | 759 |
|
| 760 | 760 |
public String getObjectName() |
| 761 | 761 |
{
|
| 762 |
switch(getNumLayers()[0]) |
|
| 762 |
int[] numLayers = getNumLayers(); |
|
| 763 |
|
|
| 764 |
switch(intGetObjectType(numLayers)) |
|
| 763 | 765 |
{
|
| 764 |
case 2: return "Pocket Cube"; |
|
| 765 |
case 3: return "Rubik Cube"; |
|
| 766 |
case 4: return "Rubik's Revenge"; |
|
| 767 |
case 5: return "Professor's Cube"; |
|
| 768 |
case 6: return "6x6 Cube"; |
|
| 769 |
case 7: return "7x7 Cube"; |
|
| 766 |
case CUBE_2: return "Pocket Cube"; |
|
| 767 |
case CU_232: return "Slim Tower"; |
|
| 768 |
case CUBE_3: return "Rubik Cube"; |
|
| 769 |
case CU_323: return "2x2x3 Cuboid"; |
|
| 770 |
case CU_343: return "3x3x4 Cuboid"; |
|
| 771 |
case CUBE_4: return "Rubik's Revenge"; |
|
| 772 |
case CUBE_5: return "Professor's Cube"; |
|
| 773 |
case CUBE_6: return "6x6 Cube"; |
|
| 774 |
case CUBE_7: return "7x7 Cube"; |
|
| 770 | 775 |
} |
| 771 | 776 |
return "Rubik Cube"; |
| 772 | 777 |
} |
| ... | ... | |
| 775 | 780 |
|
| 776 | 781 |
public String getInventor() |
| 777 | 782 |
{
|
| 778 |
switch(getNumLayers()[0]) |
|
| 783 |
int[] numLayers = getNumLayers(); |
|
| 784 |
|
|
| 785 |
switch(intGetObjectType(numLayers)) |
|
| 779 | 786 |
{
|
| 780 |
case 2: return "Larry Nichols"; |
|
| 781 |
case 3: return "Ernő Rubik"; |
|
| 782 |
case 4: return "Péter Sebestény"; |
|
| 783 |
case 5: return "Udo Krell"; |
|
| 784 |
case 6: |
|
| 785 |
case 7: return "Panagiotis Verdes"; |
|
| 787 |
case CUBE_2: return "Larry Nichols"; |
|
| 788 |
case CU_232: return "Katsuhiko Okamoto"; |
|
| 789 |
case CUBE_3: return "Ernő Rubik"; |
|
| 790 |
case CU_323: return "Unknown"; |
|
| 791 |
case CU_343: return "Cube4You"; |
|
| 792 |
case CUBE_4: return "Péter Sebestény"; |
|
| 793 |
case CUBE_5: return "Udo Krell"; |
|
| 794 |
case CUBE_6: |
|
| 795 |
case CUBE_7: return "Panagiotis Verdes"; |
|
| 786 | 796 |
} |
| 797 |
|
|
| 787 | 798 |
return "Ernő Rubik"; |
| 788 | 799 |
} |
| 789 | 800 |
|
| ... | ... | |
| 791 | 802 |
|
| 792 | 803 |
public int getYearOfInvention() |
| 793 | 804 |
{
|
| 794 |
switch(getNumLayers()[0]) |
|
| 805 |
int[] numLayers = getNumLayers(); |
|
| 806 |
|
|
| 807 |
switch(intGetObjectType(numLayers)) |
|
| 795 | 808 |
{
|
| 796 |
case 2: return 1970; |
|
| 797 |
case 3: return 1974; |
|
| 798 |
case 4: return 1981; |
|
| 799 |
case 5: return 2002; |
|
| 800 |
case 6: |
|
| 801 |
case 7: return 2008; |
|
| 809 |
case CUBE_2: return 1970; |
|
| 810 |
case CU_232: return 2001; |
|
| 811 |
case CUBE_3: return 1974; |
|
| 812 |
case CU_323: return 0; |
|
| 813 |
case CU_343: return 2009; |
|
| 814 |
case CUBE_4: return 1981; |
|
| 815 |
case CUBE_5: return 2002; |
|
| 816 |
case CUBE_6: |
|
| 817 |
case CUBE_7: return 2008; |
|
| 802 | 818 |
} |
| 819 |
|
|
| 803 | 820 |
return 1974; |
| 804 | 821 |
} |
| 805 | 822 |
|
| ... | ... | |
| 807 | 824 |
|
| 808 | 825 |
public int getComplexity() |
| 809 | 826 |
{
|
| 810 |
switch(getNumLayers()[0]) |
|
| 827 |
int[] numLayers = getNumLayers(); |
|
| 828 |
|
|
| 829 |
switch(intGetObjectType(numLayers)) |
|
| 811 | 830 |
{
|
| 812 |
case 2: return 4; |
|
| 813 |
case 3: return 6; |
|
| 814 |
case 4: return 8; |
|
| 815 |
default: return 10; |
|
| 831 |
case CUBE_2: |
|
| 832 |
case CU_232: return 1; |
|
| 833 |
case CUBE_3: |
|
| 834 |
case CU_323: return 2; |
|
| 835 |
case CU_343: |
|
| 836 |
case CUBE_4: return 3; |
|
| 837 |
case CUBE_5: |
|
| 838 |
case CUBE_6: |
|
| 839 |
case CUBE_7: return 4; |
|
| 816 | 840 |
} |
| 841 |
return 2; |
|
| 817 | 842 |
} |
| 818 | 843 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 618 | 618 |
{
|
| 619 | 619 |
switch(getNumLayers()[0]) |
| 620 | 620 |
{
|
| 621 |
case 2: return 4;
|
|
| 622 |
case 3: return 6;
|
|
| 623 |
case 4: return 8;
|
|
| 621 |
case 2: return 1;
|
|
| 622 |
case 3: return 2;
|
|
| 623 |
case 4: return 3;
|
|
| 624 | 624 |
} |
| 625 | 625 |
|
| 626 | 626 |
return 0; |
| src/main/java/org/distorted/objectlib/objects/TwistyDino.java | ||
|---|---|---|
| 277 | 277 |
|
| 278 | 278 |
public int getComplexity() |
| 279 | 279 |
{
|
| 280 |
return 2;
|
|
| 280 |
return 0;
|
|
| 281 | 281 |
} |
| 282 | 282 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
|---|---|---|
| 497 | 497 |
|
| 498 | 498 |
public int getComplexity() |
| 499 | 499 |
{
|
| 500 |
return 8;
|
|
| 500 |
return 3;
|
|
| 501 | 501 |
} |
| 502 | 502 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
|---|---|---|
| 530 | 530 |
|
| 531 | 531 |
public int getComplexity() |
| 532 | 532 |
{
|
| 533 |
return 1;
|
|
| 533 |
return 0;
|
|
| 534 | 534 |
} |
| 535 | 535 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
|---|---|---|
| 483 | 483 |
|
| 484 | 484 |
public int getComplexity() |
| 485 | 485 |
{
|
| 486 |
return 4;
|
|
| 486 |
return 1;
|
|
| 487 | 487 |
} |
| 488 | 488 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
|---|---|---|
| 766 | 766 |
{
|
| 767 | 767 |
switch(getNumLayers()[0]) |
| 768 | 768 |
{
|
| 769 |
case 3: return 5;
|
|
| 770 |
case 5: return 8;
|
|
| 769 |
case 3: return 2;
|
|
| 770 |
case 5: return 3;
|
|
| 771 | 771 |
} |
| 772 | 772 |
return 8; |
| 773 | 773 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
|---|---|---|
| 658 | 658 |
{
|
| 659 | 659 |
switch(getNumLayers()[0]) |
| 660 | 660 |
{
|
| 661 |
case 3: return 7;
|
|
| 662 |
case 5: return 9;
|
|
| 661 |
case 3: return 3;
|
|
| 662 |
case 5: return 4;
|
|
| 663 | 663 |
} |
| 664 | 664 |
return 9; |
| 665 | 665 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
|---|---|---|
| 696 | 696 |
{
|
| 697 | 697 |
switch(getNumLayers()[0]) |
| 698 | 698 |
{
|
| 699 |
case 2: return 5;
|
|
| 700 |
case 3: return 7;
|
|
| 699 |
case 2: return 1;
|
|
| 700 |
case 3: return 2;
|
|
| 701 | 701 |
} |
| 702 | 702 |
return 7; |
| 703 | 703 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
|---|---|---|
| 494 | 494 |
{
|
| 495 | 495 |
switch(getNumLayers()[0]) |
| 496 | 496 |
{
|
| 497 |
case 3: return 4;
|
|
| 498 |
case 4: return 6;
|
|
| 499 |
case 5: return 8;
|
|
| 497 |
case 3: return 1;
|
|
| 498 |
case 4: return 2;
|
|
| 499 |
case 5: return 3;
|
|
| 500 | 500 |
} |
| 501 | 501 |
return 4; |
| 502 | 502 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
|---|---|---|
| 492 | 492 |
|
| 493 | 493 |
public int getComplexity() |
| 494 | 494 |
{
|
| 495 |
return 4;
|
|
| 495 |
return 1;
|
|
| 496 | 496 |
} |
| 497 | 497 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
|---|---|---|
| 664 | 664 |
{
|
| 665 | 665 |
switch(getNumLayers()[0]) |
| 666 | 666 |
{
|
| 667 |
case 2: return 4;
|
|
| 668 |
case 3: return 8;
|
|
| 667 |
case 2: return 1;
|
|
| 668 |
case 3: return 3;
|
|
| 669 | 669 |
} |
| 670 | 670 |
return 5; |
| 671 | 671 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
|---|---|---|
| 385 | 385 |
|
| 386 | 386 |
public int getComplexity() |
| 387 | 387 |
{
|
| 388 |
return 9;
|
|
| 388 |
return 3;
|
|
| 389 | 389 |
} |
| 390 | 390 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 411 | 411 |
|
| 412 | 412 |
public int getComplexity() |
| 413 | 413 |
{
|
| 414 |
return 7;
|
|
| 414 |
return 3;
|
|
| 415 | 415 |
} |
| 416 | 416 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
|---|---|---|
| 488 | 488 |
|
| 489 | 489 |
public int getComplexity() |
| 490 | 490 |
{
|
| 491 |
return 6;
|
|
| 491 |
return 2;
|
|
| 492 | 492 |
} |
| 493 | 493 |
} |
Also available in: Unified diff
Progress with ConfigPane.