Project

General

Profile

« Previous | Next » 

Revision e26eb4e7

Added by Leszek Koltunski over 2 years ago

Do not pull the inventors and the names of objects from Resources.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java
687 687

  
688 688
///////////////////////////////////////////////////////////////////////////////////////////////////
689 689

  
690
  public int getObjectName(int[] numLayers)
690
  public String getObjectName()
691 691
    {
692
    switch(numLayers[0])
692
    switch(getNumLayers()[0])
693 693
      {
694
      case 2: return R.string.cube2;
695
      case 3: return R.string.cube3;
696
      case 4: return R.string.cube4;
697
      case 5: return R.string.cube5;
694
      case 2: return "Pocket Cube";
695
      case 3: return "Rubik Cube";
696
      case 4: return "Rubik's Revenge";
697
      case 5: return "Professor's Cube";
698 698
      }
699
    return R.string.cube3;
699
    return "Rubik Cube";
700 700
    }
701 701

  
702 702
///////////////////////////////////////////////////////////////////////////////////////////////////
703 703

  
704
  public int getInventor(int[] numLayers)
704
  public String getInventor()
705 705
    {
706
    switch(numLayers[0])
706
    switch(getNumLayers()[0])
707 707
      {
708
      case 2: return R.string.cube2_inventor;
709
      case 3: return R.string.cube3_inventor;
710
      case 4: return R.string.cube4_inventor;
711
      case 5: return R.string.cube5_inventor;
708
      case 2: return "Larry Nichols";
709
      case 3: return "Ernő Rubik";
710
      case 4: return "Péter Sebestény";
711
      case 5: return "Udo Krell";
712 712
      }
713
    return R.string.cube3_inventor;
713
    return "Ernő Rubik";
714 714
    }
715 715

  
716 716
///////////////////////////////////////////////////////////////////////////////////////////////////
717 717

  
718
  public int getYearOfInvention(int[] numLayers)
718
  public int getYearOfInvention()
719 719
    {
720
    switch(numLayers[0])
720
    switch(getNumLayers()[0])
721 721
      {
722 722
      case 2: return 1970;
723 723
      case 3: return 1974;
......
729 729

  
730 730
///////////////////////////////////////////////////////////////////////////////////////////////////
731 731

  
732
  public int getComplexity(int[] numLayers)
732
  public int getComplexity()
733 733
    {
734
    switch(numLayers[0])
734
    switch(getNumLayers()[0])
735 735
      {
736 736
      case 2: return 4;
737 737
      case 3: return 6;

Also available in: Unified diff