From 8942fb218ed6b567439a9fc04f79e3195bc39e38 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 12 Oct 2020 21:04:28 -0400 Subject: [PATCH] v0.9.0b: disarming traps now kill statues --- .../shatteredpixeldungeon/levels/traps/DisarmingTrap.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java index fdf72984f..e79f053ef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java @@ -23,7 +23,9 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.traps; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Statue; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.items.Heap; @@ -61,6 +63,12 @@ public class DisarmingTrap extends Trap{ } } + if (Actor.findChar(pos) instanceof Statue){ + Actor.findChar(pos).die(this); + Sample.INSTANCE.play(Assets.Sounds.TELEPORT); + CellEmitter.get(pos).burst(Speck.factory(Speck.LIGHT), 4); + } + if (Dungeon.hero.pos == pos && !Dungeon.hero.flying){ Hero hero = Dungeon.hero; KindOfWeapon weapon = hero.belongings.weapon;