From e1a874474812831acd7714a06ce9d58b9a16f1be Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 25 Aug 2025 12:01:39 -0400
Subject: [PATCH] v3.2.2: fixed explosive cursed pickaxe explosion not awarding
 mick badge

---
 .../com/shatteredpixel/shatteredpixeldungeon/Badges.java     | 5 +++--
 .../shatteredpixeldungeon/items/weapon/curses/Explosive.java | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index 05adcbac8..50ddd12ce 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -34,6 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
 import com.shatteredpixel.shatteredpixeldungeon.items.quest.Pickaxe;
 import com.shatteredpixel.shatteredpixeldungeon.items.remains.RemainsItem;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
+import com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Explosive;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
 import com.shatteredpixel.shatteredpixeldungeon.journal.Bestiary;
 import com.shatteredpixel.shatteredpixeldungeon.journal.Catalog;
@@ -1036,8 +1037,8 @@ public class Badges {
 	}
 
 	public static void validateTakingTheMick(Object cause){
-		if (cause == Dungeon.hero &&
-				Dungeon.hero.belongings.attackingWeapon() instanceof Pickaxe
+		if ((cause == Dungeon.hero || cause instanceof Explosive.ExplosiveCurseBomb)
+				&& Dungeon.hero.belongings.attackingWeapon() instanceof Pickaxe
 				&& Dungeon.hero.belongings.attackingWeapon().level() >= 20){
 			local.add( Badge.TAKING_THE_MICK );
 			displayBadge(Badge.TAKING_THE_MICK);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java
index 0daff0f01..64075cbe5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Explosive.java
@@ -77,7 +77,7 @@ public class Explosive extends Weapon.Enchantment {
 				explosionPos = defender.pos;
 			}
 
-			new Bomb.ConjuredBomb().explode(explosionPos);
+			new ExplosiveCurseBomb().explode(explosionPos);
 
 			durability = 100;
 			Item.updateQuickslot();
@@ -147,4 +147,6 @@ public class Explosive extends Weapon.Enchantment {
 		bundle.put(DURABILITY, durability);
 	}
 
+	public static class ExplosiveCurseBomb extends Bomb.ConjuredBomb {}
+
 }