v0.4.1: adjusted some text for potions/rings/scrolls for better i18n

This commit is contained in:
Evan Debenham
2016-07-07 22:16:12 -04:00
committed by Evan Debenham
parent 669e0bb87b
commit 596b2f583e
4 changed files with 49 additions and 65 deletions
@@ -228,7 +228,7 @@ public class Potion extends Item {
public void shatter( int cell ) {
if (Dungeon.visible[cell]) {
GLog.i( Messages.get(Potion.class, "shatter", color()) );
GLog.i( Messages.get(Potion.class, "shatter") );
Sample.INSTANCE.play( Assets.SND_SHATTER );
splash( cell );
}
@@ -260,20 +260,16 @@ public class Potion extends Item {
return this;
}
protected String color() {
return Messages.get(Potion.class, color);
}
@Override
public String name() {
return isKnown() ? super.name() : Messages.get(Potion.class, "unknown_name", color());
return isKnown() ? super.name() : Messages.get(Potion.class, color);
}
@Override
public String info() {
return isKnown() ?
desc() :
Messages.get(Potion.class, "unknown_desc", color());
Messages.get(Potion.class, "unknown_desc");
}
public Integer initials(){
@@ -142,20 +142,16 @@ public class Ring extends KindofMisc {
Badges.validateAllRingsIdentified();
}
public String gem() {
return Messages.get(Ring.class, gem);
}
@Override
public String name() {
return isKnown() ? super.name() : Messages.get(this, "unknown_name", gem());
return isKnown() ? super.name() : Messages.get(Ring.class, gem);
}
@Override
public String info() {
String desc = isKnown()? desc() : Messages.get(this, "unknown_desc", gem());
String desc = isKnown()? desc() : Messages.get(this, "unknown_desc");
if (cursed && isEquipped( Dungeon.hero )) {
@@ -163,7 +159,7 @@ public class Ring extends KindofMisc {
} else if (cursed && cursedKnown) {
desc += "\n\n" + Messages.get(Ring.class, "curse_known", name());
desc += "\n\n" + Messages.get(Ring.class, "curse_known");
}
@@ -171,21 +171,17 @@ public abstract class Scroll extends Item {
setKnown();
return super.identify();
}
public String rune() {
return Messages.get(Scroll.class, rune);
}
@Override
public String name() {
return isKnown() ? name : Messages.get(this, "unknown_name", rune());
return isKnown() ? name : Messages.get(Scroll.class, rune);
}
@Override
public String info() {
return isKnown() ?
desc() :
Messages.get(this, "unknown_desc", rune());
Messages.get(this, "unknown_desc");
}
public Integer initials(){