konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Debenham
2022-10-25 14:14:03 -04:00
parent 233a0323f1
commit f8fc26d2ee
13 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
View File

@@ -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 ) {

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM100Sprite.java
View File

@@ -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

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM200Sprite.java
View File

@@ -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,

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM201Sprite.java
View File

@@ -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,

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/DM300Sprite.java
View File

@@ -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,

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ElementalSprite.java
View File

@@ -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)));

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FistSprite.java
View File

@@ -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)));

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GolemSprite.java
View File

@@ -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,

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ScorpioSprite.java
View File

@@ -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 {

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ShamanSprite.java
View File

@@ -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,

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/SpinnerSprite.java
View File

@@ -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,

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TenguSprite.java
View File

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

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/WarlockSprite.java
View File

@@ -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,