From f8fc26d2eee99c9de42155ff1fc66d026eb38f20 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 25 Oct 2022 14:14:03 -0400 Subject: [PATCH] v1.4.2: followup fixes/improvements to animation callback change --- .../shatteredpixeldungeon/sprites/CharSprite.java | 3 ++- .../shatteredpixeldungeon/sprites/DM100Sprite.java | 3 +-- .../shatteredpixeldungeon/sprites/DM200Sprite.java | 3 +-- .../shatteredpixeldungeon/sprites/DM201Sprite.java | 3 +-- .../shatteredpixeldungeon/sprites/DM300Sprite.java | 3 +-- .../shatteredpixeldungeon/sprites/ElementalSprite.java | 7 ++----- .../shatteredpixeldungeon/sprites/FistSprite.java | 6 ++---- .../shatteredpixeldungeon/sprites/GolemSprite.java | 3 +-- .../shatteredpixeldungeon/sprites/ScorpioSprite.java | 3 +-- .../shatteredpixeldungeon/sprites/ShamanSprite.java | 5 ++--- .../shatteredpixeldungeon/sprites/SpinnerSprite.java | 5 ++--- .../shatteredpixeldungeon/sprites/TenguSprite.java | 3 +-- .../shatteredpixeldungeon/sprites/WarlockSprite.java | 5 ++--- 13 files changed, 19 insertions(+), 33 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java index 649f4af3a..1c184af3f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java +++ b/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 ) { 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 05f756a41..b1a0af799 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java +++ b/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 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 06eca9668..cb0d18440 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java +++ b/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 ); - play( zap ); + super.zap( cell ); MagicMissile.boltFromChar( parent, MagicMissile.TOXIC_VENT, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java index 0986c3e01..848839eae 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java +++ b/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 ); - play( zap ); + super.zap( cell ); MagicMissile.boltFromChar( parent, MagicMissile.CORROSION, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java index 036f4f9c9..acf059f2d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java +++ b/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 ); - play( zap ); + super.zap( cell ); MagicMissile.boltFromChar( parent, MagicMissile.TOXIC_VENT, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java index 8f8521947..9dc9facd8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java +++ b/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 ) { - - turnTo( ch.pos , cell ); - play( zap ); + super.zap( cell ); 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 ); - play( zap ); + super.zap( cell ); ((Elemental)ch).onZapComplete(); parent.add( new Beam.LightRay(center(), DungeonTilemap.raisedTileCenterToWorld(cell))); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java index 1a15d08a5..81e819749 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java +++ b/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 ); - play( zap ); + super.zap( cell ); MagicMissile.boltFromChar( parent, boltType, @@ -266,8 +265,7 @@ public abstract class FistSprite extends MobSprite { @Override public void zap( int cell ) { - turnTo( ch.pos , cell ); - play( zap ); + super.zap( cell ); ((YogFist)ch).onZapComplete(); parent.add( new Beam.LightRay(center(), DungeonTilemap.raisedTileCenterToWorld(cell))); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java index 3b21d57ed..9c45ecdc6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java +++ b/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 ); - play( zap ); + super.zap( cell ); MagicMissile.boltFromChar( parent, MagicMissile.ELMO, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java index 0165920ef..9d161fdc7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java +++ b/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 ); - play( zap ); + zap(cell); } else { 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 68a4859e2..43c5ad7d4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java @@ -61,9 +61,8 @@ public abstract class ShamanSprite extends MobSprite { } public void zap( int cell ) { - - turnTo( ch.pos , cell ); - play( zap ); + + super.zap( cell ); MagicMissile.boltFromChar( parent, boltType, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java index 394b9c5f9..03679999b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java @@ -71,9 +71,8 @@ public class SpinnerSprite extends MobSprite { } public void zap( int cell ) { - - turnTo( ch.pos , cell ); - play( zap ); + + super.zap( cell ); MagicMissile.boltFromChar( parent, MagicMissile.MAGIC_MISSILE, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java index 178d21282..e97316b98 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java @@ -99,8 +99,7 @@ public class TenguSprite extends MobSprite { } } ); - play( zap ); - turnTo( ch.pos , cell ); + zap( ch.pos ); } else { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java index 1bddd384a..a3adb833c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java @@ -55,9 +55,8 @@ public class WarlockSprite extends MobSprite { } public void zap( int cell ) { - - turnTo( ch.pos , cell ); - play( zap ); + + super.zap( cell ); MagicMissile.boltFromChar( parent, MagicMissile.SHADOW,