From a6221113cb84926dfbc1b9188983a9c133d67e10 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 11 Jun 2023 17:03:34 -0400 Subject: [PATCH] v2.1.1: fixed grim immunity not applying --- .../shatteredpixeldungeon/items/weapon/enchantments/Grim.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java index 6ceb68b99..8e07867e6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java @@ -36,6 +36,10 @@ public class Grim extends Weapon.Enchantment { @Override public int proc( Weapon weapon, Char attacker, Char defender, int damage ) { + if (defender.isImmune(Grim.class)) { + return damage; + } + int level = Math.max( 0, weapon.buffedLvl() ); //scales from 0 - 50% based on how low hp the enemy is, plus 0-5% per level