diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java index 934de8a35..d41f2d008 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM200.java @@ -37,7 +37,7 @@ public class DM200 extends Mob { { spriteClass = DM200Sprite.class; - HP = HT = 80; + HP = HT = 70; defenseSkill = 8; EXP = 9; @@ -63,7 +63,7 @@ public class DM200 extends Mob { @Override public int drRoll() { - return Random.NormalIntRange(0, 10); + return Random.NormalIntRange(0, 8); } private int ventCooldown = 0; @@ -84,6 +84,9 @@ public class DM200 extends Mob { @Override protected boolean act() { + //ensures toxic gas acts at the appropriate time when added + //TODO we have this check in 2 places now, can we just ensure that blobs spend an extra turn when added? + GameScene.add(Blob.seed(pos, 0, ToxicGas.class)); ventCooldown--; return super.act(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java index 4da85c4e1..f71b132c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java @@ -71,4 +71,12 @@ public class DM100Sprite extends MobSprite { turnTo( ch.pos, pos ); play( zap ); } + + @Override + public void onComplete( Animation anim ) { + if (anim == zap) { + idle(); + } + super.onComplete( anim ); + } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java index f3b88b0a7..6c9e1a020 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java @@ -75,4 +75,12 @@ public class DM200Sprite extends MobSprite { Sample.INSTANCE.play( Assets.SND_PUFF ); } + @Override + public void onComplete( Animation anim ) { + if (anim == zap) { + idle(); + } + super.onComplete( anim ); + } + } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java index a48c089ab..ec1f1bbe7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java @@ -77,6 +77,14 @@ public abstract class ShamanSprite extends MobSprite { } ); Sample.INSTANCE.play( Assets.SND_ZAP ); } + + @Override + public void onComplete( Animation anim ) { + if (anim == zap) { + idle(); + } + super.onComplete( anim ); + } public static class Red extends ShamanSprite { {