diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java index 3bc100936..1ca0f4e9c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DemonSpawner.java @@ -117,6 +117,7 @@ public class DemonSpawner extends Mob { } } } + alerted = false; return super.act(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java index 9b2d90874..74c1aee4b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Pylon.java @@ -73,16 +73,8 @@ public class Pylon extends Mob { @Override protected boolean act() { - spend(TICK); - - Heap heap = Dungeon.level.heaps.get( pos ); - if (heap != null) { - int n; - do { - n = pos + PathFinder.NEIGHBOURS8[Random.Int( 8 )]; - } while (!Dungeon.level.passable[n] && !Dungeon.level.avoid[n]); - Dungeon.level.drop( heap.pickUp(), n ).sprite.drop( pos ); - } + alerted = false; + super.act(); if (alignment == Alignment.NEUTRAL){ return true; @@ -151,7 +143,7 @@ public class Pylon extends Mob { } @Override - public void notice() { + public void beckon(int cell) { //do nothing } @@ -219,7 +211,6 @@ public class Pylon extends Mob { immunities.add( Paralysis.class ); immunities.add( Amok.class ); immunities.add( Sleep.class ); - immunities.add( ToxicGas.class ); immunities.add( Terror.class ); immunities.add( Vertigo.class ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java index c95b4e693..8c60a53dd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RotHeart.java @@ -52,6 +52,12 @@ public class RotHeart extends Mob { properties.add(Property.MINIBOSS); } + @Override + protected boolean act() { + alerted = false; + return super.act(); + } + @Override public void damage(int dmg, Object src) { //TODO: when effect properties are done, change this to FIRE