From 2d87a13157ee23e23684388f043a15d8d5b3cc1c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 8 Oct 2025 15:34:08 -0400 Subject: [PATCH] v3.3.0: damage-dealing spells now work against the 'no weapons' badge --- core/src/main/assets/messages/misc/misc.properties | 2 +- .../shatteredpixeldungeon/actors/mobs/DwarfKing.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/assets/messages/misc/misc.properties b/core/src/main/assets/messages/misc/misc.properties index 7bada9789..5e07392b8 100644 --- a/core/src/main/assets/messages/misc/misc.properties +++ b/core/src/main/assets/messages/misc/misc.properties @@ -141,7 +141,7 @@ badges$badge.boss_challenge_2.desc=Defeat the prison boss without getting hit by badges$badge.boss_challenge_3.title=Outmaneuvered badges$badge.boss_challenge_3.desc=Defeat the caves boss without getting attacked or damaged while it is supercharged badges$badge.boss_challenge_4.title=No Weapons in His Presence -badges$badge.boss_challenge_4.desc=Defeat the city boss without ever directly attacking him with weapons, rings, or wands +badges$badge.boss_challenge_4.desc=Defeat the city boss without ever directly attacking him with weapons, rings, wands, or damaging spells badges$badge.boss_challenge_5.title=Doom Slayer badges$badge.boss_challenge_5.desc=Defeat the final boss with all demon spawners alive and the badder bosses challenge enabled badges$badge.games_played_1.title=Novice Dungeoneer diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java index eca2a0643..0e0886409 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DwarfKing.java @@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Degrade; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Doom; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LifeLink; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.spells.ClericSpell; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Sheep; import com.shatteredpixel.shatteredpixeldungeon.effects.Beam; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; @@ -460,6 +461,9 @@ public class DwarfKing extends Mob { //Lightning has custom logic so that chaining it doesn't DQ for the badge } else if (src instanceof Wand && !(src instanceof WandOfLightning)){ Statistics.qualifiedForBossChallengeBadge = false; + //Only damage-dealing spells from the Cleric + } else if (src instanceof ClericSpell){ + Statistics.qualifiedForBossChallengeBadge = false; } if (isInvulnerable(src.getClass())){