From 545899f0beba66049ff3d2c5388ecee15b641b52 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 30 May 2023 12:57:40 -0400
Subject: [PATCH] v2.1.0: fixed damage resistance not applying to new grim
 logic

---
 .../shatteredpixel/shatteredpixeldungeon/actors/Char.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
index 84715f61b..a2f5f2b15 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
@@ -749,10 +749,12 @@ public abstract class Char extends Actor {
 
 			float finalChance = buff(Grim.GrimTracker.class).maxChance;
 			finalChance *= (float)Math.pow( ((HT - HP) / (float)HT), 2);
+			finalChance = 1;
 
 			if (Random.Float() < finalChance) {
-				dmg += HP;
-				HP = 0;
+				int extraDmg = Math.round(HP*resist(Grim.class));
+				dmg += extraDmg;
+				HP -= extraDmg;
 
 				sprite.emitter().burst( ShadowParticle.UP, 5 );
 				if (!isAlive() && buff(Grim.GrimTracker.class).qualifiesForBadge){