From 1ace437283e09a9c22e3b78b52463d8afa76a664 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 12 Dec 2018 18:16:50 -0500 Subject: [PATCH] v0.7.1: adjusted ring of force, no longer works with thrown weapons --- .../shatteredpixeldungeon/actors/hero/Hero.java | 3 ++- .../shatteredpixeldungeon/items/rings/RingOfForce.java | 4 ++-- .../shatteredpixeldungeon/messages/items/items.properties | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 2575b1174..e82116f0b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -373,7 +373,8 @@ public class Hero extends Char { int dmg; if (wep != null) { - dmg = wep.damageRoll( this ) + RingOfForce.armedDamageBonus(this); + dmg = wep.damageRoll( this ); + if (!(wep instanceof MissileWeapon)) dmg += RingOfForce.armedDamageBonus(this); } else { dmg = RingOfForce.damageRoll(this); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java index a6e45a0d0..1a3042573 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfForce.java @@ -81,9 +81,9 @@ public class RingOfForce extends Ring { public String statsInfo() { float tier = tier(Dungeon.hero.STR()); if (isIdentified()) { - return Messages.get(this, "stats", min(soloBonus(), tier), max(soloBonus(), tier)); + return Messages.get(this, "stats", min(soloBonus(), tier), max(soloBonus(), tier), soloBonus()); } else { - return Messages.get(this, "typical_stats", min(1, tier), max(1, tier)); + return Messages.get(this, "typical_stats", min(1, tier), max(1, tier), 1); } } 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 54ad9acb2..75b380b6f 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 @@ -749,9 +749,9 @@ items.rings.ringofevasion.typical_stats=When worn, this ring will typically incr items.rings.ringofevasion.desc=This ring quickens the wearer's reactions, making it harder to land blows on them. A cursed ring will instead make the user easier to strike. items.rings.ringofforce.name=ring of force -items.rings.ringofforce.stats=When unarmed, at your current strength, this ring will deal _%1$d-%2$d damage._ -items.rings.ringofforce.typical_stats=When unarmed, at your current strength, typically this ring will deal _%1$d-%2$d damage._ -items.rings.ringofforce.desc=This ring enhances the force of the wearer's blows. This extra power is fairly weak when wielding weapons, but an unarmed attack will be made much stronger. A cursed ring will instead weaken the wearer's blows. +items.rings.ringofforce.stats=When unarmed, at your current strength, this ring will deal _%1$d-%2$d damage._ With a weapon equipped, this ring will increase damage by _%3$d._ +items.rings.ringofforce.typical_stats=When unarmed, at your current strength, typically this ring will deal _%1$d-%2$d damage._ With a weapon equipped, typically this ring will increase damage by _%3$d._ +items.rings.ringofforce.desc=This ring enhances the force of the wearer's melee blows. This extra power is fairly weak when wielding weapons, but an unarmed attack will be made much stronger. A cursed ring will instead weaken the wearer's blows. items.rings.ringoffuror.name=ring of furor items.rings.ringoffuror.stats=When worn, this ring will increase the speed of your attacks by _%s%%._