From 3f7dd3411189e7c7654f83702551e3da24ce9067 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 14 Jan 2021 19:54:22 -0500 Subject: [PATCH] v0.9.2: improved / condensed the descriptions of some equipment --- .../main/assets/messages/items/items.properties | 15 ++++++++------- .../shatteredpixeldungeon/items/armor/Armor.java | 4 ++-- .../items/wands/WandOfCorrosion.java | 9 +++++++++ .../items/weapon/melee/MagesStaff.java | 4 +++- .../items/weapon/melee/MeleeWeapon.java | 4 ++-- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index ce398db99..8bd541eb9 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1157,7 +1157,7 @@ items.wands.wandofblastwave.stats_desc=This wand shoots a bolt which violently d items.wands.wandofcorrosion.name=wand of corrosion items.wands.wandofcorrosion.staff_name=staff of corrosion items.wands.wandofcorrosion.desc=This wand has an ashen body which opens to a brilliant orange gem. -items.wands.wandofcorrosion.stats_desc=This wand shoots a bolt which explodes into a cloud of highly corrosive gas at a targeted location. Anything caught inside this cloud will take continual damage, increasing with time. +items.wands.wandofcorrosion.stats_desc=This wand shoots a bolt which explodes into a cloud of highly corrosive gas at a targeted location. Anything caught inside this cloud will take increasing damage over time, starting at _%d damage._ items.wands.wandofcorruption.name=wand of corruption items.wands.wandofcorruption.staff_name=staff of corruption @@ -1173,18 +1173,18 @@ items.wands.wandofdisintegration.stats_desc=This wand shoots a beam that pierces items.wands.wandoffireblast.name=wand of fireblast items.wands.wandoffireblast.staff_name=staff of fireblast items.wands.wandoffireblast.desc=This wand is made from red-lacquered wood with golden leaf used liberally to make it look quite regal. It crackles and hisses at the tip, eager to unleash its powerful magic. -items.wands.wandoffireblast.stats_desc=This wand produces a blast of fire when used, extending out into a cone shape. As this wand is upgraded it will consume more charges, the effect becomes significantly more powerful the more charges are consumed. Its next attack will consume _%1$d charges_ and deal _%2$d-%3$d damage._ +items.wands.wandoffireblast.stats_desc=This wand blasts out a cone of fire when used. Its next attack will consume _%1$d charges_ and deal _%2$d-%3$d damage._ The more charges the wand uses, the larger and stronger the effect. items.wands.wandoffrost.name=wand of frost items.wands.wandoffrost.staff_name=staff of frost items.wands.wandoffrost.desc=This wand seems to be made out of some kind of magical ice. It grows brighter towards its rounded tip. It feels very cold when held, but somehow your hand stays warm. -items.wands.wandoffrost.stats_desc=This wand shoots blasts of icy energy toward your foes, dealing _%1$d-%2$d damage_ and chilling, which reduces speed. The effect seems stronger in water. Chilled and frozen enemies take less damage from this wand, as they are already cold. +items.wands.wandoffrost.stats_desc=This wand shoots blasts of icy energy toward your foes, dealing _%1$d-%2$d damage_ and chilling. The effect seems stronger in water. Enemies that are already chilled or frozen enemies take less damage from this wand. items.wands.wandoflightning.name=wand of lightning items.wands.wandoflightning.staff_name=staff of lightning items.wands.wandoflightning.ondeath=You killed yourself with your own Wand of Lightning... items.wands.wandoflightning.desc=This wand is made out of solid metal, making it surprisingly heavy. Two prongs curve together at the tip, and electricity arcs between them. -items.wands.wandoflightning.stats_desc=This wand sends powerful lightning arcing through whatever it is shot at, dealing _%1$d-%2$d damage._ This electricity can bounce between many nearby foes, spreading damage between them. The lightning and damage spread much more effectively in water. If you're too close, you may get shocked as well! +items.wands.wandoflightning.stats_desc=This wand sends powerful lightning arcing through whatever it is shot at, dealing _%1$d-%2$d damage._ This electricity will arc to nearby characters, and spreads more easily in water. The arcs from this wand can damage you, but won't hurt your allies. items.wands.wandoflivingearth.name=wand of living earth items.wands.wandoflivingearth.staff_name=staff of living earth @@ -1209,8 +1209,8 @@ items.wands.wandofprismaticlight.stats_desc=This wand shoots rays of light which items.wands.wandofregrowth.name=wand of regrowth items.wands.wandofregrowth.staff_name=staff of regrowth -items.wands.wandofregrowth.desc=This wand is made from a thin shaft of expertly carved wood. Somehow it is still alive and vibrant, bright green like a young tree's core. -items.wands.wandofregrowth.stats_desc=When used, this wand will blast magical regrowth energy outward in a cone, causing grass, roots, and rare plants to spring to life. As this wand is upgraded it will consume more charges, the effect becomes significantly more powerful the more charges are consumed. Its next zap will consume _%1$d charges_. "When life ceases new life always begins to grow... The eternal cycle always remains!" +items.wands.wandofregrowth.desc=This wand is made from a thin shaft of expertly carved wood. Somehow it is still alive and vibrant, bright green like a young tree's core. "When life ceases new life always begins to grow... The eternal cycle always remains!" +items.wands.wandofregrowth.stats_desc=When used, this wand will blast magical regrowth energy outward in a cone, causing grass, roots, and rare plants to spring to life. Its next zap will consume _%1$d charges_. The more charges the wand uses, the larger and stronger the effect. items.wands.wandofregrowth$dewcatcher.name=Dewcatcher items.wands.wandofregrowth$dewcatcher.desc=Dewcatchers are wondrous plants that fill themselves with magical dew. They attempt to camouflage as grass to avoid attention, but their bulges of collected dew give them away. items.wands.wandofregrowth$seedpod.name=Seed Pod @@ -1403,9 +1403,10 @@ items.weapon.melee.magesstaff.cursed=You can't use a cursed wand. items.weapon.melee.magesstaff.warning=Are you sure you want to imbue your staff with this wand? The previous imbue will be lost.\n\nIf the wand being imbued is the same or higher level than the staff, the staff will inherit the level of that wand plus a single one of its own upgrades.\n\nThis imbue will result in a level %d staff. items.weapon.melee.magesstaff.yes=Yes, I'm sure. items.weapon.melee.magesstaff.no=No, I changed my mind -items.weapon.melee.magesstaff.desc=Crafted by the Mage himself, this staff is a unique magical weapon. Rather than having innate magical power, this staff is instead imbued with magical energy from a wand. +items.weapon.melee.magesstaff.desc=Crafted by the Mage himself, this staff is a unique magical weapon which can be imbued with a wand. items.weapon.melee.magesstaff.no_wand=The staff currently has no magic in it, it must be _imbued with a wand's power_ before it can be used to cast spells. items.weapon.melee.magesstaff.has_wand=The staff is currently imbued with a _%s._ +items.weapon.melee.magesstaff.cursed_wand=The staff is cursed, making its magic chaotic and random. items.weapon.melee.meleeweapon.stats_known=This _tier-%1$d_ melee weapon deals _%2$d-%3$d damage_ and requires _%4$d strength_ to use properly. items.weapon.melee.meleeweapon.stats_unknown=Typically this _tier-%1$d_ melee weapon deals _%2$d-%3$d damage_ and requires _%4$d strength_ to use properly. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index cbab2fbc2..62d1e8c8a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -460,10 +460,10 @@ public class Armor extends EquipableItem { switch (augment) { case EVASION: - info += "\n\n" + Messages.get(Armor.class, "evasion"); + info += " " + Messages.get(Armor.class, "evasion"); break; case DEFENSE: - info += "\n\n" + Messages.get(Armor.class, "defense"); + info += " " + Messages.get(Armor.class, "defense"); break; case NONE: } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java index 92328ba9a..0641b3273 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorrosion.java @@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.CorrosionParticle; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; @@ -105,4 +106,12 @@ public class WandOfCorrosion extends Wand { particle.shuffleXY( 1f ); } + @Override + public String statsDesc() { + if (levelKnown) + return Messages.get(this, "stats_desc", 2+buffedLvl()); + else + return Messages.get(this, "stats_desc", 2); + } + } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index 5ac6da0ae..fe0d83c56 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -295,7 +295,9 @@ public class MagesStaff extends MeleeWeapon { String info = super.info(); if (wand != null){ - info += "\n\n" + Messages.get(this, "has_wand", Messages.get(wand, "name")) + " " + wand.statsDesc(); + info += "\n\n" + Messages.get(this, "has_wand", Messages.get(wand, "name")); + if (!cursed || !cursedKnown) info += " " + wand.statsDesc(); + else info += " " + Messages.get(this, "cursed_wand"); } return info; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index 26eec8ca2..874d3c6c2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -88,10 +88,10 @@ public class MeleeWeapon extends Weapon { switch (augment) { case SPEED: - info += "\n\n" + Messages.get(Weapon.class, "faster"); + info += " " + Messages.get(Weapon.class, "faster"); break; case DAMAGE: - info += "\n\n" + Messages.get(Weapon.class, "stronger"); + info += " " + Messages.get(Weapon.class, "stronger"); break; case NONE: }