From 79771b82bc5fb16f7f536e757312845f8db73d89 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 14 Nov 2022 14:55:45 -0500
Subject: [PATCH] v2.0.0: adjusted deadly misstep, now works on disint traps
 too

---
 core/src/main/assets/messages/misc/misc.properties            | 2 +-
 .../java/com/shatteredpixel/shatteredpixeldungeon/Badges.java | 4 ++--
 .../levels/traps/DisintegrationTrap.java                      | 2 ++
 .../shatteredpixeldungeon/levels/traps/GrimTrap.java          | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/assets/messages/misc/misc.properties b/core/src/main/assets/messages/misc/misc.properties
index 9825d04bd..1862bd9ab 100644
--- a/core/src/main/assets/messages/misc/misc.properties
+++ b/core/src/main/assets/messages/misc/misc.properties
@@ -65,7 +65,7 @@ badges$badge.death_from_friendly_magic.desc=Die to your own magical item
 badges$badge.death_from_sacrifice.title=A Worthy Sacrifice
 badges$badge.death_from_sacrifice.desc=Die while next to sacrificial fire
 badges$badge.death_from_grim_trap.title=Deadly Misstep
-badges$badge.death_from_grim_trap.desc=Die to a grim trap
+badges$badge.death_from_grim_trap.desc=Die to a grim or disintegration trap
 badges$badge.death_from_all.title=Yet Another Sad Death
 badges$badge.death_from_all.desc=Unlock all of the 'cause of death' badges
 badges$badge.boss_slain_1.title=Slime Janitor
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index cf2e3f8dd..9d39d9942 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -135,7 +135,7 @@ public class Badges {
 		BOSS_SLAIN_4                ( 78 ),
 		ALL_RINGS_IDENTIFIED        ( 79 ),
 		ALL_ARTIFACTS_IDENTIFIED    ( 80 ),
-		DEATH_FROM_GRIM_TRAP        ( 81 ),
+		DEATH_FROM_GRIM_TRAP        ( 81 ), //also disintegration traps
 		VICTORY                     ( 82 ),
 		BOSS_CHALLENGE_1            ( 83 ),
 		BOSS_CHALLENGE_2            ( 84 ),
@@ -673,7 +673,7 @@ public class Badges {
 		validateDeathFromAll();
 	}
 
-	public static void validateDeathFromGrimTrap() {
+	public static void validateDeathFromGrimOrDisintTrap() {
 		Badge badge = Badge.DEATH_FROM_GRIM_TRAP;
 		local.add( badge );
 		displayBadge( badge );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
index 2b81902d4..00d00e70c 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
@@ -22,6 +22,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.levels.traps;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.Badges;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
@@ -76,6 +77,7 @@ public class DisintegrationTrap extends Trap {
 			if (target == Dungeon.hero){
 				Hero hero = (Hero)target;
 				if (!hero.isAlive()){
+					Badges.validateDeathFromGrimOrDisintTrap();
 					Dungeon.fail( getClass() );
 					GLog.n( Messages.get(this, "ondeath") );
 				}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
index e381b7c57..7c65d7cc4 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
@@ -100,7 +100,7 @@ public class GrimTrap extends Trap {
 									if (finalTarget == Dungeon.hero) {
 										Sample.INSTANCE.play(Assets.Sounds.CURSED);
 										if (!finalTarget.isAlive()) {
-											Badges.validateDeathFromGrimTrap();
+											Badges.validateDeathFromGrimOrDisintTrap();
 											Dungeon.fail( GrimTrap.class );
 											GLog.n( Messages.get(GrimTrap.class, "ondeath") );
 										}