diff --git a/core/src/main/assets/ghoul.png b/core/src/main/assets/ghoul.png index 99ab98e6e..eba07634c 100644 Binary files a/core/src/main/assets/ghoul.png and b/core/src/main/assets/ghoul.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java index 263bb2912..05a7a3cb4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Ghoul.java @@ -28,17 +28,14 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corruption; import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing; import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; -import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.GhoulSprite; -import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; import com.watabou.utils.PathFinder; import com.watabou.utils.Random; import java.util.ArrayList; -//TODO some aspects of existing enemy AI make these really wonky. Need to address that. public class Ghoul extends Mob { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java index 04f8d5108..c29a243ef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java @@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.sprites; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.watabou.noosa.TextureFilm; -//TODO currently just a recolored monk sprite public class GhoulSprite extends MobSprite { private Animation crumple; @@ -34,22 +33,25 @@ public class GhoulSprite extends MobSprite { texture( Assets.GHOUL ); - TextureFilm frames = new TextureFilm( texture, 15, 14 ); - - idle = new Animation( 6, true ); - idle.frames( frames, 1, 0, 1, 2 ); - + TextureFilm frames = new TextureFilm( texture, 12, 14 ); + + idle = new Animation( 2, true ); + idle.frames( frames, 0, 0, 0, 1 ); + run = new Animation( 15, true ); - run.frames( frames, 11, 12, 13, 14, 15, 16 ); - + run.frames( frames, 0, 2, 3, 4 ); + + run = new Animation( 12, true ); + run.frames( frames, 2, 3, 4, 5, 6, 7 ); + attack = new Animation( 12, false ); - attack.frames( frames, 3, 4, 3, 4 ); + attack.frames( frames, 0, 8, 9 ); crumple = new Animation( 15, false); - crumple.frames( frames, 1, 7, 8 ); + crumple.frames( frames, 0, 10, 11, 12 ); die = new Animation( 15, false ); - die.frames( frames, 7, 8, 8, 9, 10 ); + die.frames( frames, 0, 10, 11, 12, 13 ); play( idle ); } @@ -61,5 +63,13 @@ public class GhoulSprite extends MobSprite { } play(crumple); } - + + @Override + public void die() { + if (curAnim == crumple){ + //causes the sprite to not rise then fall again when dieing. + die.frames[0] = die.frames[1] = die.frames[2] = die.frames[3]; + } + super.die(); + } }