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 c58d991bf..e0130ef18 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 @@ -427,7 +427,7 @@ public class Hero extends Char { //But there's going to be that one guy who gets a furor+force ring combo //This is for that one guy, you shall get your fists of fury! int bonus = RingOfFuror.getBonus(this, RingOfFuror.Furor.class); - return (float)(0.25 + (1 - 0.25)*Math.pow(0.8, bonus)); + return (float)(0.2 + (1 - 0.2)*Math.pow(0.85, bonus)); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java index fe6fcba03..c995ec294 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java @@ -70,9 +70,9 @@ public class WandOfFrost extends DamageWand { return; //do nothing, can't affect a frozen target } if (ch.buff(Chill.class) != null){ - //5% less damage per turn of chill remaining + //7.5% less damage per turn of chill remaining float chill = ch.buff(Chill.class).cooldown(); - damage = (int)Math.round(damage * Math.pow(0.95f, chill)); + damage = (int)Math.round(damage * Math.pow(0.925f, chill)); } else { ch.sprite.burst( 0xFF99CCFF, level() / 2 + 2 ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index 1ecc65a24..2b34817e2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -164,7 +164,7 @@ abstract public class Weapon extends KindOfWeapon { int bonus = RingOfFuror.getBonus(hero, RingOfFuror.Furor.class); - DLY = (float)(0.25 + (DLY - 0.25)*Math.pow(0.8, bonus)); + DLY = (float)(0.2 + (DLY - 0.2)*Math.pow(0.85, bonus)); return (encumrance > 0 ? (float)(DLY * Math.pow( 1.2, encumrance )) : DLY); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Flail.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Flail.java index 1fdf42f3b..b62b5f7c2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Flail.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Flail.java @@ -32,15 +32,9 @@ public class Flail extends MeleeWeapon { //also cannot surprise attack, see Hero.canSurpriseAttack } - @Override - public int min(int lvl) { - return tier + //base unchanged - lvl*2; //+2 per level, up from +1 - } - @Override public int max(int lvl) { - return Math.round(6.33f*(tier+1)) + //32 base, up from 25 - lvl*Math.round(1.33f*(tier+1)); //+6.67 per level, up from +5 + return Math.round(7*(tier+1)) + //35 base, up from 25 + lvl*Math.round(1.6f*(tier+1)); //+8 per level, up from +5 } }