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

v0.8.0: finalized ripper demon spritework

Browse Source
This commit is contained in:
Evan Debenham 2020-04-09 16:37:13 -04:00
parent 4152d9dc7a
commit a89971b117
3 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/ripper.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 727 B

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/RipperDemon.java
View File

@ -165,6 +165,7 @@ public class RipperDemon extends Mob {
} }
leapPos = -1; leapPos = -1;
sprite.idle();
Dungeon.level.occupyCell(RipperDemon.this); Dungeon.level.occupyCell(RipperDemon.this);
next(); next();
} }
@ -215,6 +216,7 @@ public class RipperDemon extends Mob {
if (Dungeon.level.heroFOV[pos]){ if (Dungeon.level.heroFOV[pos]){
GLog.w(Messages.get(RipperDemon.this, "leap")); GLog.w(Messages.get(RipperDemon.this, "leap"));
sprite.parent.addToBack(new TargetedCell(leapPos, 0xFF0000)); sprite.parent.addToBack(new TargetedCell(leapPos, 0xFF0000));
((RipperSprite)sprite).leapPrep( leapPos );
Dungeon.hero.interrupt(); Dungeon.hero.interrupt();
} }
return true; return true;

59
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RipperSprite.java
View File

@ -23,36 +23,71 @@ package com.shatteredpixel.shatteredpixeldungeon.sprites;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.watabou.noosa.TextureFilm; import com.watabou.noosa.TextureFilm;
import com.watabou.utils.Callback;
import com.watabou.utils.Random;
//TODO currently just a reskinned warlock sprite
public class RipperSprite extends MobSprite { public class RipperSprite extends MobSprite {
private Animation stab;
private Animation prep;
private Animation leap;
private boolean alt = Random.Int(2) == 0;
public RipperSprite() { public RipperSprite() {
super(); super();
texture( Assets.RIPPER ); texture( Assets.RIPPER );
TextureFilm frames = new TextureFilm( texture, 12, 14 ); TextureFilm frames = new TextureFilm( texture, 15, 14 );
idle = new Animation( 2, true ); idle = new Animation( 4, true );
idle.frames( frames, 0, 0, 0, 1 ); idle.frames( frames, 1, 0, 1, 2 );
run = new Animation( 15, true ); run = new Animation( 15, true );
run.frames( frames, 0, 2, 3, 4 ); run.frames( frames, 3, 4, 5, 6, 7, 8 );
run = new Animation( 18, true );
run.frames( frames, 2, 3, 4, 5, 6, 7 );
//TODO should probably have 2 attack animations, like monks
attack = new Animation( 12, false ); attack = new Animation( 12, false );
attack.frames( frames, 0, 8, 9 ); attack.frames( frames, 0, 9, 10, 9 );
zap = attack.clone(); stab = new Animation( 12, false );
stab.frames( frames, 0, 9, 11, 9 );
prep = new Animation( 1, true );
prep.frames( frames, 9 );
leap = new Animation( 1, true );
leap.frames( frames, 12 );
die = new Animation( 15, false ); die = new Animation( 15, false );
die.frames( frames, 0, 10, 11, 12, 13 ); die.frames( frames, 1, 13, 14, 15, 16 );
play( idle ); play( idle );
} }
public void leapPrep( int cell ){
turnTo( ch.pos, cell );
play( prep );
}
@Override
public void jump(int from, int to, Callback callback) {
super.jump(from, to, callback);
play( leap );
}
@Override
public void attack( int cell ) {
super.attack( cell );
if (alt) {
play( stab );
}
alt = !alt;
}
@Override
public void onComplete( Animation anim ) {
super.onComplete( anim == stab ? attack : anim );
}
} }