From 6b7a01241415c46dc5a81b2361fea0cbeabcf088 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 14 Mar 2022 19:45:05 -0400
Subject: [PATCH] v1.2.0: slight balance tweaks to burning and soiled fists

---
 .../actors/blobs/Freezing.java                    |  8 ++++++--
 .../actors/mobs/YogFist.java                      | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
index b3035d06c..1f969237c 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
@@ -70,9 +70,13 @@ public class Freezing extends Blob {
 			if (ch.buff(Frost.class) != null){
 				Buff.affect(ch, Frost.class, 2f);
 			} else {
-				Buff.affect(ch, Chill.class, Dungeon.level.water[cell] ? 5f : 3f);
 				Chill chill = ch.buff(Chill.class);
-				if (chill != null && chill.cooldown() >= Chill.DURATION){
+				if (chill == null || chill.cooldown() <= Chill.DURATION - 3f) {
+					Buff.affect(ch, Chill.class, Dungeon.level.water[cell] ? 5f : 3f);
+				}
+				if (chill != null
+						&& chill.cooldown() >= Chill.DURATION &&
+						!ch.isImmune(Frost.class)){
 					Buff.affect(ch, Frost.class, Frost.DURATION);
 				}
 			}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java
index 82291ed23..4289153f5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/YogFist.java
@@ -32,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Ooze;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots;
@@ -245,6 +246,10 @@ public abstract class YogFist extends Mob {
 
 		}
 
+		{
+			immunities.add(Frost.class);
+		}
+
 	}
 
 	public static class SoiledFist extends YogFist {
@@ -294,6 +299,11 @@ public abstract class YogFist extends Mob {
 			}
 			if (grassCells > 0) dmg = Math.round(dmg * (6-grassCells)/6f);
 
+			//can be ignited, but takes no damage from burning
+			if (src.getClass() == Burning.class){
+				return;
+			}
+
 			super.damage(dmg, src);
 		}
 
@@ -333,11 +343,6 @@ public abstract class YogFist extends Mob {
 					&& !(Dungeon.level.map[cell] == Terrain.FURROWED_GRASS || Dungeon.level.map[cell] == Terrain.HIGH_GRASS);
 		}
 
-		{
-			resistances.add(Burning.class);
-		}
-
-
 	}
 
 	public static class RottingFist extends YogFist {