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/TwistyMegaminx.java
627 627
      case 3: return ObjectType.MEGA_3;
628 628
      case 5: return ObjectType.MEGA_5;
629 629
      }
630

  
631 630
    return ObjectType.MEGA_3;
632 631
    }
633 632

  
634 633
///////////////////////////////////////////////////////////////////////////////////////////////////
635 634

  
636
  public int getObjectName(int[] numLayers)
635
  public String getObjectName()
637 636
    {
638
    int numL = numLayers[0];
639

  
640
    if( numL==3 ) return R.string.minx3;
641
    if( numL==5 ) return R.string.minx5;
642

  
643
    return 0;
637
    switch(getNumLayers()[0])
638
      {
639
      case 3: return "Megaminx";
640
      case 5: return "Gigaminx";
641
      }
642
    return "Megaminx";
644 643
    }
645 644

  
646 645
///////////////////////////////////////////////////////////////////////////////////////////////////
647 646

  
648
  public int getInventor(int[] numLayers)
647
  public String getInventor()
649 648
    {
650
    int numL = numLayers[0];
651

  
652
    if( numL==3 ) return R.string.minx3_inventor;
653
    if( numL==5 ) return R.string.minx5_inventor;
654

  
655
    return 0;
649
    switch(getNumLayers()[0])
650
      {
651
      case 3: return "Ferenc Szlivka";
652
      case 5: return "Tyler Fox";
653
      }
654
    return "Ferenc Szlivka";
656 655
    }
657 656

  
658 657
///////////////////////////////////////////////////////////////////////////////////////////////////
659 658

  
660
  public int getYearOfInvention(int[] numLayers)
659
  public int getYearOfInvention()
661 660
    {
662
    switch(numLayers[0])
661
    switch(getNumLayers()[0])
663 662
      {
664 663
      case 3: return 1982;
665 664
      case 5: return 2006;
666 665
      }
667
    return 1982;
666
    return 2006;
668 667
    }
669 668

  
670 669
///////////////////////////////////////////////////////////////////////////////////////////////////
671 670

  
672
  public int getComplexity(int[] numLayers)
671
  public int getComplexity()
673 672
    {
674
    int numL = numLayers[0];
675

  
676
    if( numL==3 ) return 7;
677
    if( numL==5 ) return 9;
678

  
673
    switch(getNumLayers()[0])
674
      {
675
      case 3: return 7;
676
      case 5: return 9;
677
      }
679 678
    return 9;
680 679
    }
681 680
}

Also available in: Unified diff