diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 9203eb690..9d304c6ae 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -484,7 +484,7 @@ public class TimekeepersHourglass extends Artifact { @Override public int value() { - return 20; + return 30; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java index 655d0874b..90a668c6e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java @@ -58,14 +58,21 @@ public class WandOfFireblast extends DamageWand { collisionProperties = Ballistica.WONT_STOP; } - //1x/2x/3x damage + //1/2/3 base damage with 1/2/3 scaling based on charges used public int min(int lvl){ return (1+lvl) * chargesPerCast(); } - //1x/2x/3x damage + //2/8/18 base damage with 2/4/6 scaling based on charges used public int max(int lvl){ - return (6+2*lvl) * chargesPerCast(); + switch (chargesPerCast()){ + case 1: default: + return 2 + 2*lvl; + case 2: + return 2*(4 + 2*lvl); + case 3: + return 3*(6+2*lvl); + } } ConeAOE cone; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java index 7e7d3f521..b3b499835 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java @@ -51,8 +51,10 @@ public class Blocking extends Weapon.Enchantment { // lvl 2 ~ 14% float procChance = (level+4f)/(level+40f) * procChanceMultiplier(attacker); if (Random.Float() < procChance){ + float powerMulti = Math.max(1f, procChance); + BlockBuff b = Buff.affect(attacker, BlockBuff.class); - b.setShield(attacker.HT/10); + b.setShield(Math.round(powerMulti * (2 + weapon.buffedLvl()))); attacker.sprite.emitter().burst(Speck.factory(Speck.LIGHT), 5); }