From 6810d0adefc14fd5efb8ac397ce87b92b11e0255 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 29 Oct 2014 16:09:26 -0400 Subject: [PATCH] v0.2.2: modified weightstone speed logic, now factors itself in before ring of furor. --- .../shatteredpixeldungeon/items/weapon/Weapon.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index 34ae9ba8a..ed91c28c5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -124,16 +124,17 @@ public class Weapon extends KindOfWeapon { encumrance -= 2; } + float DLY = this.DLY * (imbue == Imbue.LIGHT ? 0.667f : (imbue == Imbue.HEAVY ? 1.667f : 1.0f)); + int bonus = 0; for (Buff buff : hero.buffs(RingOfFuror.Furor.class)) { bonus += ((RingOfFuror.Furor)buff).level; } - float DLY = (float)(0.25 + (this.DLY - 0.25)*Math.pow(0.8, bonus)); + DLY = (float)(0.25 + (DLY - 0.25)*Math.pow(0.8, bonus)); return - (encumrance > 0 ? (float)(DLY * Math.pow( 1.2, encumrance )) : DLY) * - (imbue == Imbue.LIGHT ? 0.667f : (imbue == Imbue.HEAVY ? 1.667f : 1.0f)); + (encumrance > 0 ? (float)(DLY * Math.pow( 1.2, encumrance )) : DLY); } @Override