From c1aca208b4246922e461b28f78d8dc1315e583d6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 31 Dec 2015 23:49:49 -0500 Subject: [PATCH] v0.3.4: externalized almost all item names --- .../shatteredpixeldungeon/items/Amulet.java | 1 - .../shatteredpixeldungeon/items/Ankh.java | 1 - .../shatteredpixeldungeon/items/ArmorKit.java | 1 - .../shatteredpixeldungeon/items/Bomb.java | 2 - .../shatteredpixeldungeon/items/DewVial.java | 1 - .../shatteredpixeldungeon/items/Dewdrop.java | 1 - .../shatteredpixeldungeon/items/Gold.java | 1 - .../shatteredpixeldungeon/items/Honeypot.java | 2 - .../shatteredpixeldungeon/items/Item.java | 9 +- .../items/MerchantsBeacon.java | 1 - .../shatteredpixeldungeon/items/Stylus.java | 1 - .../items/TomeOfMastery.java | 1 - .../shatteredpixeldungeon/items/Torch.java | 1 - .../items/Weightstone.java | 1 - .../items/armor/Armor.java | 9 +- .../items/armor/ClothArmor.java | 1 - .../items/armor/HuntressArmor.java | 1 - .../items/armor/LeatherArmor.java | 1 - .../items/armor/MageArmor.java | 1 - .../items/armor/MailArmor.java | 1 - .../items/armor/PlateArmor.java | 1 - .../items/armor/RogueArmor.java | 1 - .../items/armor/ScaleArmor.java | 1 - .../items/armor/WarriorArmor.java | 1 - .../items/armor/glyphs/Affection.java | 7 - .../items/armor/glyphs/AntiEntropy.java | 7 - .../items/armor/glyphs/Bounce.java | 7 - .../items/armor/glyphs/Displacement.java | 7 - .../items/armor/glyphs/Entanglement.java | 7 - .../items/armor/glyphs/Metabolism.java | 7 - .../items/armor/glyphs/Multiplicity.java | 7 - .../items/armor/glyphs/Potential.java | 7 - .../items/armor/glyphs/Stench.java | 7 - .../items/armor/glyphs/Viscosity.java | 21 +-- .../items/artifacts/AlchemistsToolkit.java | 1 - .../items/artifacts/CapeOfThorns.java | 1 - .../items/artifacts/ChaliceOfBlood.java | 1 - .../items/artifacts/CloakOfShadows.java | 1 - .../items/artifacts/DriedRose.java | 2 - .../items/artifacts/EtherealChains.java | 1 - .../items/artifacts/HornOfPlenty.java | 1 - .../items/artifacts/LloydsBeacon.java | 1 - .../items/artifacts/MasterThievesArmband.java | 1 - .../items/artifacts/SandalsOfNature.java | 11 +- .../items/artifacts/TalismanOfForesight.java | 1 - .../items/artifacts/TimekeepersHourglass.java | 2 - .../items/artifacts/UnstableSpellbook.java | 1 - .../items/bags/PotionBandolier.java | 1 - .../items/bags/ScrollHolder.java | 1 - .../items/bags/SeedPouch.java | 1 - .../items/bags/WandHolster.java | 1 - .../items/food/ChargrilledMeat.java | 1 - .../items/food/Food.java | 1 - .../items/food/FrozenCarpaccio.java | 1 - .../items/food/MysteryMeat.java | 1 - .../items/food/OverpricedRation.java | 1 - .../items/food/Pasty.java | 5 +- .../items/keys/GoldenKey.java | 1 - .../items/keys/IronKey.java | 8 - .../items/keys/SkeletonKey.java | 1 - .../items/potions/PotionOfExperience.java | 1 - .../items/potions/PotionOfFrost.java | 1 - .../items/potions/PotionOfHealing.java | 1 - .../items/potions/PotionOfInvisibility.java | 1 - .../items/potions/PotionOfLevitation.java | 1 - .../items/potions/PotionOfLiquidFlame.java | 1 - .../items/potions/PotionOfMight.java | 1 - .../items/potions/PotionOfMindVision.java | 1 - .../items/potions/PotionOfParalyticGas.java | 1 - .../items/potions/PotionOfPurity.java | 1 - .../items/potions/PotionOfStrength.java | 1 - .../items/potions/PotionOfToxicGas.java | 1 - .../items/quest/CeremonialCandle.java | 1 - .../items/quest/CorpseDust.java | 1 - .../items/quest/DarkGold.java | 1 - .../items/quest/DwarfToken.java | 1 - .../items/quest/Embers.java | 1 - .../items/quest/Pickaxe.java | 1 - .../items/quest/RatSkull.java | 1 - .../items/rings/RingOfAccuracy.java | 4 - .../items/rings/RingOfElements.java | 4 - .../items/rings/RingOfEvasion.java | 4 - .../items/rings/RingOfForce.java | 4 - .../items/rings/RingOfFuror.java | 4 - .../items/rings/RingOfHaste.java | 4 - .../items/rings/RingOfMagic.java | 4 - .../items/rings/RingOfMight.java | 4 - .../items/rings/RingOfSharpshooting.java | 4 - .../items/rings/RingOfTenacity.java | 4 - .../items/rings/RingOfWealth.java | 4 - .../items/scrolls/ScrollOfIdentify.java | 1 - .../items/scrolls/ScrollOfLullaby.java | 1 - .../items/scrolls/ScrollOfMagicMapping.java | 1 - .../scrolls/ScrollOfMagicalInfusion.java | 1 - .../items/scrolls/ScrollOfMirrorImage.java | 1 - .../items/scrolls/ScrollOfPsionicBlast.java | 1 - .../items/scrolls/ScrollOfRage.java | 1 - .../items/scrolls/ScrollOfRecharging.java | 1 - .../items/scrolls/ScrollOfRemoveCurse.java | 1 - .../items/scrolls/ScrollOfTeleportation.java | 1 - .../items/scrolls/ScrollOfTerror.java | 1 - .../items/scrolls/ScrollOfUpgrade.java | 1 - .../items/wands/WandOfBlastWave.java | 1 - .../items/wands/WandOfCorruption.java | 1 - .../items/wands/WandOfDisintegration.java | 1 - .../items/wands/WandOfFireblast.java | 1 - .../items/wands/WandOfFrost.java | 1 - .../items/wands/WandOfLightning.java | 1 - .../items/wands/WandOfMagicMissile.java | 1 - .../items/wands/WandOfPrismaticLight.java | 1 - .../items/wands/WandOfRegrowth.java | 1 - .../items/wands/WandOfTransfusion.java | 1 - .../items/wands/WandOfVenom.java | 1 - .../items/weapon/Weapon.java | 3 +- .../items/weapon/enchantments/Death.java | 7 - .../items/weapon/enchantments/Fire.java | 8 - .../items/weapon/enchantments/Horror.java | 8 - .../weapon/enchantments/Instability.java | 8 - .../items/weapon/enchantments/Leech.java | 8 - .../items/weapon/enchantments/Luck.java | 7 - .../items/weapon/enchantments/Paralysis.java | 8 - .../items/weapon/enchantments/Poison.java | 8 - .../items/weapon/enchantments/Shock.java | 7 - .../items/weapon/enchantments/Slow.java | 7 - .../items/weapon/melee/BattleAxe.java | 1 - .../items/weapon/melee/Dagger.java | 1 - .../items/weapon/melee/Glaive.java | 1 - .../items/weapon/melee/Knuckles.java | 1 - .../items/weapon/melee/Longsword.java | 1 - .../items/weapon/melee/Mace.java | 1 - .../items/weapon/melee/MagesStaff.java | 2 +- .../items/weapon/melee/Quarterstaff.java | 1 - .../items/weapon/melee/ShortSword.java | 1 - .../items/weapon/melee/Spear.java | 1 - .../items/weapon/melee/Sword.java | 1 - .../items/weapon/melee/WarHammer.java | 1 - .../items/weapon/missiles/Boomerang.java | 1 - .../items/weapon/missiles/CurareDart.java | 1 - .../items/weapon/missiles/Dart.java | 1 - .../items/weapon/missiles/IncendiaryDart.java | 1 - .../items/weapon/missiles/Javelin.java | 1 - .../items/weapon/missiles/Shuriken.java | 1 - .../items/weapon/missiles/Tamahawk.java | 1 - .../messages/messages.properties | 168 +++++++++++++++++- 144 files changed, 191 insertions(+), 337 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Amulet.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Amulet.java index 73cf851a3..866600c54 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Amulet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Amulet.java @@ -36,7 +36,6 @@ public class Amulet extends Item { private static final String AC_END = "END THE GAME"; { - name = "Amulet of Yendor"; image = ItemSpriteSheet.AMULET; unique = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java index 2733ec2c8..3ae164253 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java @@ -47,7 +47,6 @@ public class Ankh extends Item { { - name = "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. diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java index 35a33fe85..76173490f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/ArmorKit.java @@ -44,7 +44,6 @@ public class ArmorKit extends Item { private static final String AC_APPLY = "APPLY"; { - name = "armor kit"; image = ItemSpriteSheet.KIT; unique = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Bomb.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Bomb.java index be27a626f..4ae2ab731 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Bomb.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Bomb.java @@ -43,7 +43,6 @@ import java.util.ArrayList; public class Bomb extends Item { { - name = "bomb"; image = ItemSpriteSheet.BOMB; defaultAction = AC_LIGHTTHROW; @@ -258,7 +257,6 @@ public class Bomb extends Item { public static class DoubleBomb extends Bomb{ { - name = "two bombs"; image = ItemSpriteSheet.DBL_BOMB; stackable = false; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java index 684f7c002..5880edbde 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/DewVial.java @@ -51,7 +51,6 @@ public class DewVial extends Item { private static final String TXT_EMPTY = "Your dew vial is empty!"; { - name = "dew vial"; image = ItemSpriteSheet.VIAL; defaultAction = AC_DRINK; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java index cde348e20..551a56c9d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Dewdrop.java @@ -36,7 +36,6 @@ public class Dewdrop extends Item { private static final String TXT_VALUE = "%+dHP"; { - name = "dewdrop"; image = ItemSpriteSheet.DEWDROP; stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java index d40e411f6..02b85beb9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java @@ -44,7 +44,6 @@ public class Gold extends Item { private static final String TXT_VALUE = "%+d"; { - name = "gold"; image = ItemSpriteSheet.GOLD; stackable = true; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java index 2af3e07d4..a301e8e72 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java @@ -43,7 +43,6 @@ public class Honeypot extends Item { public static final String AC_SHATTER = "SHATTER"; { - name = "honeypot"; image = ItemSpriteSheet.HONEYPOT; defaultAction = AC_THROW; @@ -156,7 +155,6 @@ public class Honeypot extends Item { public static class ShatteredPot extends Item { { - name = "shattered honeypot"; image = ItemSpriteSheet.SHATTPOT; stackable = false; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index 01ff5b67c..368164589 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -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.MissileWeapon; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; @@ -50,8 +51,6 @@ import java.util.Collections; import java.util.Comparator; 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_X = "%s x%d"; @@ -68,7 +67,7 @@ public class Item implements Bundlable { public String defaultAction; public boolean usesTargeting; - protected String name = "smth"; + protected String name = Messages.get(this, "name"); public int image = 0; public boolean stackable = false; @@ -192,7 +191,7 @@ public class Item implements Bundlable { } else { - GLog.n( TXT_PACK_FULL, name() ); + GLog.n( Messages.get(Item.class, "pack_full", name()) ); return false; } @@ -514,7 +513,7 @@ public class Item implements Bundlable { } @Override public String prompt() { - return "Choose direction of throw"; + return Messages.get(Item.class, "prompt"); } }; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java index 78d70cade..d3594b0bf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java @@ -34,7 +34,6 @@ public class MerchantsBeacon extends Item { { - name = "merchant's beacon"; image = ItemSpriteSheet.BEACON; stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java index 8af4e4a05..b77a44a8c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java @@ -43,7 +43,6 @@ public class Stylus extends Item { private static final String AC_INSCRIBE = "INSCRIBE"; { - name = "arcane stylus"; image = ItemSpriteSheet.STYLUS; stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java index 2c78a28e4..acd3d4592 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/TomeOfMastery.java @@ -48,7 +48,6 @@ public class TomeOfMastery extends Item { { stackable = false; - name = "Tome of Mastery"; image = ItemSpriteSheet.MASTERY; unique = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java index 09e067e38..aa055a3f1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java @@ -36,7 +36,6 @@ public class Torch extends Item { public static final float TIME_TO_LIGHT = 1; { - name = "torch"; image = ItemSpriteSheet.TORCH; stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java index 4a0a6b2e8..bce87c831 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java @@ -48,7 +48,6 @@ public class Weightstone extends Item { private static final String AC_APPLY = "APPLY"; { - name = "weightstone"; image = ItemSpriteSheet.WEIGHT; stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 63211890a..71e506ac9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.*; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; @@ -90,7 +91,7 @@ public class Armor extends EquipableItem { actions.add(isEquipped(hero) ? AC_UNEQUIP : AC_EQUIP); return actions; } - + @Override 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 String name() { - return name( "glyph" ); + return name( Messages.get(this, "glyph") ); } public String name( String armorName ) { - return armorName; + return Messages.get(this, "name", armorName); } @Override @@ -370,7 +371,7 @@ public class Armor extends EquipableItem { if (!owner.isAlive() && owner instanceof Hero) { Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, name() ) ); - GLog.n( "%s killed you...", name() ); + GLog.n( Messages.get(this, "killed", name()) ); Badges.validateDeathFromGlyph(); return true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java index 2b0f7afb6..39ded6861 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ClothArmor extends Armor { { - name = "cloth armor"; image = ItemSpriteSheet.ARMOR_CLOTH; bones = false; //Finding them in bones would be semi-frequent and disappointing. diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/HuntressArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/HuntressArmor.java index 1e32f8c82..6489a00b2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/HuntressArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/HuntressArmor.java @@ -42,7 +42,6 @@ public class HuntressArmor extends ClassArmor { private static final String AC_SPECIAL = "SPECTRAL BLADES"; { - name = "huntress cloak"; image = ItemSpriteSheet.ARMOR_HUNTRESS; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java index e155f515f..51d39d831 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class LeatherArmor extends Armor { { - name = "leather armor"; image = ItemSpriteSheet.ARMOR_LEATHER; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java index 385e9cdba..321434cfb 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MageArmor.java @@ -42,7 +42,6 @@ public class MageArmor extends ClassArmor { private static final String TXT_NOT_MAGE = "Only mages can use this armor!"; { - name = "mage robe"; image = ItemSpriteSheet.ARMOR_MAGE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java index 71d5fa589..9e793ac71 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class MailArmor extends Armor { { - name = "mail armor"; image = ItemSpriteSheet.ARMOR_MAIL; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java index e0b5c7728..54f45d562 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class PlateArmor extends Armor { { - name = "plate armor"; image = ItemSpriteSheet.ARMOR_PLATE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java index cbb3c851b..c0e8ac727 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/RogueArmor.java @@ -46,7 +46,6 @@ public class RogueArmor extends ClassArmor { private static final String AC_SPECIAL = "SMOKE BOMB"; { - name = "rogue garb"; image = ItemSpriteSheet.ARMOR_ROGUE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java index ad0d7789c..b4845980f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ScaleArmor extends Armor { { - name = "scale armor"; image = ItemSpriteSheet.ARMOR_SCALE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java index 7946e8f16..08e9cb28c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/WarriorArmor.java @@ -49,7 +49,6 @@ public class WarriorArmor extends ClassArmor { private static final String TXT_NOT_WARRIOR = "Only warriors can use this armor!"; { - name = "warrior suit of armor"; image = ItemSpriteSheet.ARMOR_WARRIOR; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java index c0785e2de..2923cc971 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Affection.java @@ -33,8 +33,6 @@ import com.watabou.utils.GameMath; import com.watabou.utils.Random; public class Affection extends Glyph { - - private static final String TXT_AFFECTION = "%s of affection"; private static ItemSprite.Glowing PINK = new ItemSprite.Glowing( 0xFF4488 ); @@ -58,11 +56,6 @@ public class Affection extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_AFFECTION, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiEntropy.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiEntropy.java index 4ca4b373b..28d7ca554 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiEntropy.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/AntiEntropy.java @@ -35,8 +35,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; 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 ); @@ -57,11 +55,6 @@ public class AntiEntropy extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_ANTI_ENTROPY, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java index 0a493c473..eec3a83b5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Bounce.java @@ -31,8 +31,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.watabou.utils.Random; public class Bounce extends Glyph { - - private static final String TXT_BOUNCE = "%s of bounce"; @Override public int proc( Armor armor, Char attacker, Char defender, int damage) { @@ -68,10 +66,5 @@ public class Bounce extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_BOUNCE, weaponName ); - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Displacement.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Displacement.java index 949606abe..a9977c97d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Displacement.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Displacement.java @@ -32,8 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Displacement extends Glyph { - - private static final String TXT_DISPLACEMENT = "%s of displacement"; private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x66AAFF ); @@ -59,11 +57,6 @@ public class Displacement extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_DISPLACEMENT, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java index 8889fb6c1..815ae2b32 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Entanglement.java @@ -34,8 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Entanglement extends Glyph { - - private static final String TXT_ENTANGLEMENT = "%s of entanglement"; private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x448822 ); @@ -55,11 +53,6 @@ public class Entanglement extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_ENTANGLEMENT, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java index 535553086..15c36a57e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Metabolism.java @@ -32,8 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.utils.Random; public class Metabolism extends Glyph { - - private static final String TXT_METABOLISM = "%s of metabolism"; private static ItemSprite.Glowing RED = new ItemSprite.Glowing( 0xCC0000 ); @@ -64,11 +62,6 @@ public class Metabolism extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_METABOLISM, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java index ef3ee635f..2a5ddd584 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Multiplicity.java @@ -36,8 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Multiplicity extends Glyph { - - private static final String TXT_MULTIPLICITY = "%s of multiplicity"; private static ItemSprite.Glowing PINK = new ItemSprite.Glowing( 0xCCAA88 ); @@ -71,11 +69,6 @@ public class Multiplicity extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_MULTIPLICITY, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java index aca59abf5..cb314a96e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java @@ -33,8 +33,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Potential extends Glyph { - - private static final String TXT_POTENTIAL = "%s of potential"; private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x66CCEE ); @@ -61,11 +59,6 @@ public class Potential extends Glyph { return damage; } - - @Override - public String name( String weaponName) { - return String.format( TXT_POTENTIAL, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stench.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stench.java index 9b2be94cf..06994c012 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stench.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Stench.java @@ -32,8 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Stench extends Glyph { - - private static final String TXT_STENCH = "%s of stench"; private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x22CC44 ); @@ -51,11 +49,6 @@ public class Stench extends Glyph { return damage; } - @Override - public String name( String weaponName) { - return String.format( TXT_STENCH, weaponName ); - } - @Override public Glowing glowing() { return GREEN; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java index a5f6d6a19..3d2c47bb2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java @@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; 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.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; @@ -37,8 +38,6 @@ import com.watabou.utils.Bundle; import com.watabou.utils.Random; public class Viscosity extends Glyph { - - private static final String TXT_VISCOSITY = "%s of viscosity"; private static ItemSprite.Glowing PURPLE = new ItemSprite.Glowing( 0x8844CC ); @@ -60,7 +59,7 @@ public class Viscosity extends Glyph { } debuff.prolong( damage ); - defender.sprite.showStatus( CharSprite.WARNING, "deferred %d", damage ); + defender.sprite.showStatus( CharSprite.WARNING, Messages.get(this, "deferred", damage) ); return 0; @@ -68,11 +67,6 @@ public class Viscosity extends Glyph { return damage; } } - - @Override - public String name( String weaponName) { - return String.format( TXT_VISCOSITY, weaponName ); - } @Override public Glowing glowing() { @@ -119,7 +113,7 @@ public class Viscosity extends Glyph { @Override public String toString() { - return Utils.format( "Defered damage", damage ); + return Messages.get(this, "name"); } @Override @@ -131,7 +125,7 @@ public class Viscosity extends Glyph { Glyph glyph = new Viscosity(); 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(); } @@ -152,12 +146,7 @@ public class Viscosity extends Glyph { @Override 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" + - "\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."; + return Messages.get(this, "desc", damage); } } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java index 3d10e4e09..0215a4eff 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/AlchemistsToolkit.java @@ -40,7 +40,6 @@ import java.util.Collections; public class AlchemistsToolkit extends Artifact { { - name = "Alchemists Toolkit"; image = ItemSpriteSheet.ARTIFACT_TOOLKIT; levelCap = 10; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java index 4845a9bb9..2b65fba5b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java @@ -31,7 +31,6 @@ import com.watabou.utils.Random; public class CapeOfThorns extends Artifact { { - name = "Cape of Thorns"; image = ItemSpriteSheet.ARTIFACT_CAPE; levelCap = 10; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index 399cd16cf..28f227291 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java @@ -49,7 +49,6 @@ public class ChaliceOfBlood extends Artifact { { - name = "Chalice of Blood"; image = ItemSpriteSheet.ARTIFACT_CHALICE1; levelCap = 10; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 7172c7277..81204d2aa 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -40,7 +40,6 @@ import java.util.ArrayList; public class CloakOfShadows extends Artifact { { - name = "Cloak of Shadows"; image = ItemSpriteSheet.ARTIFACT_CLOAK; exp = 0; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 9640f8a69..663a68888 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -52,7 +52,6 @@ import java.util.HashSet; public class DriedRose extends Artifact { { - name = "Dried Rose"; image = ItemSpriteSheet.ARTIFACT_ROSE1; levelCap = 10; @@ -248,7 +247,6 @@ public class DriedRose extends Artifact { public static class Petal extends Item { { - name = "dried petal"; stackable = true; image = ItemSpriteSheet.PETAL; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java index af833d76c..6a968f405 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/EtherealChains.java @@ -46,7 +46,6 @@ public class EtherealChains extends Artifact { public static final String AC_CAST = "CAST"; { - name = "ethereal chains"; image = ItemSpriteSheet.ARTIFACT_CHAINS; levelCap = 5; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 20c312ac6..b3813f7bc 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -47,7 +47,6 @@ public class HornOfPlenty extends Artifact { { - name = "Horn of Plenty"; image = ItemSpriteSheet.ARTIFACT_HORN1; levelCap = 30; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java index 8065cbf7a..08fae26a9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java @@ -83,7 +83,6 @@ public class LloydsBeacon extends Artifact { private int returnPos; { - name = "lloyd's beacon"; image = ItemSpriteSheet.ARTIFACT_BEACON; levelCap = 3; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java index 064965cde..0183372f6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/MasterThievesArmband.java @@ -27,7 +27,6 @@ import com.watabou.utils.Random; public class MasterThievesArmband extends Artifact { { - name = "Master Thieves' Armband"; image = ItemSpriteSheet.ARTIFACT_ARMBAND; levelCap = 10; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index 97515c819..7cb02f827 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle; import com.shatteredpixel.shatteredpixeldungeon.items.Item; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; @@ -44,7 +45,6 @@ import java.util.Collections; public class SandalsOfNature extends Artifact { { - name = "Sandals of Nature"; image = ItemSpriteSheet.ARTIFACT_SANDALS; levelCap = 3; @@ -54,9 +54,6 @@ public class SandalsOfNature extends Artifact { 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_ROOT = "ROOT"; @@ -166,7 +163,7 @@ public class SandalsOfNature extends Artifact { image = ItemSpriteSheet.ARTIFACT_BOOTS; else if (level() >= 2) image = ItemSpriteSheet.ARTIFACT_GREAVES; - name = NAMES[level()+1]; + name = Messages.get(this, "name_" + level()+1); return super.upgrade(); } @@ -183,7 +180,7 @@ public class SandalsOfNature extends Artifact { @Override public void restoreFromBundle( Bundle bundle ) { super.restoreFromBundle(bundle); - name = NAMES[level()]; + if (level() > 0) name = Messages.get(this, "name_" + level()); if (bundle.contains(SEEDS)) Collections.addAll(seeds , bundle.getStringArray(SEEDS)); } @@ -216,7 +213,7 @@ public class SandalsOfNature extends Artifact { seeds.clear(); upgrade(); 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 { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index 1183cf59b..f570a3a82 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -39,7 +39,6 @@ import java.util.ArrayList; public class TalismanOfForesight extends Artifact { { - name = "Talisman of Foresight"; image = ItemSpriteSheet.ARTIFACT_TALISMAN; exp = 0; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index e8e1132f6..1288282e5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -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."; { - name = "Timekeeper's Hourglass"; image = ItemSpriteSheet.ARTIFACT_HOURGLASS; levelCap = 5; @@ -357,7 +356,6 @@ public class TimekeepersHourglass extends Artifact { public static class sandBag extends Item { { - name = "bag of magic sand"; image = ItemSpriteSheet.SANDBAG; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java index a95a0b467..49ea52aeb 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java @@ -46,7 +46,6 @@ import java.util.Collections; public class UnstableSpellbook extends Artifact { { - name = "Unstable Spellbook"; image = ItemSpriteSheet.ARTIFACT_SPELLBOOK; levelCap = 10; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java index b5bb0580d..df560c155 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java @@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class PotionBandolier extends Bag { { - name = "potion bandolier"; image = ItemSpriteSheet.BANDOLIER; size = 12; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java index 206dabd4f..be438d3da 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java @@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ScrollHolder extends Bag { { - name = "scroll holder"; image = ItemSpriteSheet.HOLDER; size = 12; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java index 755d74309..5f8c61aa1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java @@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class SeedPouch extends Bag { { - name = "seed pouch"; image = ItemSpriteSheet.POUCH; size = 12; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java index ff590dbe0..87eed74f5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java @@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class WandHolster extends Bag { { - name = "wand holster"; image = ItemSpriteSheet.HOLSTER; size = 12; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java index 57b3092e7..b904de370 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ChargrilledMeat extends Food { { - name = "chargrilled meat"; image = ItemSpriteSheet.STEAK; energy = Hunger.STARVING - Hunger.HUNGRY; hornValue = 1; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java index b16a423da..e28e74fb7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java @@ -50,7 +50,6 @@ public class Food extends Item { { stackable = true; - name = "ration of food"; image = ItemSpriteSheet.RATION; bones = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java index 523b35add..5101383f2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java @@ -40,7 +40,6 @@ import com.watabou.utils.Random; public class FrozenCarpaccio extends Food { { - name = "frozen carpaccio"; image = ItemSpriteSheet.CARPACCIO; energy = Hunger.STARVING - Hunger.HUNGRY; hornValue = 1; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java index 2967278d0..a9ca7a211 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java @@ -35,7 +35,6 @@ import com.watabou.utils.Random; public class MysteryMeat extends Food { { - name = "mystery meat"; image = ItemSpriteSheet.MEAT; energy = Hunger.STARVING - Hunger.HUNGRY; message = "That food tasted... strange."; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java index b65b38209..eaec083a3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class OverpricedRation extends Food { { - name = "overpriced food ration"; image = ItemSpriteSheet.OVERPRICED; energy = Hunger.STARVING - Hunger.HUNGRY; message = "That food tasted ok."; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java index 0a98fb82a..689d5983c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java @@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Recharging; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import java.util.Calendar; @@ -64,11 +65,11 @@ public class Pasty extends Food { switch(holiday){ case NONE: - name = "pasty"; + name = Messages.get(this, "pasty"); image = ItemSpriteSheet.PASTY; break; case XMAS: - name = "candy cane"; + name = Messages.get(this, "cane"); image = ItemSpriteSheet.CANDY_CANE; break; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/GoldenKey.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/GoldenKey.java index 0a7ffa451..85e5809f0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/GoldenKey.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/GoldenKey.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class GoldenKey extends Key { { - name = "golden key"; image = ItemSpriteSheet.GOLDEN_KEY; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/IronKey.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/IronKey.java index 9ff664119..e56ad4de0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/IronKey.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/IronKey.java @@ -28,12 +28,9 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; public class IronKey extends Key { - private static final String TXT_FROM_DEPTH = "iron key from depth %d"; - public static int curDepthQuantity = 0; { - name = "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 public String info() { return diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java index 1d6aa053e..f0362db0d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/keys/SkeletonKey.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class SkeletonKey extends Key { { - name = "skeleton key"; image = ItemSpriteSheet.SKELETON_KEY; stackable = false; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java index c7af24583..75f2f03e8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; public class PotionOfExperience extends Potion { { - name = "Potion of Experience"; initials = "Ex"; bones = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java index 860833d1a..ebaf72c7c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java @@ -34,7 +34,6 @@ public class PotionOfFrost extends Potion { private static final int DISTANCE = 2; { - name = "Potion of Frost"; initials = "Fr"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java index 4fb7e69c6..0c4ed9ba8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java @@ -33,7 +33,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfHealing extends Potion { { - name = "Potion of Healing"; initials = "He"; bones = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java index 7126a810f..6cf4de98a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java @@ -34,7 +34,6 @@ public class PotionOfInvisibility extends Potion { private static final float ALPHA = 0.4f; { - name = "Potion of Invisibility"; initials = "In"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java index a25809aa8..2a9b81e3d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java @@ -34,7 +34,6 @@ import com.watabou.noosa.audio.Sample; public class PotionOfLevitation extends Potion { { - name = "Potion of Levitation"; initials = "Le"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java index 6c253309e..40381bc68 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java @@ -34,7 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class PotionOfLiquidFlame extends Potion { { - name = "Potion of Liquid Flame"; initials = "LF"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java index 8948f7e72..06fa840a1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java @@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfMight extends Potion { { - name = "Potion of Might"; initials = "Mi"; bones = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java index 01e41768c..3645f7bb7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java @@ -29,7 +29,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfMindVision extends Potion { { - name = "Potion of Mind Vision"; initials = "MV"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java index a05692fc2..13e0ffdc7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java @@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class PotionOfParalyticGas extends Potion { { - name = "Potion of Paralytic Gas"; initials = "PG"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java index 66911ac87..8a5a74a5c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java @@ -47,7 +47,6 @@ public class PotionOfPurity extends Potion { private static final int DISTANCE = 5; { - name = "Potion of Purification"; initials = "Pu"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java index 15374780f..5365da4ce 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java @@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class PotionOfStrength extends Potion { { - name = "Potion of Strength"; initials = "St"; bones = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java index 84c32ca42..21038854d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java @@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class PotionOfToxicGas extends Potion { { - name = "Potion of Toxic Gas"; initials = "TG"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java index 174a96daf..33902ff45 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java @@ -45,7 +45,6 @@ public class CeremonialCandle extends Item { public static int ritualPos; { - name = "ceremonial candle"; image = ItemSpriteSheet.CANDLE; defaultAction = AC_THROW; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java index d2ed0b534..c21c3c69a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java @@ -40,7 +40,6 @@ import java.util.ArrayList; public class CorpseDust extends Item { { - name = "corpse dust"; image = ItemSpriteSheet.DUST; cursed = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java index e29d1d990..ca6b673a8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class DarkGold extends Item { { - name = "dark gold ore"; image = ItemSpriteSheet.ORE; stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java index 085c48cf9..2be7fa111 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class DwarfToken extends Item { { - name = "dwarf token"; image = ItemSpriteSheet.TOKEN; stackable = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java index 829fc6285..a158dee25 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java @@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Embers extends Item { { - name = "elemental embers"; image = ItemSpriteSheet.EMBER; unique = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java index c5da4a64d..de19ca935 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java @@ -54,7 +54,6 @@ public class Pickaxe extends Weapon { private static final Glowing BLOODY = new Glowing( 0x550000 ); { - name = "pickaxe"; image = ItemSpriteSheet.PICKAXE; unique = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java index c795ad304..24f2f9645 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java @@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class RatSkull extends Item { { - name = "giant rat skull"; image = ItemSpriteSheet.SKULL; unique = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java index 461f0fc08..a1bbedfbb 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfAccuracy.java @@ -21,10 +21,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfAccuracy extends Ring { - - { - name = "Ring of Accuracy"; - } @Override protected RingBuff buff( ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java index d873ac941..38c16150b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfElements.java @@ -32,10 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap; import com.watabou.utils.Random; public class RingOfElements extends Ring { - - { - name = "Ring of Elements"; - } @Override protected RingBuff buff( ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java index d8dff2331..ec8c06f76 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfEvasion.java @@ -25,10 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; public class RingOfEvasion extends Ring { - - { - name = "Ring of Evasion"; - } @Override protected RingBuff buff( ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java index 13088b4ed..ce80b00f2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java @@ -24,10 +24,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; public class RingOfForce extends Ring { - { - name = "Ring of Force"; - } - @Override protected RingBuff buff( ) { return new Force(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfFuror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfFuror.java index 53bd8e369..3c172e22f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfFuror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfFuror.java @@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfFuror extends Ring { - { - name = "Ring of Furor"; - } - @Override protected RingBuff buff( ) { return new Furor(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java index dfd695381..2e4934849 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaste.java @@ -21,10 +21,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfHaste extends Ring { - - { - name = "Ring of Haste"; - } @Override protected RingBuff buff( ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java index dc5440a9a..d73a547d2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMagic.java @@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfMagic extends Ring { - { - name = "Ring of Magic"; - } - @Override protected RingBuff buff( ) { return new Magic(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMight.java index becda8bfb..493da2084 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMight.java @@ -23,10 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfMight extends Ring { - { - name = "Ring of Might"; - } - @Override protected RingBuff buff( ) { return new Might(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSharpshooting.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSharpshooting.java index 377eb08cc..b117fddf8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSharpshooting.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSharpshooting.java @@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfSharpshooting extends Ring { - { - name = "Ring of Sharpshooting"; - } - @Override protected RingBuff buff( ) { return new Aim(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfTenacity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfTenacity.java index ec3ff73c1..15efd7450 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfTenacity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfTenacity.java @@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfTenacity extends Ring { - { - name = "Ring of Tenacity"; - } - @Override protected RingBuff buff( ) { return new Tenacity(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java index 9b6466f56..a93f0f012 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java @@ -22,10 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; public class RingOfWealth extends Ring { - { - name = "Ring of Wealth"; - } - @Override protected RingBuff buff( ) { return new Wealth(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java index 5418e96e3..32df8ee4d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java @@ -29,7 +29,6 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; public class ScrollOfIdentify extends InventoryScroll { { - name = "Scroll of Identify"; initials = "Id"; inventoryTitle = "Select an item to identify"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java index 98daeeac9..d157d1209 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java @@ -34,7 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfLullaby extends Scroll { { - name = "Scroll of Lullaby"; initials = "Lu"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java index ba35aa3aa..fde9d496f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java @@ -37,7 +37,6 @@ public class ScrollOfMagicMapping extends Scroll { private static final String TXT_LAYOUT = "You are now aware of the level layout."; { - name = "Scroll of Magic Mapping"; initials = "MM"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java index 4ca367801..4163eeffe 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java @@ -35,7 +35,6 @@ public class ScrollOfMagicalInfusion extends InventoryScroll { private static final String TXT_INFUSE = "your %s is infused with arcane energy!"; { - name = "Scroll of Magical Infusion"; initials = "MaI"; inventoryTitle = "Select an item to infuse"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java index 9856db05f..a2a0e8e97 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java @@ -36,7 +36,6 @@ public class ScrollOfMirrorImage extends Scroll { private static final int NIMAGES = 3; { - name = "Scroll of Mirror Image"; initials = "MI"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java index 010464100..bb9c72d4f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java @@ -38,7 +38,6 @@ import com.watabou.utils.Random; public class ScrollOfPsionicBlast extends Scroll { { - name = "Scroll of Psionic Blast"; initials = "PB"; bones = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java index ae7be8b86..b4be111f9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java @@ -36,7 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfRage extends Scroll { { - name = "Scroll of Rage"; initials = "Ra"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java index 973736740..5edf524ac 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java @@ -35,7 +35,6 @@ public class ScrollOfRecharging extends Scroll { public static final float BUFF_DURATION = 30f; { - name = "Scroll of Recharging"; initials = "Re"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java index b12afc96e..26ba3736f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java @@ -39,7 +39,6 @@ public class ScrollOfRemoveCurse extends Scroll { "Your pack glows with a cleansing light, but nothing happens."; { - name = "Scroll of Remove Curse"; initials = "RC"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index 38fe9ddeb..a0aea7d75 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -39,7 +39,6 @@ public class ScrollOfTeleportation extends Scroll { "Strong magic aura of this place prevents you from teleporting!"; { - name = "Scroll of Teleportation"; initials = "TP"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java index c944e0fd0..52567c5b8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java @@ -34,7 +34,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; public class ScrollOfTerror extends Scroll { { - name = "Scroll of Terror"; initials = "Te"; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java index 5064f95aa..dc37d3f64 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java @@ -33,7 +33,6 @@ public class ScrollOfUpgrade extends InventoryScroll { public static final String TXT_LOOKS_BETTER = "your %s certainly looks better now"; { - name = "Scroll of Upgrade"; initials = "Up"; inventoryTitle = "Select an item to upgrade"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java index 1a118f2b8..a66406019 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java @@ -52,7 +52,6 @@ import com.watabou.utils.Random; public class WandOfBlastWave extends Wand { { - name = "Wand of Blast Wave"; image = ItemSpriteSheet.WAND_BLAST_WAVE; collisionProperties = Ballistica.PROJECTILE; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index 15198b648..2f383c83f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -44,7 +44,6 @@ import java.util.HashSet; public class WandOfCorruption extends Wand { { - name = "Wand of Corruption"; image = ItemSpriteSheet.WAND_CORRUPTION; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java index a0f2ff364..e79a001c8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java @@ -42,7 +42,6 @@ import com.watabou.utils.Random; public class WandOfDisintegration extends Wand { { - name = "Wand of Disintegration"; image = ItemSpriteSheet.WAND_DISINTEGRATION; collisionProperties = Ballistica.WONT_STOP; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java index a432b1c75..6a4fbecdd 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java @@ -44,7 +44,6 @@ import java.util.HashSet; public class WandOfFireblast extends Wand { { - name = "Wand of Fireblast"; image = ItemSpriteSheet.WAND_FIREBOLT; collisionProperties = Ballistica.STOP_TERRAIN; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java index 986b123fa..44762d3f9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java @@ -42,7 +42,6 @@ import com.watabou.utils.Random; public class WandOfFrost extends Wand { { - name = "Wand of Frost"; image = ItemSpriteSheet.WAND_FROST; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java index 3c7fd7185..33211984c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java @@ -45,7 +45,6 @@ import com.watabou.utils.Random; public class WandOfLightning extends Wand { { - name = "Wand of Lightning"; image = ItemSpriteSheet.WAND_LIGHTNING; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java index 06fd04918..0737cfe2c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java @@ -33,7 +33,6 @@ import com.watabou.utils.Random; public class WandOfMagicMissile extends Wand { { - name = "Wand of Magic Missile"; image = ItemSpriteSheet.WAND_MAGIC_MISSILE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java index fd0bbf3ad..160a0229b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java @@ -53,7 +53,6 @@ import java.util.HashSet; public class WandOfPrismaticLight extends Wand { { - name = "Wand of Prismatic Light"; image = ItemSpriteSheet.WAND_PRISMATIC_LIGHT; collisionProperties = Ballistica.MAGIC_BOLT; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index 02975e11a..68a5977cf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -52,7 +52,6 @@ import java.util.Iterator; public class WandOfRegrowth extends Wand { { - name = "Wand of Regrowth"; image = ItemSpriteSheet.WAND_REGROWTH; collisionProperties = Ballistica.STOP_TERRAIN; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java index 453fd2c81..c8c3734eb 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java @@ -61,7 +61,6 @@ import java.util.HashSet; public class WandOfTransfusion extends Wand { { - name = "Wand of Transfusion"; image = ItemSpriteSheet.WAND_TRANSFUSION; collisionProperties = Ballistica.PROJECTILE; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java index c595a95d3..6ef9c68e4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java @@ -37,7 +37,6 @@ import com.watabou.utils.Callback; public class WandOfVenom extends Wand { { - name = "Wand of Venom"; image = ItemSpriteSheet.WAND_VENOM; collisionProperties = Ballistica.STOP_TARGET | Ballistica.STOP_TERRAIN; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index b4fc84ccc..cf684483b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -32,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfSharpshooting; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.*; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; @@ -244,7 +245,7 @@ abstract public class Weapon extends KindOfWeapon { public abstract boolean proc( Weapon weapon, Char attacker, Char defender, int damage ); public String name( String weaponName ) { - return weaponName; + return Messages.get(this, "name", weaponName); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java index e1bc79ae9..63c52faff 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java @@ -30,8 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Death extends Weapon.Enchantment { - - private static final String TXT_GRIM = "grim %s"; private static ItemSprite.Glowing BLACK = new ItemSprite.Glowing( 0x000000 ); @@ -64,10 +62,5 @@ public class Death extends Weapon.Enchantment { public Glowing glowing() { return BLACK; } - - @Override - public String name( String weaponName) { - return String.format( TXT_GRIM, weaponName ); - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java index 88a6aab12..9ee25ea41 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java @@ -31,8 +31,6 @@ import com.watabou.utils.Random; public class Fire extends Weapon.Enchantment { - private static final String TXT_BLAZING = "blazing %s"; - private static ItemSprite.Glowing ORANGE = new ItemSprite.Glowing( 0xFF4400 ); @Override @@ -64,10 +62,4 @@ public class Fire extends Weapon.Enchantment { public Glowing glowing() { return ORANGE; } - - @Override - public String name( String weaponName ) { - return String.format( TXT_BLAZING, weaponName ); - } - } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java index e106e7e89..7de4e0001 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java @@ -32,8 +32,6 @@ import com.watabou.utils.Random; public class Horror extends Weapon.Enchantment { - private static final String TXT_ELDRITCH = "eldritch %s"; - private static ItemSprite.Glowing GREY = new ItemSprite.Glowing( 0x222222 ); @Override @@ -61,10 +59,4 @@ public class Horror extends Weapon.Enchantment { public Glowing glowing() { return GREY; } - - @Override - public String name( String weaponName) { - return String.format( TXT_ELDRITCH, weaponName ); - } - } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java index 6e491c46b..a016099bf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java @@ -26,17 +26,9 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang; public class Instability extends Weapon.Enchantment { - - private static final String TXT_UNSTABLE = "unstable %s"; @Override public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) { return random().proc( weapon, attacker, defender, damage ); } - - @Override - public String name( String weaponName) { - return String.format( TXT_UNSTABLE, weaponName ); - } - } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java index 1368cd10d..a76f81d7b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java @@ -30,8 +30,6 @@ import com.watabou.utils.Random; public class Leech extends Weapon.Enchantment { - private static final String TXT_VAMPIRIC = "vampiric %s"; - private static ItemSprite.Glowing RED = new ItemSprite.Glowing( 0x660022 ); @Override @@ -62,10 +60,4 @@ public class Leech extends Weapon.Enchantment { public Glowing glowing() { return RED; } - - @Override - public String name( String weaponName ) { - return String.format( TXT_VAMPIRIC, weaponName ); - } - } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java index 5a61bf9bc..681202ddc 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java @@ -27,8 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; public class Luck extends Weapon.Enchantment { - private static final String TXT_LUCKY = "lucky %s"; - private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x00FF00 ); @Override @@ -47,11 +45,6 @@ public class Luck extends Weapon.Enchantment { return false; } } - - @Override - public String name( String weaponName) { - return String.format( TXT_LUCKY, weaponName ); - } @Override public Glowing glowing() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java index e3f22316d..fa7ef531d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java @@ -28,8 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; public class Paralysis extends Weapon.Enchantment { - - private static final String TXT_STUNNING = "stunning %s"; private static ItemSprite.Glowing YELLOW = new ItemSprite.Glowing( 0xCCAA44 ); @@ -55,10 +53,4 @@ public class Paralysis extends Weapon.Enchantment { public Glowing glowing() { return YELLOW; } - - @Override - public String name( String weaponName) { - return String.format( TXT_STUNNING, weaponName ); - } - } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java index 396c453c9..f956d007b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java @@ -29,8 +29,6 @@ import com.watabou.utils.Random; public class Poison extends Weapon.Enchantment { - private static final String TXT_VENOMOUS = "venomous %s"; - private static ItemSprite.Glowing PURPLE = new ItemSprite.Glowing( 0x4400AA ); @Override @@ -55,10 +53,4 @@ public class Poison extends Weapon.Enchantment { public Glowing glowing() { return PURPLE; } - - @Override - public String name( String weaponName) { - return String.format( TXT_VENOMOUS, weaponName ); - } - } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java index cb807a837..ae8e9c488 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java @@ -34,8 +34,6 @@ import com.watabou.utils.Random; public class Shock extends Weapon.Enchantment { - private static final String TXT_SHOCKING = "shocking %s"; - @Override public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) { // lvl 0 - 25% @@ -62,11 +60,6 @@ public class Shock extends Weapon.Enchantment { } } - - @Override - public String name( String weaponName ) { - return String.format( TXT_SHOCKING, weaponName ); - } private ArrayList affected = new ArrayList<>(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java index 09faf31fc..96dc73e09 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java @@ -30,8 +30,6 @@ import com.watabou.utils.Random; public class Slow extends Weapon.Enchantment { - private static final String TXT_CHILLING = "chilling %s"; - private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x0044FF ); @Override @@ -56,10 +54,5 @@ public class Slow extends Weapon.Enchantment { public Glowing glowing() { return BLUE; } - - @Override - public String name( String weaponName) { - return String.format( TXT_CHILLING, weaponName ); - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java index 08e56ecce..f9f87ce2a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class BattleAxe extends MeleeWeapon { { - name = "battle axe"; image = ItemSpriteSheet.BATTLE_AXE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java index 22cb29c20..2527a478e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Dagger extends MeleeWeapon { { - name = "dagger"; image = ItemSpriteSheet.DAGGER; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java index 7a82bf77e..a33ef02cd 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Glaive extends MeleeWeapon { { - name = "glaive"; image = ItemSpriteSheet.GLAIVE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java index e712b2a11..2a32aa823 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Knuckles.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Knuckles extends MeleeWeapon { { - name = "knuckleduster"; image = ItemSpriteSheet.KNUCKLEDUSTER; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java index 6feefcf5a..546ae227f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Longsword.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Longsword extends MeleeWeapon { { - name = "longsword"; image = ItemSpriteSheet.LONG_SWORD; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java index 765cd43fe..30f1750d6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Mace extends MeleeWeapon { { - name = "mace"; image = ItemSpriteSheet.MACE; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index 2ee830bad..71e17cecf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -259,7 +259,7 @@ public class MagesStaff extends MeleeWeapon { wand = (Wand) bundle.get(WAND); if (wand != null) { wand.maxCharges = Math.min(wand.maxCharges + 1, 10); - name = wand.name().replace("Wand", "Staff"); + name = wand.name().replace("wand", "staff"); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java index 69cc24407..f7c82c701 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Quarterstaff extends MeleeWeapon { { - name = "quarterstaff"; image = ItemSpriteSheet.QUARTERSTAFF; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/ShortSword.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/ShortSword.java index b2d2a71ef..e38df3db8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/ShortSword.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/ShortSword.java @@ -50,7 +50,6 @@ public class ShortSword extends MeleeWeapon { private boolean equipped; { - name = "short sword"; image = ItemSpriteSheet.SHORT_SWORD; unique = true; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java index 6656deb0b..60421217e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Spear extends MeleeWeapon { { - name = "spear"; image = ItemSpriteSheet.SPEAR; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java index c2c6d66ba..83e9d26ba 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sword.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Sword extends MeleeWeapon { { - name = "sword"; image = ItemSpriteSheet.SWORD; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java index 222009e15..6b92ebbd1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java @@ -25,7 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class WarHammer extends MeleeWeapon { { - name = "war hammer"; image = ItemSpriteSheet.WAR_HAMMER; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java index ad2a6c590..d97efd5b4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java @@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite; public class Boomerang extends MissileWeapon { { - name = "boomerang"; image = ItemSpriteSheet.BOOMERANG; STR = 10; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/CurareDart.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/CurareDart.java index 06a01b639..36edaf1cc 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/CurareDart.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/CurareDart.java @@ -32,7 +32,6 @@ public class CurareDart extends MissileWeapon { public static final float DURATION = 3f; { - name = "curare dart"; image = ItemSpriteSheet.CURARE_DART; STR = 14; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java index 71be2549c..cb5765adb 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java @@ -27,7 +27,6 @@ import com.watabou.utils.Random; public class Dart extends MissileWeapon { { - name = "dart"; image = ItemSpriteSheet.DART; bones = false; //Finding them in bones would be semi-frequent and disappointing. diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/IncendiaryDart.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/IncendiaryDart.java index ecf1b14be..1dc04ef98 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/IncendiaryDart.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/IncendiaryDart.java @@ -37,7 +37,6 @@ import com.watabou.utils.Random; public class IncendiaryDart extends MissileWeapon { { - name = "incendiary dart"; image = ItemSpriteSheet.INCENDIARY_DART; STR = 12; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java index 14d40583b..14c682fd6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java @@ -30,7 +30,6 @@ import com.watabou.utils.Random; public class Javelin extends MissileWeapon { { - name = "javelin"; image = ItemSpriteSheet.JAVELIN; STR = 15; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java index 0fec1bf2f..551aa1d0b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java @@ -27,7 +27,6 @@ import com.watabou.utils.Random; public class Shuriken extends MissileWeapon { { - name = "shuriken"; image = ItemSpriteSheet.SHURIKEN; STR = 13; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tamahawk.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tamahawk.java index 66a9dcb31..df0a9633b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tamahawk.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tamahawk.java @@ -30,7 +30,6 @@ import com.watabou.utils.Random; public class Tamahawk extends MissileWeapon { { - name = "tomahawk"; image = ItemSpriteSheet.TOMAHAWK; STR = 17; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties index 246b18666..70c78af66 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties @@ -56,7 +56,7 @@ actors.buffs.frost.name=Frozen actors.buffs.frost.desc=Not to be confused with freezing solid, this more benign freezing simply encases the target in ice.\n\nFreezing acts similarly to paralysis, making it impossible for the target to act. Unlike paralysis, freezing is immediately cancelled if the target takes damage, as the ice will shatter.\n\nThe freeze will last for %s, or until the target takes damage. actors.buffs.fury.name=Furious actors.buffs.fury.heromsg=You become furious! -actors.buffs.fury.desc=You are angry, enemies won't like you when you're angry.\n\nA great rage burns within you, increasing the damage you deal with physical attacks by 50%.\n\nThis rage will last as long as you are injured below 50%% health. +actors.buffs.fury.desc=You are angry, enemies won't like you when you're angry.\n\nA great rage burns within you, increasing the damage you deal with physical attacks by 50%%.\n\nThis rage will last as long as you are injured below 50%% health. actors.buffs.gasesimmunity.name=Immune to gases actors.buffs.gasesimmunity.desc=Some strange force is filtering out the air around you, it's not causing you any harm, but it blocks out everything but air so effectively you can't even smell anything!\n\n"You are immune to the effects of all gasses while this buff lasts.\n\nYou will be immune for %s. actors.buffs.hunger.hungry=Hungry @@ -396,13 +396,179 @@ actors.char.def_verb=dodged ###items +items.armor.glyphs.affection.name=%s of affection +items.armor.glyphs.antientropy.name=%s of anti-entropy +items.armor.glyphs.bounce.name=%s of bounce +items.armor.glyphs.displacement.name=%s of displacement +items.armor.glyphs.entanglement.name=%s of entanglement +items.armor.glyphs.metabolism.name=%s of metabolism +items.armor.glyphs.multiplicity.name=%s of multiplicity +items.armor.glyphs.potential.name=%s of potential +items.armor.glyphs.stench.name=%s of stench +items.armor.glyphs.viscosity.name=%s of viscosity +items.armor.glyphs.viscosity.deferred=deferred %d +items.armor.glyphs.viscosity$defereddamage.name=Deferred damage +items.armor.glyphs.viscosity$defereddamage.desc=While your armor's glyph has protected you from damage, it seems to be slowly paying you back for it.\n\nDamage is being dealt to you over time instead of immediately. You will take one damage per turn until there is no damage left.\n\nThere is %d deferred damage left. + +items.armor.clotharmor.name=cloth armor +items.armor.huntressarmor.name=huntress cloak +items.armor.leatherarmor.name=leather armor +items.armor.magearmor.name=mage robe +items.armor.mailarmor.name=mail armor +items.armor.platearmor.name=plate armor +items.armor.roguearmor.name=rogue garb +items.armor.scalearmor.name=scale armor +items.armor.warriorarmor.name=warrior suit of armor +items.armor.armor$glyph.glyph=glyph +items.armor.armor$glyph.killed=%s killed you... + +items.artifacts.alchemiststoolkit.name=alchemists toolkit +items.artifacts.capeofthorns.name=cape of Thorns +items.artifacts.chaliceofblood.name=chalice of blood +items.artifacts.cloakofshadows.name=cloak of shadows +items.artifacts.driedrose.name=dried rose +items.artifacts.driedrose$petal.name=dried petal +items.artifacts.etherealchains.name=ethereal chains +items.artifacts.hornofplenty.name=horn of Plenty +items.artifacts.lloydsbeacon.name=lloyd's beacon +items.artifacts.masterthievesarmband.name=master thieves' armband +items.artifacts.sandalsofnature.name=sandals of nature +items.artifacts.sandalsofnature.name_1=shoes of nature +items.artifacts.sandalsofnature.name_2=boots of nature +items.artifacts.sandalsofnature.name_3=greaves of nature +items.artifacts.talismanofforesight.name=talisman of foresight +items.artifacts.timekeepershourglass.name=timekeeper's hourglass +items.artifacts.timekeepershourglass$sandbag.name=bag of magic sand +items.artifacts.unstablespellbook.name=unstable spellbook + items.bags.bag.name=backpack +items.bags.potionbandolier.name=potion bandolier +items.bags.scrollholder.name=scroll holder +items.bags.seedpouch.name=seed pouch +items.bags.wandholster.name=wand holster + +#items.food.blandfruit.name= +items.food.chargrilledmeat.name=chargrilled meat +items.food.food.name=ration of food +items.food.frozencarpaccio.name=frozen carpaccio +items.food.mysterymeat.name=mystery meat +items.food.overpricedration.name=overpriced food ration +items.food.pasty.pasty=pasty +items.food.pasty.cane=candy cane + +items.keys.GoldenKey.name=golden key +items.keys.IronKey.name=iron key +items.keys.SkeletonKey.name=skeleton key + +items.potions.potionofexperience.name=potion of experience +items.potions.potionoffrost.name=potion of frost +items.potions.potionofhealing.name=potion of healing +items.potions.potionofinvisibility.name=potion of invisibility +items.potions.potionoflevitation.name=potion of levitation +items.potions.potionofliquidflame.name=potion of liquid flame +items.potions.potionofmight.name=potion of might +items.potions.potionofmindvision.name=potion of mind vision +items.potions.potionofparalyticgas.name=potion of paralytic gas +items.potions.potionofpurity.name=potion of purification +items.potions.potionofstrength.name=potion of strength +items.potions.potionoftoxicgas.name=potion of toxic gas + +items.quest.ceremonialcandle.name=ceremonial candle +items.quest.corpsedust.name=corpse dust +items.quest.darkgold.name=dark gold ore +items.quest.dwarftoken.name=dwarf token +items.quest.embers.name=elemental embers +items.quest.pickaxe.name=pickaxe +items.quest.ratskull.name=giant rat skull + +items.rings.ringofaccuracy.name=ring of accuracy +items.rings.ringofelements.name=ring of elements +items.rings.ringofevasion.name=ring of evasion +items.rings.ringofforce.name=ring of force +items.rings.ringoffuror.name=ring of furor +items.rings.ringofhaste.name=ring of haste +items.rings.ringofmagic.name=ring of magic +items.rings.ringofmight.name=ring of might +items.rings.ringofsharpshooting.name=ring of sharpshooting +items.rings.ringoftenacity.name=ring of tenacity +items.rings.ringofwealth.name=ring of wealth + +items.scrolls.scrollofidentify.name=scroll of identify +items.scrolls.scrolloflullaby.name=scroll of lullaby +items.scrolls.scrollofmagicalinfusion.name=scroll of magical infusion +items.scrolls.scrollofmagicmapping.name=scroll of magic mapping +items.scrolls.scrollofmirrorimage.name=scroll of mirror image +items.scrolls.scrollofpsionicblast.name=scroll of psionic blast +items.scrolls.scrollofrage.name=scroll of rage +items.scrolls.scrollofrecharging.name=scroll of recharging +items.scrolls.scrollofremovecurse.name=scroll of remove curse +items.scrolls.scrollofteleportation.name=scroll of teleportation +items.scrolls.scrollofterror.name=scroll of terror +items.scrolls.scrollofupgrade.name=scroll of upgrade + +items.wands.wandofblastwave.name=wand of blast wave +items.wands.wandofcorruption.name=wand of corruption +items.wands.wandofdisintegration.name=wand of disintegration +items.wands.wandoffireblast.name=wand of fireblast +items.wands.wandoffrost.name=wand of frost +items.wands.wandoflightning.name=wand of lightning +items.wands.wandofmagicmissile.name=wand of magic missile +items.wands.wandofprismaticlight.name=wand of prismatic light +items.wands.wandofregrowth.name=wand of regrowth items.wands.wandofregrowth$dewcatcher.name=Dewcatcher items.wands.wandofregrowth$dewcatcher.desc=Dewcatchers camouflage as grass to avoid attention, but their bulges of collected dew give them away. items.wands.wandofregrowth$seedpod.name=Seed Pod items.wands.wandofregrowth$seedpod.desc=Seed Pods look pretty, but the seeds they carry are actually stolen from other plants they kill with their roots. +items.wands.wandoftransfusion.name=wand of transfusion +items.wands.wandofvenom.name=wand of venom +items.weapon.enchantment.death.name=grim %s +items.weapon.enchantment.fire.name=blazing %s +items.weapon.enchantment.horror.name=eldritch %s +items.weapon.enchantment.instability.name=unstable %s +items.weapon.enchantment.leech.name=vampiric %s +items.weapon.enchantment.luck.name=lucky %s +items.weapon.enchantment.paralysis.name=stunning %s +items.weapon.enchantment.poison.name=venomous %s +items.weapon.enchantment.shock.name=shocking %s +items.weapon.enchantment.slow.name=chilling %s +items.weapon.melee.battleaxe.name=battle axe +items.weapon.melee.dagger.name=dagger +items.weapon.melee.glaive.name=glaive +items.weapon.melee.knuckles.name=knuckleduster +items.weapon.melee.longsword.name=longsword +items.weapon.melee.mace.name=mace +#items.weapon.melee.magesstaff.name= +items.weapon.melee.quarterstaff.name=quarterstaff +items.weapon.melee.shortsword.name=short sword +items.weapon.melee.spear.name=spear +items.weapon.melee.sword.name=sword +items.weapon.melee.warhammer.name=war hammer +items.weapon.missiles.boomerang.name=boomerang +items.weapon.missiles.curaredart.name=curare dart +items.weapon.missiles.dart.name=dart +items.weapon.weapon.missiles.incendiarydart.name=incendiary dart +items.weapon.missiles.javelin.name=javelin +items.weapon.missiles.shuriken.name=shuriken +items.weapon.missiles.tamahawk.name=tomahawk +items.amulet.name=amulet of yendor +items.ankh.name=ankh +items.armorkit.name=armor kit +items.bomb.name=bomb +items.bom$doublebomb.name=two bombs +items.dewdrop.name=dewdrop +items.dewvial.name=dew vial +items.gold.name=gold +items.honeypot.name=honeypot +items.honeypot$shatteredpot.name=shattered honeypot +items.item.pack_full=Your pack is too full for the %s +items.item.prompt=Choose direction of throw +items.merchantsbeacon.name=merchant's beacon +items.stylus.name=arcane stylus +items.tomeofmastery.name=Tome of Mastery +items.torch.name=torch +items.weightstone.name=weightstone ###levels levels.features.alchemypot.select_seed=Select a seed to throw