diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 016079ced..ddd64f270 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -281,6 +281,7 @@ public class Armor extends EquipableItem { if (glyph != null) { info += "\n\n" + Messages.get(Armor.class, "inscribed", glyph.name()); + info += " " + glyph.desc(); } if (cursed && isEquipped( Dungeon.hero )) { @@ -404,7 +405,7 @@ public class Armor extends EquipableItem { private static final float[] chances= new float[]{ 10, 10, 10, 10, - 5, 5, 5, 500, 5, 5, + 5, 5, 5, 5, 5, 5, 2, 2, 2 }; public abstract int proc( Armor armor, Char attacker, Char defender, int damage ); @@ -416,6 +417,10 @@ public class Armor extends EquipableItem { public String name( String armorName ) { return Messages.get(this, "name", armorName); } + + public String desc() { + return Messages.get(this, "desc"); + } @Override public void restoreFromBundle( Bundle bundle ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java index 3ba5bf69b..69edeba15 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Potential.java @@ -33,7 +33,7 @@ import com.watabou.utils.Random; public class Potential extends Glyph { - private static ItemSprite.Glowing WHITE = new ItemSprite.Glowing( 0xFFFFFF, 0.5f ); + private static ItemSprite.Glowing WHITE = new ItemSprite.Glowing( 0xFFFFFF, 0.6f ); @Override public int proc( Armor armor, Char attacker, Char defender, int damage) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java index 03fa61665..2b26a6708 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java @@ -35,7 +35,7 @@ import java.util.HashSet; public class Shocking extends Weapon.Enchantment { - private static ItemSprite.Glowing WHITE = new ItemSprite.Glowing( 0xFFFFFF, 0.5f ); + private static ItemSprite.Glowing WHITE = new ItemSprite.Glowing( 0xFFFFFF, 0.6f ); @Override public int proc( Weapon weapon, Char attacker, Char defender, int damage ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 23015fb33..5acd62688 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -1,37 +1,53 @@ ###glyphs items.armor.glyphs.affection.name=%s of affection +items.armor.glyphs.affection.desc=This powerful glyph manipulates the mind of attackers, charming them temporarily. items.armor.glyphs.antientropy.name=%s of anti-entropy +items.armor.glyphs.antientropy.desc= items.armor.glyphs.antimagic.name=%s of anti-magic +items.armor.glyphs.antimagic.desc=This powerful glyph allows armor to apply its defence to most magical attacks as well as phyical ones. items.armor.glyphs.brimstone.name=%s of brimstone +items.armor.glyphs.brimstone.desc=This glyph protects the wearer and their belongings from fire, with upgrades it even converts the heat into health. items.armor.glyphs.camouflage.name=%s of camouflage +items.armor.glyphs.camouflage.desc=This glyph allows the wearer to blend into tall grass, granting them temporary invisibility. items.armor.glyphs.entanglement.name=%s of entanglement +items.armor.glyphs.entanglement.desc=This glyph grows earthroot around the wearer to absorb damage, yet roots them in the process. items.armor.glyphs.flow.name=%s of flow +items.armor.glyphs.flow.desc=This glyph manipulates the flow of water around the wearer, making them much faster when moving through it. items.armor.glyphs.metabolism.name=%s of metabolism +items.armor.glyphs.metabolism.desc= items.armor.glyphs.multiplicity.name=%s of multiplicity items.armor.glyphs.multiplicity.rankings_desc=Killed by: glyph of multiplicity +items.armor.glyphs.multiplicity.desc= items.armor.glyphs.obfuscation.name=%s of obfuscation +items.armor.glyphs.obfuscation.desc=This glyph makes the wearer more difficult to detect, at the cost of defense. items.armor.glyphs.potential.name=%s of potential items.armor.glyphs.potential.rankings_desc=Killed by: glyph of potential +items.armor.glyphs.potential.desc=This glyph releases energy when struck. This is harmful to the wearer, but recharges wands. items.armor.glyphs.repulsion.name=%s of repulsion +items.armor.glyphs.repulsion.desc=This glyph rebounds force against attackers, sending them flying back. items.armor.glyphs.stench.name=%s of stench +items.armor.glyphs.stench.desc= items.armor.glyphs.stone.name=%s of stone +items.armor.glyphs.stone.desc=This glyph increases both the weight and defensive strength of armor it is attached to. items.armor.glyphs.swiftness.name=%s of swiftness +items.armor.glyphs.swiftness.desc=This glyph alters the nature of armor, reducing weight and increasing evasion and speed, at the cost of defense. items.armor.glyphs.thorns.name=%s of thorns +items.armor.glyphs.thorns.desc=This powerful glyph harms attackers, causing them to slowly bleed based on the damage they deal. items.armor.glyphs.viscosity.name=%s of viscosity items.armor.glyphs.viscosity.deferred=deferred %d @@ -39,6 +55,7 @@ items.armor.glyphs.viscosity$defereddamage.name=Deferred damage items.armor.glyphs.viscosity$defereddamage.ondeath=The deferred damage killed you... items.armor.glyphs.viscosity$defereddamage.rankings_desc=Killed by 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.\n\nDeferred damage remaining: %d. +items.armor.glyphs.viscosity.desc=This glyph is able to store damage dealt to the wearer, dealing it to them slowly rather than all at once.