v0.3.4: externalized almost all item names

This commit is contained in:
Evan Debenham
2015-12-31 23:49:49 -05:00
committed by Evan Debenham
parent 0ca46e72cc
commit c1aca208b4
144 changed files with 191 additions and 337 deletions
@@ -36,7 +36,6 @@ public class Amulet extends Item {
private static final String AC_END = "END THE GAME"; private static final String AC_END = "END THE GAME";
{ {
name = "Amulet of Yendor";
image = ItemSpriteSheet.AMULET; image = ItemSpriteSheet.AMULET;
unique = true; unique = true;
@@ -47,7 +47,6 @@ public class Ankh extends Item {
{ {
name = "Ankh";
image = ItemSpriteSheet.ANKH; image = ItemSpriteSheet.ANKH;
//You tell the ankh no, don't revive me, and then it comes back to revive you again in another run. //You tell the ankh no, don't revive me, and then it comes back to revive you again in another run.
@@ -44,7 +44,6 @@ public class ArmorKit extends Item {
private static final String AC_APPLY = "APPLY"; private static final String AC_APPLY = "APPLY";
{ {
name = "armor kit";
image = ItemSpriteSheet.KIT; image = ItemSpriteSheet.KIT;
unique = true; unique = true;
@@ -43,7 +43,6 @@ import java.util.ArrayList;
public class Bomb extends Item { public class Bomb extends Item {
{ {
name = "bomb";
image = ItemSpriteSheet.BOMB; image = ItemSpriteSheet.BOMB;
defaultAction = AC_LIGHTTHROW; defaultAction = AC_LIGHTTHROW;
@@ -258,7 +257,6 @@ public class Bomb extends Item {
public static class DoubleBomb extends Bomb{ public static class DoubleBomb extends Bomb{
{ {
name = "two bombs";
image = ItemSpriteSheet.DBL_BOMB; image = ItemSpriteSheet.DBL_BOMB;
stackable = false; stackable = false;
} }
@@ -51,7 +51,6 @@ public class DewVial extends Item {
private static final String TXT_EMPTY = "Your dew vial is empty!"; private static final String TXT_EMPTY = "Your dew vial is empty!";
{ {
name = "dew vial";
image = ItemSpriteSheet.VIAL; image = ItemSpriteSheet.VIAL;
defaultAction = AC_DRINK; defaultAction = AC_DRINK;
@@ -36,7 +36,6 @@ public class Dewdrop extends Item {
private static final String TXT_VALUE = "%+dHP"; private static final String TXT_VALUE = "%+dHP";
{ {
name = "dewdrop";
image = ItemSpriteSheet.DEWDROP; image = ItemSpriteSheet.DEWDROP;
stackable = true; stackable = true;
@@ -44,7 +44,6 @@ public class Gold extends Item {
private static final String TXT_VALUE = "%+d"; private static final String TXT_VALUE = "%+d";
{ {
name = "gold";
image = ItemSpriteSheet.GOLD; image = ItemSpriteSheet.GOLD;
stackable = true; stackable = true;
} }
@@ -43,7 +43,6 @@ public class Honeypot extends Item {
public static final String AC_SHATTER = "SHATTER"; public static final String AC_SHATTER = "SHATTER";
{ {
name = "honeypot";
image = ItemSpriteSheet.HONEYPOT; image = ItemSpriteSheet.HONEYPOT;
defaultAction = AC_THROW; defaultAction = AC_THROW;
@@ -156,7 +155,6 @@ public class Honeypot extends Item {
public static class ShatteredPot extends Item { public static class ShatteredPot extends Item {
{ {
name = "shattered honeypot";
image = ItemSpriteSheet.SHATTPOT; image = ItemSpriteSheet.SHATTPOT;
stackable = false; stackable = false;
} }
@@ -32,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
@@ -50,8 +51,6 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
public class Item implements Bundlable { public class Item implements Bundlable {
private static final String TXT_PACK_FULL = "Your pack is too full for the %s";
private static final String TXT_TO_STRING = "%s"; private static final String TXT_TO_STRING = "%s";
private static final String TXT_TO_STRING_X = "%s x%d"; private static final String TXT_TO_STRING_X = "%s x%d";
@@ -68,7 +67,7 @@ public class Item implements Bundlable {
public String defaultAction; public String defaultAction;
public boolean usesTargeting; public boolean usesTargeting;
protected String name = "smth"; protected String name = Messages.get(this, "name");
public int image = 0; public int image = 0;
public boolean stackable = false; public boolean stackable = false;
@@ -192,7 +191,7 @@ public class Item implements Bundlable {
} else { } else {
GLog.n( TXT_PACK_FULL, name() ); GLog.n( Messages.get(Item.class, "pack_full", name()) );
return false; return false;
} }
@@ -514,7 +513,7 @@ public class Item implements Bundlable {
} }
@Override @Override
public String prompt() { public String prompt() {
return "Choose direction of throw"; return Messages.get(Item.class, "prompt");
} }
}; };
} }
@@ -34,7 +34,6 @@ public class MerchantsBeacon extends Item {
{ {
name = "merchant's beacon";
image = ItemSpriteSheet.BEACON; image = ItemSpriteSheet.BEACON;
stackable = true; stackable = true;
@@ -43,7 +43,6 @@ public class Stylus extends Item {
private static final String AC_INSCRIBE = "INSCRIBE"; private static final String AC_INSCRIBE = "INSCRIBE";
{ {
name = "arcane stylus";
image = ItemSpriteSheet.STYLUS; image = ItemSpriteSheet.STYLUS;
stackable = true; stackable = true;
@@ -48,7 +48,6 @@ public class TomeOfMastery extends Item {
{ {
stackable = false; stackable = false;
name = "Tome of Mastery";
image = ItemSpriteSheet.MASTERY; image = ItemSpriteSheet.MASTERY;
unique = true; unique = true;
@@ -36,7 +36,6 @@ public class Torch extends Item {
public static final float TIME_TO_LIGHT = 1; public static final float TIME_TO_LIGHT = 1;
{ {
name = "torch";
image = ItemSpriteSheet.TORCH; image = ItemSpriteSheet.TORCH;
stackable = true; stackable = true;
@@ -48,7 +48,6 @@ public class Weightstone extends Item {
private static final String AC_APPLY = "APPLY"; private static final String AC_APPLY = "APPLY";
{ {
name = "weightstone";
image = ItemSpriteSheet.WEIGHT; image = ItemSpriteSheet.WEIGHT;
stackable = true; stackable = true;
@@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.*; import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.*;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -90,7 +91,7 @@ public class Armor extends EquipableItem {
actions.add(isEquipped(hero) ? AC_UNEQUIP : AC_EQUIP); actions.add(isEquipped(hero) ? AC_UNEQUIP : AC_EQUIP);
return actions; return actions;
} }
@Override @Override
public boolean doEquip( Hero hero ) { public boolean doEquip( Hero hero ) {
@@ -347,11 +348,11 @@ public class Armor extends EquipableItem {
public abstract int proc( Armor armor, Char attacker, Char defender, int damage ); public abstract int proc( Armor armor, Char attacker, Char defender, int damage );
public String name() { public String name() {
return name( "glyph" ); return name( Messages.get(this, "glyph") );
} }
public String name( String armorName ) { public String name( String armorName ) {
return armorName; return Messages.get(this, "name", armorName);
} }
@Override @Override
@@ -370,7 +371,7 @@ public class Armor extends EquipableItem {
if (!owner.isAlive() && owner instanceof Hero) { if (!owner.isAlive() && owner instanceof Hero) {
Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, name() ) ); Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, name() ) );
GLog.n( "%s killed you...", name() ); GLog.n( Messages.get(this, "killed", name()) );
Badges.validateDeathFromGlyph(); Badges.validateDeathFromGlyph();
return true; return true;
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class ClothArmor extends Armor { public class ClothArmor extends Armor {
{ {
name = "cloth armor";
image = ItemSpriteSheet.ARMOR_CLOTH; image = ItemSpriteSheet.ARMOR_CLOTH;
bones = false; //Finding them in bones would be semi-frequent and disappointing. bones = false; //Finding them in bones would be semi-frequent and disappointing.
@@ -42,7 +42,6 @@ public class HuntressArmor extends ClassArmor {
private static final String AC_SPECIAL = "SPECTRAL BLADES"; private static final String AC_SPECIAL = "SPECTRAL BLADES";
{ {
name = "huntress cloak";
image = ItemSpriteSheet.ARMOR_HUNTRESS; image = ItemSpriteSheet.ARMOR_HUNTRESS;
} }
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class LeatherArmor extends Armor { public class LeatherArmor extends Armor {
{ {
name = "leather armor";
image = ItemSpriteSheet.ARMOR_LEATHER; image = ItemSpriteSheet.ARMOR_LEATHER;
} }
@@ -42,7 +42,6 @@ public class MageArmor extends ClassArmor {
private static final String TXT_NOT_MAGE = "Only mages can use this armor!"; private static final String TXT_NOT_MAGE = "Only mages can use this armor!";
{ {
name = "mage robe";
image = ItemSpriteSheet.ARMOR_MAGE; image = ItemSpriteSheet.ARMOR_MAGE;
} }
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class MailArmor extends Armor { public class MailArmor extends Armor {
{ {
name = "mail armor";
image = ItemSpriteSheet.ARMOR_MAIL; image = ItemSpriteSheet.ARMOR_MAIL;
} }
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class PlateArmor extends Armor { public class PlateArmor extends Armor {
{ {
name = "plate armor";
image = ItemSpriteSheet.ARMOR_PLATE; image = ItemSpriteSheet.ARMOR_PLATE;
} }
@@ -46,7 +46,6 @@ public class RogueArmor extends ClassArmor {
private static final String AC_SPECIAL = "SMOKE BOMB"; private static final String AC_SPECIAL = "SMOKE BOMB";
{ {
name = "rogue garb";
image = ItemSpriteSheet.ARMOR_ROGUE; image = ItemSpriteSheet.ARMOR_ROGUE;
} }
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class ScaleArmor extends Armor { public class ScaleArmor extends Armor {
{ {
name = "scale armor";
image = ItemSpriteSheet.ARMOR_SCALE; image = ItemSpriteSheet.ARMOR_SCALE;
} }
@@ -49,7 +49,6 @@ public class WarriorArmor extends ClassArmor {
private static final String TXT_NOT_WARRIOR = "Only warriors can use this armor!"; private static final String TXT_NOT_WARRIOR = "Only warriors can use this armor!";
{ {
name = "warrior suit of armor";
image = ItemSpriteSheet.ARMOR_WARRIOR; image = ItemSpriteSheet.ARMOR_WARRIOR;
} }
@@ -33,8 +33,6 @@ import com.watabou.utils.GameMath;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Affection extends Glyph { public class Affection extends Glyph {
private static final String TXT_AFFECTION = "%s of affection";
private static ItemSprite.Glowing PINK = new ItemSprite.Glowing( 0xFF4488 ); private static ItemSprite.Glowing PINK = new ItemSprite.Glowing( 0xFF4488 );
@@ -58,11 +56,6 @@ public class Affection extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_AFFECTION, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -35,8 +35,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class AntiEntropy extends Glyph { public class AntiEntropy extends Glyph {
private static final String TXT_ANTI_ENTROPY = "%s of anti-entropy";
private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x0000FF ); private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x0000FF );
@@ -57,11 +55,6 @@ public class AntiEntropy extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_ANTI_ENTROPY, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -31,8 +31,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Bounce extends Glyph { public class Bounce extends Glyph {
private static final String TXT_BOUNCE = "%s of bounce";
@Override @Override
public int proc( Armor armor, Char attacker, Char defender, int damage) { public int proc( Armor armor, Char attacker, Char defender, int damage) {
@@ -68,10 +66,5 @@ public class Bounce extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_BOUNCE, weaponName );
}
} }
@@ -32,8 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Displacement extends Glyph { public class Displacement extends Glyph {
private static final String TXT_DISPLACEMENT = "%s of displacement";
private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x66AAFF ); private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x66AAFF );
@@ -59,11 +57,6 @@ public class Displacement extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_DISPLACEMENT, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -34,8 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Entanglement extends Glyph { public class Entanglement extends Glyph {
private static final String TXT_ENTANGLEMENT = "%s of entanglement";
private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x448822 ); private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x448822 );
@@ -55,11 +53,6 @@ public class Entanglement extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_ENTANGLEMENT, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -32,8 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Metabolism extends Glyph { public class Metabolism extends Glyph {
private static final String TXT_METABOLISM = "%s of metabolism";
private static ItemSprite.Glowing RED = new ItemSprite.Glowing( 0xCC0000 ); private static ItemSprite.Glowing RED = new ItemSprite.Glowing( 0xCC0000 );
@@ -64,11 +62,6 @@ public class Metabolism extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_METABOLISM, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -36,8 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Multiplicity extends Glyph { public class Multiplicity extends Glyph {
private static final String TXT_MULTIPLICITY = "%s of multiplicity";
private static ItemSprite.Glowing PINK = new ItemSprite.Glowing( 0xCCAA88 ); private static ItemSprite.Glowing PINK = new ItemSprite.Glowing( 0xCCAA88 );
@@ -71,11 +69,6 @@ public class Multiplicity extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_MULTIPLICITY, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -33,8 +33,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Potential extends Glyph { public class Potential extends Glyph {
private static final String TXT_POTENTIAL = "%s of potential";
private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x66CCEE ); private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x66CCEE );
@@ -61,11 +59,6 @@ public class Potential extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_POTENTIAL, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -32,8 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Stench extends Glyph { public class Stench extends Glyph {
private static final String TXT_STENCH = "%s of stench";
private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x22CC44 ); private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x22CC44 );
@@ -51,11 +49,6 @@ public class Stench extends Glyph {
return damage; return damage;
} }
@Override
public String name( String weaponName) {
return String.format( TXT_STENCH, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
return GREEN; return GREEN;
@@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor.Glyph;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing;
@@ -37,8 +38,6 @@ import com.watabou.utils.Bundle;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Viscosity extends Glyph { public class Viscosity extends Glyph {
private static final String TXT_VISCOSITY = "%s of viscosity";
private static ItemSprite.Glowing PURPLE = new ItemSprite.Glowing( 0x8844CC ); private static ItemSprite.Glowing PURPLE = new ItemSprite.Glowing( 0x8844CC );
@@ -60,7 +59,7 @@ public class Viscosity extends Glyph {
} }
debuff.prolong( damage ); debuff.prolong( damage );
defender.sprite.showStatus( CharSprite.WARNING, "deferred %d", damage ); defender.sprite.showStatus( CharSprite.WARNING, Messages.get(this, "deferred", damage) );
return 0; return 0;
@@ -68,11 +67,6 @@ public class Viscosity extends Glyph {
return damage; return damage;
} }
} }
@Override
public String name( String weaponName) {
return String.format( TXT_VISCOSITY, weaponName );
}
@Override @Override
public Glowing glowing() { public Glowing glowing() {
@@ -119,7 +113,7 @@ public class Viscosity extends Glyph {
@Override @Override
public String toString() { public String toString() {
return Utils.format( "Defered damage", damage ); return Messages.get(this, "name");
} }
@Override @Override
@@ -131,7 +125,7 @@ public class Viscosity extends Glyph {
Glyph glyph = new Viscosity(); Glyph glyph = new Viscosity();
Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, glyph.name() ) ); Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, glyph.name() ) );
GLog.n( "%s killed you...", glyph.name() ); GLog.n( Messages.get(Glyph.class, "killed", glyph.name()) );
Badges.validateDeathFromGlyph(); Badges.validateDeathFromGlyph();
} }
@@ -152,12 +146,7 @@ public class Viscosity extends Glyph {
@Override @Override
public String desc() { public String desc() {
return "While your armor's glyph has protected you from damage, it seems to be slowly paying you back for it.\n" + return Messages.get(this, "desc", damage);
"\n" +
"Damage is being dealt to you over time instead of immediately. " +
"You will take one damage per turn until there is no damage left.\n" +
"\n" +
"There is " + damage + " deffered damage left.";
} }
} }
} }
@@ -40,7 +40,6 @@ import java.util.Collections;
public class AlchemistsToolkit extends Artifact { public class AlchemistsToolkit extends Artifact {
{ {
name = "Alchemists Toolkit";
image = ItemSpriteSheet.ARTIFACT_TOOLKIT; image = ItemSpriteSheet.ARTIFACT_TOOLKIT;
levelCap = 10; levelCap = 10;
@@ -31,7 +31,6 @@ import com.watabou.utils.Random;
public class CapeOfThorns extends Artifact { public class CapeOfThorns extends Artifact {
{ {
name = "Cape of Thorns";
image = ItemSpriteSheet.ARTIFACT_CAPE; image = ItemSpriteSheet.ARTIFACT_CAPE;
levelCap = 10; levelCap = 10;
@@ -49,7 +49,6 @@ public class ChaliceOfBlood extends Artifact {
{ {
name = "Chalice of Blood";
image = ItemSpriteSheet.ARTIFACT_CHALICE1; image = ItemSpriteSheet.ARTIFACT_CHALICE1;
levelCap = 10; levelCap = 10;
@@ -40,7 +40,6 @@ import java.util.ArrayList;
public class CloakOfShadows extends Artifact { public class CloakOfShadows extends Artifact {
{ {
name = "Cloak of Shadows";
image = ItemSpriteSheet.ARTIFACT_CLOAK; image = ItemSpriteSheet.ARTIFACT_CLOAK;
exp = 0; exp = 0;
@@ -52,7 +52,6 @@ import java.util.HashSet;
public class DriedRose extends Artifact { public class DriedRose extends Artifact {
{ {
name = "Dried Rose";
image = ItemSpriteSheet.ARTIFACT_ROSE1; image = ItemSpriteSheet.ARTIFACT_ROSE1;
levelCap = 10; levelCap = 10;
@@ -248,7 +247,6 @@ public class DriedRose extends Artifact {
public static class Petal extends Item { public static class Petal extends Item {
{ {
name = "dried petal";
stackable = true; stackable = true;
image = ItemSpriteSheet.PETAL; image = ItemSpriteSheet.PETAL;
} }
@@ -46,7 +46,6 @@ public class EtherealChains extends Artifact {
public static final String AC_CAST = "CAST"; public static final String AC_CAST = "CAST";
{ {
name = "ethereal chains";
image = ItemSpriteSheet.ARTIFACT_CHAINS; image = ItemSpriteSheet.ARTIFACT_CHAINS;
levelCap = 5; levelCap = 5;
@@ -47,7 +47,6 @@ public class HornOfPlenty extends Artifact {
{ {
name = "Horn of Plenty";
image = ItemSpriteSheet.ARTIFACT_HORN1; image = ItemSpriteSheet.ARTIFACT_HORN1;
levelCap = 30; levelCap = 30;
@@ -83,7 +83,6 @@ public class LloydsBeacon extends Artifact {
private int returnPos; private int returnPos;
{ {
name = "lloyd's beacon";
image = ItemSpriteSheet.ARTIFACT_BEACON; image = ItemSpriteSheet.ARTIFACT_BEACON;
levelCap = 3; levelCap = 3;
@@ -27,7 +27,6 @@ import com.watabou.utils.Random;
public class MasterThievesArmband extends Artifact { public class MasterThievesArmband extends Artifact {
{ {
name = "Master Thieves' Armband";
image = ItemSpriteSheet.ARTIFACT_ARMBAND; image = ItemSpriteSheet.ARTIFACT_ARMBAND;
levelCap = 10; levelCap = 10;
@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
@@ -44,7 +45,6 @@ import java.util.Collections;
public class SandalsOfNature extends Artifact { public class SandalsOfNature extends Artifact {
{ {
name = "Sandals of Nature";
image = ItemSpriteSheet.ARTIFACT_SANDALS; image = ItemSpriteSheet.ARTIFACT_SANDALS;
levelCap = 3; levelCap = 3;
@@ -54,9 +54,6 @@ public class SandalsOfNature extends Artifact {
defaultAction = AC_ROOT; defaultAction = AC_ROOT;
} }
public static final String[] NAMES = {"Sandals of Nature", "Shoes of Nature",
"Boots of Nature", "Greaves of Nature"};
public static final String AC_FEED = "FEED"; public static final String AC_FEED = "FEED";
public static final String AC_ROOT = "ROOT"; public static final String AC_ROOT = "ROOT";
@@ -166,7 +163,7 @@ public class SandalsOfNature extends Artifact {
image = ItemSpriteSheet.ARTIFACT_BOOTS; image = ItemSpriteSheet.ARTIFACT_BOOTS;
else if (level() >= 2) else if (level() >= 2)
image = ItemSpriteSheet.ARTIFACT_GREAVES; image = ItemSpriteSheet.ARTIFACT_GREAVES;
name = NAMES[level()+1]; name = Messages.get(this, "name_" + level()+1);
return super.upgrade(); return super.upgrade();
} }
@@ -183,7 +180,7 @@ public class SandalsOfNature extends Artifact {
@Override @Override
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
name = NAMES[level()]; if (level() > 0) name = Messages.get(this, "name_" + level());
if (bundle.contains(SEEDS)) if (bundle.contains(SEEDS))
Collections.addAll(seeds , bundle.getStringArray(SEEDS)); Collections.addAll(seeds , bundle.getStringArray(SEEDS));
} }
@@ -216,7 +213,7 @@ public class SandalsOfNature extends Artifact {
seeds.clear(); seeds.clear();
upgrade(); upgrade();
if (level() >= 1 && level() <= 3) { if (level() >= 1 && level() <= 3) {
GLog.p("Your " + NAMES[level()-1] + " surge in size, they are now " + NAMES[level()] + "!"); GLog.p("Your footwear surges in size, they are now " + name + "!");
} }
} else { } else {
@@ -39,7 +39,6 @@ import java.util.ArrayList;
public class TalismanOfForesight extends Artifact { public class TalismanOfForesight extends Artifact {
{ {
name = "Talisman of Foresight";
image = ItemSpriteSheet.ARTIFACT_TALISMAN; image = ItemSpriteSheet.ARTIFACT_TALISMAN;
exp = 0; exp = 0;
@@ -50,7 +50,6 @@ public class TimekeepersHourglass extends Artifact {
"When time is frozen, you can move as if your actions take no time. Note that attacking will break this."; "When time is frozen, you can move as if your actions take no time. Note that attacking will break this.";
{ {
name = "Timekeeper's Hourglass";
image = ItemSpriteSheet.ARTIFACT_HOURGLASS; image = ItemSpriteSheet.ARTIFACT_HOURGLASS;
levelCap = 5; levelCap = 5;
@@ -357,7 +356,6 @@ public class TimekeepersHourglass extends Artifact {
public static class sandBag extends Item { public static class sandBag extends Item {
{ {
name = "bag of magic sand";
image = ItemSpriteSheet.SANDBAG; image = ItemSpriteSheet.SANDBAG;
} }
@@ -46,7 +46,6 @@ import java.util.Collections;
public class UnstableSpellbook extends Artifact { public class UnstableSpellbook extends Artifact {
{ {
name = "Unstable Spellbook";
image = ItemSpriteSheet.ARTIFACT_SPELLBOOK; image = ItemSpriteSheet.ARTIFACT_SPELLBOOK;
levelCap = 10; levelCap = 10;
@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class PotionBandolier extends Bag { public class PotionBandolier extends Bag {
{ {
name = "potion bandolier";
image = ItemSpriteSheet.BANDOLIER; image = ItemSpriteSheet.BANDOLIER;
size = 12; size = 12;
@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class ScrollHolder extends Bag { public class ScrollHolder extends Bag {
{ {
name = "scroll holder";
image = ItemSpriteSheet.HOLDER; image = ItemSpriteSheet.HOLDER;
size = 12; size = 12;
@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class SeedPouch extends Bag { public class SeedPouch extends Bag {
{ {
name = "seed pouch";
image = ItemSpriteSheet.POUCH; image = ItemSpriteSheet.POUCH;
size = 12; size = 12;
@@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class WandHolster extends Bag { public class WandHolster extends Bag {
{ {
name = "wand holster";
image = ItemSpriteSheet.HOLSTER; image = ItemSpriteSheet.HOLSTER;
size = 12; size = 12;
@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class ChargrilledMeat extends Food { public class ChargrilledMeat extends Food {
{ {
name = "chargrilled meat";
image = ItemSpriteSheet.STEAK; image = ItemSpriteSheet.STEAK;
energy = Hunger.STARVING - Hunger.HUNGRY; energy = Hunger.STARVING - Hunger.HUNGRY;
hornValue = 1; hornValue = 1;
@@ -50,7 +50,6 @@ public class Food extends Item {
{ {
stackable = true; stackable = true;
name = "ration of food";
image = ItemSpriteSheet.RATION; image = ItemSpriteSheet.RATION;
bones = true; bones = true;
@@ -40,7 +40,6 @@ import com.watabou.utils.Random;
public class FrozenCarpaccio extends Food { public class FrozenCarpaccio extends Food {
{ {
name = "frozen carpaccio";
image = ItemSpriteSheet.CARPACCIO; image = ItemSpriteSheet.CARPACCIO;
energy = Hunger.STARVING - Hunger.HUNGRY; energy = Hunger.STARVING - Hunger.HUNGRY;
hornValue = 1; hornValue = 1;
@@ -35,7 +35,6 @@ import com.watabou.utils.Random;
public class MysteryMeat extends Food { public class MysteryMeat extends Food {
{ {
name = "mystery meat";
image = ItemSpriteSheet.MEAT; image = ItemSpriteSheet.MEAT;
energy = Hunger.STARVING - Hunger.HUNGRY; energy = Hunger.STARVING - Hunger.HUNGRY;
message = "That food tasted... strange."; message = "That food tasted... strange.";
@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class OverpricedRation extends Food { public class OverpricedRation extends Food {
{ {
name = "overpriced food ration";
image = ItemSpriteSheet.OVERPRICED; image = ItemSpriteSheet.OVERPRICED;
energy = Hunger.STARVING - Hunger.HUNGRY; energy = Hunger.STARVING - Hunger.HUNGRY;
message = "That food tasted ok."; message = "That food tasted ok.";
@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Recharging; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Recharging;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import java.util.Calendar; import java.util.Calendar;
@@ -64,11 +65,11 @@ public class Pasty extends Food {
switch(holiday){ switch(holiday){
case NONE: case NONE:
name = "pasty"; name = Messages.get(this, "pasty");
image = ItemSpriteSheet.PASTY; image = ItemSpriteSheet.PASTY;
break; break;
case XMAS: case XMAS:
name = "candy cane"; name = Messages.get(this, "cane");
image = ItemSpriteSheet.CANDY_CANE; image = ItemSpriteSheet.CANDY_CANE;
break; break;
} }
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class GoldenKey extends Key { public class GoldenKey extends Key {
{ {
name = "golden key";
image = ItemSpriteSheet.GOLDEN_KEY; image = ItemSpriteSheet.GOLDEN_KEY;
} }
@@ -28,12 +28,9 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
public class IronKey extends Key { public class IronKey extends Key {
private static final String TXT_FROM_DEPTH = "iron key from depth %d";
public static int curDepthQuantity = 0; public static int curDepthQuantity = 0;
{ {
name = "iron key";
image = ItemSpriteSheet.IRON_KEY; image = ItemSpriteSheet.IRON_KEY;
} }
@@ -62,11 +59,6 @@ public class IronKey extends Key {
} }
} }
@Override
public String toString() {
return Utils.format( TXT_FROM_DEPTH, depth );
}
@Override @Override
public String info() { public String info() {
return return
@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class SkeletonKey extends Key { public class SkeletonKey extends Key {
{ {
name = "skeleton key";
image = ItemSpriteSheet.SKELETON_KEY; image = ItemSpriteSheet.SKELETON_KEY;
stackable = false; stackable = false;
} }
@@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
public class PotionOfExperience extends Potion { public class PotionOfExperience extends Potion {
{ {
name = "Potion of Experience";
initials = "Ex"; initials = "Ex";
bones = true; bones = true;
@@ -34,7 +34,6 @@ public class PotionOfFrost extends Potion {
private static final int DISTANCE = 2; private static final int DISTANCE = 2;
{ {
name = "Potion of Frost";
initials = "Fr"; initials = "Fr";
} }
@@ -33,7 +33,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class PotionOfHealing extends Potion { public class PotionOfHealing extends Potion {
{ {
name = "Potion of Healing";
initials = "He"; initials = "He";
bones = true; bones = true;
@@ -34,7 +34,6 @@ public class PotionOfInvisibility extends Potion {
private static final float ALPHA = 0.4f; private static final float ALPHA = 0.4f;
{ {
name = "Potion of Invisibility";
initials = "In"; initials = "In";
} }
@@ -34,7 +34,6 @@ import com.watabou.noosa.audio.Sample;
public class PotionOfLevitation extends Potion { public class PotionOfLevitation extends Potion {
{ {
name = "Potion of Levitation";
initials = "Le"; initials = "Le";
} }
@@ -34,7 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
public class PotionOfLiquidFlame extends Potion { public class PotionOfLiquidFlame extends Potion {
{ {
name = "Potion of Liquid Flame";
initials = "LF"; initials = "LF";
} }
@@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class PotionOfMight extends Potion { public class PotionOfMight extends Potion {
{ {
name = "Potion of Might";
initials = "Mi"; initials = "Mi";
bones = true; bones = true;
@@ -29,7 +29,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class PotionOfMindVision extends Potion { public class PotionOfMindVision extends Potion {
{ {
name = "Potion of Mind Vision";
initials = "MV"; initials = "MV";
} }
@@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
public class PotionOfParalyticGas extends Potion { public class PotionOfParalyticGas extends Potion {
{ {
name = "Potion of Paralytic Gas";
initials = "PG"; initials = "PG";
} }
@@ -47,7 +47,6 @@ public class PotionOfPurity extends Potion {
private static final int DISTANCE = 5; private static final int DISTANCE = 5;
{ {
name = "Potion of Purification";
initials = "Pu"; initials = "Pu";
} }
@@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class PotionOfStrength extends Potion { public class PotionOfStrength extends Potion {
{ {
name = "Potion of Strength";
initials = "St"; initials = "St";
bones = true; bones = true;
@@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
public class PotionOfToxicGas extends Potion { public class PotionOfToxicGas extends Potion {
{ {
name = "Potion of Toxic Gas";
initials = "TG"; initials = "TG";
} }
@@ -45,7 +45,6 @@ public class CeremonialCandle extends Item {
public static int ritualPos; public static int ritualPos;
{ {
name = "ceremonial candle";
image = ItemSpriteSheet.CANDLE; image = ItemSpriteSheet.CANDLE;
defaultAction = AC_THROW; defaultAction = AC_THROW;
@@ -40,7 +40,6 @@ import java.util.ArrayList;
public class CorpseDust extends Item { public class CorpseDust extends Item {
{ {
name = "corpse dust";
image = ItemSpriteSheet.DUST; image = ItemSpriteSheet.DUST;
cursed = true; cursed = true;
@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class DarkGold extends Item { public class DarkGold extends Item {
{ {
name = "dark gold ore";
image = ItemSpriteSheet.ORE; image = ItemSpriteSheet.ORE;
stackable = true; stackable = true;
@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class DwarfToken extends Item { public class DwarfToken extends Item {
{ {
name = "dwarf token";
image = ItemSpriteSheet.TOKEN; image = ItemSpriteSheet.TOKEN;
stackable = true; stackable = true;
@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class Embers extends Item { public class Embers extends Item {
{ {
name = "elemental embers";
image = ItemSpriteSheet.EMBER; image = ItemSpriteSheet.EMBER;
unique = true; unique = true;
@@ -54,7 +54,6 @@ public class Pickaxe extends Weapon {
private static final Glowing BLOODY = new Glowing( 0x550000 ); private static final Glowing BLOODY = new Glowing( 0x550000 );
{ {
name = "pickaxe";
image = ItemSpriteSheet.PICKAXE; image = ItemSpriteSheet.PICKAXE;
unique = true; unique = true;
@@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
public class RatSkull extends Item { public class RatSkull extends Item {
{ {
name = "giant rat skull";
image = ItemSpriteSheet.SKULL; image = ItemSpriteSheet.SKULL;
unique = true; unique = true;
@@ -21,10 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.items.rings; package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfAccuracy extends Ring { public class RingOfAccuracy extends Ring {
{
name = "Ring of Accuracy";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
@@ -32,10 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class RingOfElements extends Ring { public class RingOfElements extends Ring {
{
name = "Ring of Elements";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
@@ -25,10 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
public class RingOfEvasion extends Ring { public class RingOfEvasion extends Ring {
{
name = "Ring of Evasion";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
@@ -24,10 +24,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
public class RingOfForce extends Ring { public class RingOfForce extends Ring {
{
name = "Ring of Force";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Force(); return new Force();
@@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfFuror extends Ring { public class RingOfFuror extends Ring {
{
name = "Ring of Furor";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Furor(); return new Furor();
@@ -21,10 +21,6 @@
package com.shatteredpixel.shatteredpixeldungeon.items.rings; package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfHaste extends Ring { public class RingOfHaste extends Ring {
{
name = "Ring of Haste";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
@@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfMagic extends Ring { public class RingOfMagic extends Ring {
{
name = "Ring of Magic";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Magic(); return new Magic();
@@ -23,10 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfMight extends Ring { public class RingOfMight extends Ring {
{
name = "Ring of Might";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Might(); return new Might();
@@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfSharpshooting extends Ring { public class RingOfSharpshooting extends Ring {
{
name = "Ring of Sharpshooting";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Aim(); return new Aim();
@@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfTenacity extends Ring { public class RingOfTenacity extends Ring {
{
name = "Ring of Tenacity";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Tenacity(); return new Tenacity();
@@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings;
public class RingOfWealth extends Ring { public class RingOfWealth extends Ring {
{
name = "Ring of Wealth";
}
@Override @Override
protected RingBuff buff( ) { protected RingBuff buff( ) {
return new Wealth(); return new Wealth();
@@ -29,7 +29,6 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
public class ScrollOfIdentify extends InventoryScroll { public class ScrollOfIdentify extends InventoryScroll {
{ {
name = "Scroll of Identify";
initials = "Id"; initials = "Id";
inventoryTitle = "Select an item to identify"; inventoryTitle = "Select an item to identify";
@@ -34,7 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class ScrollOfLullaby extends Scroll { public class ScrollOfLullaby extends Scroll {
{ {
name = "Scroll of Lullaby";
initials = "Lu"; initials = "Lu";
} }
@@ -37,7 +37,6 @@ public class ScrollOfMagicMapping extends Scroll {
private static final String TXT_LAYOUT = "You are now aware of the level layout."; private static final String TXT_LAYOUT = "You are now aware of the level layout.";
{ {
name = "Scroll of Magic Mapping";
initials = "MM"; initials = "MM";
} }
@@ -35,7 +35,6 @@ public class ScrollOfMagicalInfusion extends InventoryScroll {
private static final String TXT_INFUSE = "your %s is infused with arcane energy!"; private static final String TXT_INFUSE = "your %s is infused with arcane energy!";
{ {
name = "Scroll of Magical Infusion";
initials = "MaI"; initials = "MaI";
inventoryTitle = "Select an item to infuse"; inventoryTitle = "Select an item to infuse";
@@ -36,7 +36,6 @@ public class ScrollOfMirrorImage extends Scroll {
private static final int NIMAGES = 3; private static final int NIMAGES = 3;
{ {
name = "Scroll of Mirror Image";
initials = "MI"; initials = "MI";
} }
@@ -38,7 +38,6 @@ import com.watabou.utils.Random;
public class ScrollOfPsionicBlast extends Scroll { public class ScrollOfPsionicBlast extends Scroll {
{ {
name = "Scroll of Psionic Blast";
initials = "PB"; initials = "PB";
bones = true; bones = true;
@@ -36,7 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
public class ScrollOfRage extends Scroll { public class ScrollOfRage extends Scroll {
{ {
name = "Scroll of Rage";
initials = "Ra"; initials = "Ra";
} }
@@ -35,7 +35,6 @@ public class ScrollOfRecharging extends Scroll {
public static final float BUFF_DURATION = 30f; public static final float BUFF_DURATION = 30f;
{ {
name = "Scroll of Recharging";
initials = "Re"; initials = "Re";
} }
@@ -39,7 +39,6 @@ public class ScrollOfRemoveCurse extends Scroll {
"Your pack glows with a cleansing light, but nothing happens."; "Your pack glows with a cleansing light, but nothing happens.";
{ {
name = "Scroll of Remove Curse";
initials = "RC"; initials = "RC";
} }
@@ -39,7 +39,6 @@ public class ScrollOfTeleportation extends Scroll {
"Strong magic aura of this place prevents you from teleporting!"; "Strong magic aura of this place prevents you from teleporting!";
{ {
name = "Scroll of Teleportation";
initials = "TP"; initials = "TP";
} }

Some files were not shown because too many files have changed in this diff Show More