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/TwistyPyraminx.java
466 466

  
467 467
///////////////////////////////////////////////////////////////////////////////////////////////////
468 468

  
469
  public int getObjectName(int[] numLayers)
469
  public String getObjectName()
470 470
    {
471
    switch(numLayers[0])
471
    switch(getNumLayers()[0])
472 472
      {
473
      case 3: return R.string.pyra3;
474
      case 4: return R.string.pyra4;
475
      case 5: return R.string.pyra5;
473
      case 3: return "Pyraminx";
474
      case 4: return "Master Pyraminx";
475
      case 5: return "Professor's Pyraminx";
476 476
      }
477
    return R.string.pyra3;
477
    return "Pyraminx";
478 478
    }
479 479

  
480 480
///////////////////////////////////////////////////////////////////////////////////////////////////
481 481

  
482
  public int getInventor(int[] numLayers)
482
  public String getInventor()
483 483
    {
484
    switch(numLayers[0])
484
    switch(getNumLayers()[0])
485 485
      {
486
      case 3: return R.string.pyra3_inventor;
487
      case 4: return R.string.pyra4_inventor;
488
      case 5: return R.string.pyra5_inventor;
486
      case 3: return "Uwe Meffert";
487
      case 4: return "Katsuhiko Okamoto";
488
      case 5: return "Timur Evbatyrov";
489 489
      }
490
    return R.string.pyra3_inventor;
490
    return "Uwe Meffert";
491 491
    }
492 492

  
493 493
///////////////////////////////////////////////////////////////////////////////////////////////////
494 494

  
495
  public int getYearOfInvention(int[] numLayers)
495
  public int getYearOfInvention()
496 496
    {
497
    switch(numLayers[0])
497
    switch(getNumLayers()[0])
498 498
      {
499 499
      case 3: return 1970;
500 500
      case 4: return 2002;
......
505 505

  
506 506
///////////////////////////////////////////////////////////////////////////////////////////////////
507 507

  
508
  public int getComplexity(int[] numLayers)
508
  public int getComplexity()
509 509
    {
510
    switch(numLayers[0])
510
    switch(getNumLayers()[0])
511 511
      {
512 512
      case 3: return 4;
513 513
      case 4: return 6;

Also available in: Unified diff