diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java index c9dbbdd9c..9dd1ad66c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Greatshield extends MeleeWeapon { @@ -42,4 +43,12 @@ public class Greatshield extends MeleeWeapon { public int defenseFactor( Char owner ) { return 10+3*level(); //10 extra defence, plus 3 per level; } + + public String statsInfo(){ + if (isIdentified()){ + return Messages.get(this, "stats_desc", 10+3*level()); + } else { + return Messages.get(this, "typical_stats_desc", 10); + } + } } 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 3a4d53753..9f3816744 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 @@ -83,8 +83,8 @@ public class MeleeWeapon extends Weapon { } } - String stats_desc = Messages.get(this, "stats_desc"); - if (!stats_desc.equals("")) info+= "\n\n" + stats_desc; + String statsInfo = statsInfo(); + if (!statsInfo.equals("")) info += "\n\n" + statsInfo; switch (augment) { case SPEED: @@ -112,6 +112,10 @@ public class MeleeWeapon extends Weapon { return info; } + public String statsInfo(){ + return Messages.get(this, "stats_desc"); + } + @Override public int price() { int price = 20 * tier; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java index 147119725..943c560a1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; +import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class RoundShield extends MeleeWeapon { @@ -42,4 +43,12 @@ public class RoundShield extends MeleeWeapon { public int defenseFactor( Char owner ) { return 5+2*level(); //5 extra defence, plus 2 per level; } + + public String statsInfo(){ + if (isIdentified()){ + return Messages.get(this, "stats_desc", 5+2*level()); + } else { + return Messages.get(this, "typical_stats_desc", 5); + } + } } \ No newline at end of file diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 75b380b6f..98b7d429e 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -1226,7 +1226,7 @@ items.weapon.melee.flail.stats_desc=This is a rather inaccurate weapon.\nThis we items.weapon.melee.flail.desc=A spiked ball attached to a handle by a length of chain. Very unwieldy, but devastating if it lands a solid hit. items.weapon.melee.gauntlet.name=stone gauntlet -items.weapon.melee.gauntlet.stats_desc=This is a very fast weapon.\nThis weapon blocks some damage. +items.weapon.melee.gauntlet.stats_desc=This is a very fast weapon.\nThis weapon blocks 0-4 damage. items.weapon.melee.gauntlet.desc=This massive gauntlet is made of crimson fabric with heavy magical stone layered on top. The fabric tightens around you, making the thick stone plates almost like a second skin. Swinging such a heavy weapon requires strength, but adds tremendous force to your blows. items.weapon.melee.glaive.name=glaive @@ -1238,7 +1238,8 @@ items.weapon.melee.greataxe.stats_desc=This weapon is incredibly heavy. items.weapon.melee.greataxe.desc=Meant to be wielded over the shoulder, this titanic axe is as powerful as it is heavy. items.weapon.melee.greatshield.name=greatshield -items.weapon.melee.greatshield.stats_desc=This weapon blocks a tremendous amount of damage, which scales with upgrades. +items.weapon.melee.greatshield.typical_stats_desc=Typically this weapon blocks 0-%d damage. This blocking scales with upgrades. +items.weapon.melee.greatshield.stats_desc=This weapon blocks 0-%d damage. This blocking scales with upgrades. items.weapon.melee.greatshield.desc=More like a mobile wall than a shield, this gigantic mass of metal aids defense, but doesn't leave much room for attacking. items.weapon.melee.greatsword.name=greatsword @@ -1283,11 +1284,12 @@ items.weapon.melee.shortsword.name=shortsword items.weapon.melee.shortsword.desc=A quite short sword, only a few inches longer than a dagger. items.weapon.melee.quarterstaff.name=quarterstaff -items.weapon.melee.quarterstaff.stats_desc=This weapon blocks some damage. +items.weapon.melee.quarterstaff.stats_desc=This weapon blocks 0-3 damage. items.weapon.melee.quarterstaff.desc=A staff of hardwood, its ends are shod with iron. items.weapon.melee.roundshield.name=round shield -items.weapon.melee.roundshield.stats_desc=This weapon blocks a significant amount of damage, which scales with upgrades. +items.weapon.melee.roundshield.typical_stats_desc=Typically this weapon blocks 0-%d damage. This blocking scales with upgrades. +items.weapon.melee.roundshield.stats_desc=This weapon blocks 0-%d damage. This blocking scales with upgrades. items.weapon.melee.roundshield.desc=This large shield effectively blocks attacks and makes a decent weapon in a pinch. items.weapon.melee.runicblade.name=runic blade @@ -1295,7 +1297,7 @@ items.weapon.melee.runicblade.stats_desc=This weapon benefits more from upgrades items.weapon.melee.runicblade.desc=A mysterious weapon from a distant land, with a bright blue blade. items.weapon.melee.sai.name=sai -items.weapon.melee.sai.stats_desc=This is a very fast weapon.\nThis weapon blocks some damage. +items.weapon.melee.sai.stats_desc=This is a very fast weapon.\nThis weapon blocks 0-2 damage. items.weapon.melee.sai.desc=Two thin blades meant to be wielded in one hand each. Excellent for parrying and swift cuts alike. items.weapon.melee.scimitar.name=scimitar