From a8156323058ded4528d25a8b6e73c3f521b04305 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 10 Feb 2015 14:31:51 -0500 Subject: [PATCH] v0.2.4: ring of force now includes its average damage in its description --- .../items/rings/RingOfForce.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java index cba2748b6..cf36eb377 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java @@ -1,5 +1,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.rings; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; + /** * Created by debenhame on 10/09/2014. */ @@ -16,12 +18,20 @@ public class RingOfForce extends Ring { @Override public String desc() { - return isKnown() ? - "This ring enhances the force of the wearer's blows. " + - "This extra power is largely wasted when wielding weapons, " + - "but an unarmed attack will be made much stronger. " + - "A degraded ring will instead weaken the wearer's blows." : - super.desc(); + if (isKnown()){ + String desc = "This ring enhances the force of the wearer's blows. " + + "This extra power is largely wasted when wielding weapons, " + + "but an unarmed attack will be made much stronger. " + + "A degraded ring will instead weaken the wearer's blows.\n\n" + + "When unarmed, at your current strength, "; + int str = Dungeon.hero.STR() - 8; + desc += levelKnown ? + "average damage with this ring is " + (str/2+level + (int)(str*0.5f*level) + str*2)/2 + " points per hit.": + "typical average damage with this ring is" + (str/2+1 + (int)(str*0.5f) + str*2)/2 + " points per hit."; + desc += " Wearing a second ring of force would enchance this."; + return desc; + } else + return super.desc(); } public class Force extends RingBuff {