From e84fccda2f1b536228c95bb8e1b9cd340be1f109 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 1 Jun 2023 13:34:14 -0400
Subject: [PATCH] v2.1.0: fixed grim proc rate and version/changelog for
 re-release RC-2

---
 build.gradle                                                    | 2 +-
 .../com/shatteredpixel/shatteredpixeldungeon/actors/Char.java   | 1 -
 .../shatteredpixeldungeon/ui/changelist/v2_X_Changes.java       | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 234c42ef5..78422d3c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ allprojects {
         appName = 'Shattered Pixel Dungeon'
         appPackageName = 'com.shatteredpixel.shatteredpixeldungeon'
 
-        appVersionCode = 714
+        appVersionCode = 717
         appVersionName = '2.1.0-RC-2'
 
         appJavaCompatibility = JavaVersion.VERSION_1_8
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 a2f5f2b15..0e8b36174 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java
@@ -749,7 +749,6 @@ 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) {
 				int extraDmg = Math.round(HP*resist(Grim.class));
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java
index f6191806c..d7afec17a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v2_X_Changes.java
@@ -89,6 +89,7 @@ public class v2_X_Changes {
 		changes.addButton(new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"),
 				"Fixed the following bugs:\n" +
 				"_Caused by RC-1:_\n" +
+				"_-_ Grim enchantment proccing far more often than intended\n" +
 				"_-_ Tormented spirit spawning far more frequently than intended"));
 
 		changes = new ChangeInfo("RC-1", false, null);