From fb5735b2c7d478d3e6552c041cacd8673e98f5d9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 10 Sep 2014 17:29:00 -0400 Subject: [PATCH] V0.2.0: Lightly buffed new ring of accuracy, removed old ring of accuracy implementation (it was giving both its old and new effect, oops) --- .../shatteredpixeldungeon/actors/hero/Hero.java | 14 ++------------ .../shatteredpixeldungeon/actors/mobs/Mob.java | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 2ca8728cf..a2433cf96 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -254,20 +254,10 @@ public class Hero extends Char { @Override public int attackSkill( Char target ) { - - int bonus = 0; - for (Buff buff : buffs( RingOfAccuracy.Accuracy.class )) { - bonus += ((RingOfAccuracy.Accuracy)buff).level; - } - float accuracy = (bonus == 0) ? 1 : (float)Math.pow( 1.4, bonus ); - if (usingRanged && Level.distance( pos, target.pos ) == 1) { - accuracy *= 0.5f; - } - if (belongings.weapon != null) { - return (int)(attackSkill * accuracy * belongings.weapon.acuracyFactor( this )); + return (int)(attackSkill * belongings.weapon.acuracyFactor( this )); } else { - return (int)(attackSkill * accuracy); + return (int)(attackSkill); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index 233dbb4e8..7ddf5f756 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -386,7 +386,7 @@ public abstract class Mob extends Char { penalty += ((RingOfAccuracy.Accuracy) buff).level; } if (penalty != 0) - defenseSkill *= Math.pow(0.8, penalty); + defenseSkill *= Math.pow(0.75, penalty); return defenseSkill; } else return 0;