From 1885fdc17a50dd94050b966bbc03474404bd34a6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 1 Jan 2016 22:50:48 -0500 Subject: [PATCH] v0.3.4: externalized quest item strings --- .../items/quest/CeremonialCandle.java | 8 -------- .../items/quest/CorpseDust.java | 8 -------- .../shatteredpixeldungeon/items/quest/DarkGold.java | 7 ------- .../items/quest/DwarfToken.java | 7 ------- .../shatteredpixeldungeon/items/quest/Embers.java | 6 ------ .../shatteredpixeldungeon/items/quest/Pickaxe.java | 13 +++---------- .../shatteredpixeldungeon/items/quest/RatSkull.java | 6 ------ .../messages/messages.properties | 8 ++++++++ 8 files changed, 11 insertions(+), 52 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java index 33902ff45..e951929de 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CeremonialCandle.java @@ -125,12 +125,4 @@ public class CeremonialCandle extends Item { } } - - @Override - public String info() { - return - "A set of candles, melted down and fused together through use.\n\n" + - "Alone they are worthless, but used with other candles in a pattern, " + - "they can focus the energy for a summoning ritual."; - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java index c21c3c69a..068c06072 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java @@ -81,14 +81,6 @@ public class CorpseDust extends Item { } } - @Override - public String info() { - return - "The ball of corpse dust doesn't differ outwardly from a regular dust ball. But you " + - "can feel a malevolent energy lurking within it.\n\n" + - "Getting rid of it as soon as possible would be a good idea."; - } - public static class DustGhostSpawner extends Buff { int spawnPower = 0; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java index ca6b673a8..a9f151c56 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java @@ -42,13 +42,6 @@ public class DarkGold extends Item { return true; } - @Override - public String info() { - return - "This metal is called dark not because of its color (it doesn't differ from the normal gold), " + - "but because it melts under the daylight, making it useless on the surface."; - } - @Override public int price() { return quantity; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java index 2be7fa111..3ce95e4b8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java @@ -42,13 +42,6 @@ public class DwarfToken extends Item { return true; } - @Override - public String info() { - return - "Many dwarves and some of their larger creations carry these small pieces of metal of unknown purpose. " + - "Maybe they are jewelry or maybe some kind of ID. Dwarves are strange folk."; - } - @Override public int price() { return quantity * 100; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java index a158dee25..8229b94a8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Embers.java @@ -42,12 +42,6 @@ public class Embers extends Item { return true; } - @Override - public String info() { - return - "Special embers which can only be harvested from young fire elementals. They radiate thermal energy."; - } - @Override public ItemSprite.Glowing glowing() { return new ItemSprite.Glowing(0x660000, 3f); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java index de19ca935..e196dc19f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/Pickaxe.java @@ -49,8 +49,6 @@ public class Pickaxe extends Weapon { public static final float TIME_TO_MINE = 2; - private static final String TXT_NO_VEIN = "There is no dark gold vein near you to mine"; - private static final Glowing BLOODY = new Glowing( 0x550000 ); { @@ -88,7 +86,7 @@ public class Pickaxe extends Weapon { if (action == AC_MINE) { if (Dungeon.depth < 11 || Dungeon.depth > 15) { - GLog.w( TXT_NO_VEIN ); + GLog.w( Messages.get(this, "no_vein") ); return; } @@ -132,7 +130,7 @@ public class Pickaxe extends Weapon { } } - GLog.w( TXT_NO_VEIN ); + GLog.w( Messages.get(this, "no_vein") ); } else { @@ -179,10 +177,5 @@ public class Pickaxe extends Weapon { public Glowing glowing() { return bloodStained ? BLOODY : null; } - - @Override - public String info() { - return - "This is a large and sturdy tool for breaking rocks. Probably it can be used as a weapon."; - } + } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java index 24f2f9645..e32e83e4c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java @@ -43,12 +43,6 @@ public class RatSkull extends Item { return true; } - @Override - public String info() { - return - "A surprisingly large rat skull. It would make a great hunting trophy, if you had a wall to mount it on."; - } - @Override public int price() { return 100; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties index 77e01e6e7..d331e49bc 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/messages.properties @@ -517,12 +517,20 @@ items.potions.potionofstrength.name=potion of strength items.potions.potionoftoxicgas.name=potion of toxic gas items.quest.ceremonialcandle.name=ceremonial candle +items.quest.ceremonialcandle.desc=A set of candles, melted down and fused together through use.\n\nAlone they are worthless, but used with other candles in a pattern, they can focus the energy for a summoning ritual. items.quest.corpsedust.name=corpse dust +items.quest.corpsedust.desc=The ball of corpse dust doesn't differ outwardly from a regular dust ball. But you can feel a malevolent energy lurking within it.\n\nGetting rid of it as soon as possible would be a good idea. items.quest.darkgold.name=dark gold ore +items.quest.darkgold.desc=This metal is called dark not because of its color (it doesn't differ from the normal gold), but because it melts under the daylight, making it useless on the surface. items.quest.dwarftoken.name=dwarf token +items.quest.dwarftoken.desc=Many dwarves and some of their larger creations carry these small pieces of metal of unknown purpose. Maybe they are jewelry or maybe some kind of ID. Dwarves are strange folk. items.quest.embers.name=elemental embers +items.quest.embers.desc=Special embers which can only be harvested from young fire elementals. They radiate thermal energy. items.quest.pickaxe.name=pickaxe +items.quest.pickaxe.no_vein=There is no dark gold vein near you to mine +items.quest.pickaxe.desc=This is a large and sturdy tool for breaking rocks. Probably it can be used as a weapon. items.quest.ratskull.name=giant rat skull +items.quest.ratskull.desc=A surprisingly large rat skull. It would make a great hunting trophy, if you had a wall to mount it on. items.rings.ringofaccuracy.name=ring of accuracy items.rings.ringofelements.name=ring of elements