From 481e93d7d9cf6dc746429ace1b02232c84e38869 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 23 Feb 2021 20:05:32 -0500 Subject: [PATCH] v0.9.2: fixed kinetic enchantment ignoring shielding --- .../items/weapon/enchantments/Kinetic.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java index 18dd23f45..3e4869e40 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java @@ -43,9 +43,9 @@ public class Kinetic extends Weapon.Enchantment { attacker.buff(ConservedDamage.class).detach(); } - if (damage > defender.HP){ - int extraDamage = damage - defender.HP; - + if (damage > (defender.HP + defender.shielding())){ + int extraDamage = damage - (defender.HP + defender.shielding()); + Buff.affect(attacker, ConservedDamage.class).setBonus(extraDamage); }