v1.4.2: followup fixes/improvements to animation callback change

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java

@@ -270,7 +270,8 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 	
 	public synchronized void zap( int cell, Callback callback ) {
 		animCallback = callback;
-		zap( cell );
+		turnTo( ch.pos, cell );
+		play( zap );
 	}
 	
 	public void turnTo( int from, int to ) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java

@@ -78,9 +78,8 @@ public class DM100Sprite extends MobSprite {
 		}
 		Sample.INSTANCE.play( Assets.Sounds.LIGHTNING );
 		
-		turnTo( ch.pos, pos );
+		super.zap( ch.pos );
 		flash();
-		play( zap );
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java

@@ -60,8 +60,7 @@ public class DM200Sprite extends MobSprite {
 
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 
 		MagicMissile.boltFromChar( parent,
 				MagicMissile.TOXIC_VENT,

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java

@@ -73,8 +73,7 @@ public class DM201Sprite extends MobSprite {
 
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 
 		MagicMissile.boltFromChar( parent,
 				MagicMissile.CORROSION,

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java

@@ -84,8 +84,7 @@ public class DM300Sprite extends MobSprite {
 
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 
 		MagicMissile.boltFromChar( parent,
 				MagicMissile.TOXIC_VENT,

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java

@@ -106,9 +106,7 @@ public abstract class ElementalSprite extends MobSprite {
 	}
 	
 	public void zap( int cell ) {
-		
+		super.zap( cell );
-		turnTo( ch.pos , cell );
-		play( zap );
 		
 		MagicMissile.boltFromChar( parent,
 				boltType,
@@ -208,8 +206,7 @@ public abstract class ElementalSprite extends MobSprite {
 		//different bolt, so overrides zap
 		@Override
 		public void zap( int cell ) {
-			turnTo( ch.pos , cell );
+			super.zap( cell );
-			play( zap );
 			
 			((Elemental)ch).onZapComplete();
 			parent.add( new Beam.LightRay(center(), DungeonTilemap.raisedTileCenterToWorld(cell)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java

@@ -120,8 +120,7 @@ public abstract class FistSprite extends MobSprite {
 
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 
 		MagicMissile.boltFromChar( parent,
 				boltType,
@@ -266,8 +265,7 @@ public abstract class FistSprite extends MobSprite {
 
 		@Override
 		public void zap( int cell ) {
-			turnTo( ch.pos , cell );
+			super.zap( cell );
-			play( zap );
 
 			((YogFist)ch).onZapComplete();
 			parent.add( new Beam.LightRay(center(), DungeonTilemap.raisedTileCenterToWorld(cell)));

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java

@@ -104,8 +104,7 @@ public class GolemSprite extends MobSprite {
 
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 
 		MagicMissile.boltFromChar( parent,
 				MagicMissile.ELMO,

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java

@@ -65,8 +65,7 @@ public class ScorpioSprite extends MobSprite {
 		if (!Dungeon.level.adjacent( cell, ch.pos )) {
 			
 			cellToAttack = cell;
-			turnTo( ch.pos , cell );
+			zap(cell);
-			play( zap );
 			
 		} else {
 			

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java

@@ -62,8 +62,7 @@ public abstract class ShamanSprite extends MobSprite {
 	
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 		
 		MagicMissile.boltFromChar( parent,
 				boltType,

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java

@@ -72,8 +72,7 @@ public class SpinnerSprite extends MobSprite {
 	
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 		
 		MagicMissile.boltFromChar( parent,
 				MagicMissile.MAGIC_MISSILE,

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java

@@ -99,8 +99,7 @@ public class TenguSprite extends MobSprite {
 					}
 				} );
 			
-			play( zap );
+			zap( ch.pos );
-			turnTo( ch.pos , cell );
 			
 		} else {
 			

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java

@@ -56,8 +56,7 @@ public class WarlockSprite extends MobSprite {
 	
 	public void zap( int cell ) {
 
-		turnTo( ch.pos , cell );
+		super.zap( cell );
-		play( zap );
 
 		MagicMissile.boltFromChar( parent,
 				MagicMissile.SHADOW,