LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.1b: adjusted sprites to no longer spam onComplete when paused

Browse Source
This commit is contained in:
Evan Debenham 2021-01-01 19:04:52 -05:00
parent 628e8fed7d
commit d4ba5f0941
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/BlacksmithSprite.java
View File

@ -76,7 +76,7 @@ public class BlacksmithSprite extends MobSprite {
super.onComplete( anim );
//FIXME should figure out why onComplete is called constantly when an animation is paused
if (visible && emitter != null && anim == idle && !paused) {
if (visible && emitter != null && anim == idle) {
emitter.burst( Speck.factory( Speck.FORGE ), 3 );
float volume = 0.2f / (Dungeon.level.distance( ch.pos, Dungeon.hero.pos ));
Sample.INSTANCE.play( Assets.Sounds.EVOKE, volume, volume, 0.8f );

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

@ -482,13 +482,12 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
@Override
public void update() {
if (paused && curAnim == die){
paused = false;
}
super.update();
if (paused && listener != null) {
listener.onComplete( curAnim );
}
if (flashTime > 0 && (flashTime -= Game.elapsed) <= 0) {
resetColor();
}

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

@ -111,8 +111,6 @@ public class DM300Sprite extends MobSprite {
Camera.main.shake( 3, 0.7f );
}
private boolean exploded = false;
@Override
public void onComplete( Animation anim ) {
@ -126,8 +124,7 @@ public class DM300Sprite extends MobSprite {
super.onComplete( anim );
if (anim == die && !exploded) {
exploded = true;
if (anim == die) {
Sample.INSTANCE.play(Assets.Sounds.BLAST);
emitter().burst( BlastParticle.FACTORY, 100 );
killAndErase();