LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.2.3: fixed an interaction bug between wand of telekinesis and shopkeepers

Browse Source
This commit is contained in:
Evan Debenham 2014-12-14 01:21:59 -05:00
parent 0046ee88e7
commit d196fda2dd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java
View File

@ -17,6 +17,7 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.items.wands; package com.shatteredpixel.shatteredpixeldungeon.items.wands;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
@ -80,6 +81,9 @@ public class WandOfTelekinesis extends Wand {
ch.pos = next; ch.pos = next;
Actor.freeCell( next ); Actor.freeCell( next );
if (ch instanceof Shopkeeper)
ch.damage( 0, this );
// FIXME // FIXME
if (ch instanceof Mob) { if (ch instanceof Mob) {
Dungeon.level.mobPress( (Mob)ch ); Dungeon.level.mobPress( (Mob)ch );