v2.1.0: fixed damage resistance not applying to new grim logic

2023-05-30 12:57:40 -04:00
parent acfa467584
commit 545899f0be
1 changed files with 4 additions and 2 deletions
--- 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){