From 8481daf2527566091e561e3b043e66e309017162 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 11 Dec 2014 22:27:32 -0500
Subject: [PATCH] v0.2.3: added full attack and death animations to ghost
 sprite.

---
 assets/ghost.png                               | Bin 1130 -> 512 bytes
 .../items/artifacts/DriedRose.java             |  11 +++++++----
 .../sprites/GhostSprite.java                   |   9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/assets/ghost.png b/assets/ghost.png
index a9ffadbcde922c8ecfb27392b03563b8ce2542cc..fe10e7977381266ecd4e83fd7877f93ce9109ee2 100644
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq004jh000mO1^@s6-dJ~t00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-V6)_5gl1ybk+a>0gXvS
zK~!ko?OE*(gCGpFX3q-G1TV{eY%GoGH;CI}6B9*Fpm#uvTWf8*^72}1EzPKN+shzA
z!qg4`xX1^9Dv^xe_xsy;dk|&Z?9rSV!f8ZO^$wVFs3(fR+McDaR)MX?jR=5stU~5=
z944|4o*=IPz-KGL_nL^b_5?DD6*CF<!CG)$+nMr$muAN@ZNVikPTJEk;g0RhH9m^O
z{%njlit=p5mf0)7KH0IS;ku(Kha&<rUMWrx&h&uwYTJzgS~kQ09$eCJTCj({-wDhE
zPS3%m)r!l?vlW|X3jhR%m0+V9u5#M|hwHPNi32zhY8bISK}=EH<_$ha0#>g8su0CX
z1V(UG$r?<9^<)oG;aKrhA3Z6nM*wF8fz_C@9qUDLrW8>dDD_?|lfJ3d<FJ<UV;umf
z79uI!s)L~9JOc>h-l^Mgp6qeXmF-1vXC7!#0!RVkr-{Z(hSxd2LgK2EOzt4)>xmzk
z87pzC`xwbp@s+;)XVAar<*V(deg@sP_#o)E|F<Wc|0a_HPGI~10000<MNUMnLSTYo
CiQpvw

literal 1130
zcmbVLO=#0l91jX^Ooqacp?G-4o0ujqP1+=^N}DuVwR3ibO;9vVUe~ZCFD7p`od_~f
z@#F^z>P7G*qJq1MDCouGCV21zc96ji;zb2N5MQ=-dKexIB<~}?-|zo@acFQ)Z_kz<
zhGBY3dyNWR0ev@iucO~4bNVn{Hk0Bg8OC+ev_iz>9b7}8<XK~=f-I+X;w2hjn6(YJ
zI!Z>%2Q(XdDJ#LGVlSX<h8fr$2bMjK2&kbk*Uzz^9zSJ)>*UxGxh#|e9W~s&Qz06j
z8m!t=<F@LsyLW+sSfc_SA{L0f2|v=}9J{2e(S35wvtS8A#&hhlQ={b}pyLn$IVE$p
z040!BQ&5JI0(SyYfN5Sx^DxapQ4>@R%AozQ)LQ7&wTfZ3ZP8PXZ4eS@Jl||KQ_XY=
zhhsccRh1V+UKBZs;G&jKteEqo?HvUJMRw>0#Kk^H6s;PbBsrFPx*UQRl*=o^e$-AB
zO&K3s0S{9G?|DgFOX!GH&>uHeMMu?EfcOfE@MLJydepaf$TWBVHk1IVH`>9_rA4tO
z3~Wz&$R{Nu$I?G3$8|KJn1NYAFbY}KEQ%23mAs;eW;SCQ#f+)T9gWqv5b9||&&pCk
zmmw^sRY_EJMHgi~qhtly>~KqdL@eJ%9lI{I+vZCD<Z60|EP}%-#uJ?m7;0dGqXrIu
zJ}iL|*LQF;N{X`_tARrIBy!9UdtfQMn!Ad1*_Q3PB`Tbgh88Cysm|51b%_%cBsiiX
z)r6YGw)xKgWR0f|@kx99)h?YY+Jnh<rTOV$WqgoNXC|b>G5_ewJvvx7N=CjKzxi<e
zea|z{eJ=WZ|I2}IGv3JaTMHYE{=Vr=r^hmvdZ#`uI!6`*r~aV()S=m)6RmA?TWf~~
zcjnigX%=o@528C=ch#KvCEVY4wXb@%tFU$8@V*7tc+t1z!n^+Ynfue-I~HaFeNAKH
zX6x9sAJ?AEy?XuqvHFoM?D?pd_V>?z?ceZZpLuiPZP(9VI9@L>m-VYh=gz<Llj$!N
L2aSh?<I}$Z-3D=a

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
index 19b66ed0c..f039c884d 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
@@ -10,9 +10,11 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.NPC;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShaftParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.GhostSprite;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.WraithSprite;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -76,7 +78,8 @@ public class DriedRose extends Artifact {
 
 
                     GameScene.add(ghost, 1f);
-                    CellEmitter.get(ghost.pos).start(Speck.factory(Speck.LIGHT), 0.2f, 3);
+                    CellEmitter.get(ghost.pos).start( ShaftParticle.FACTORY, 0.3f, 4 );
+                    CellEmitter.get(ghost.pos).start( Speck.factory(Speck.LIGHT), 0.2f, 3 );
 
                     hero.spend(1f);
                     hero.busy();
@@ -146,7 +149,7 @@ public class DriedRose extends Artifact {
 
         {
             name = "sad ghost";
-            spriteClass = WraithSprite.class;
+            spriteClass = GhostSprite.class;
 
             flying = true;
 
@@ -219,7 +222,7 @@ public class DriedRose extends Artifact {
     //This is a bunch strings & string arrays, used in all of the sad ghost's voice lines.
     //************************************************************************************
 
-    public static final String GHOST_HELLO = "Hello again " + Dungeon.hero.className() + ".";
+    //public static final String GHOST_HELLO = "Hello again " + Dungeon.hero.className() + ".";
 
     //enum, for clarity.
     public static enum DEPTHS{
@@ -344,7 +347,7 @@ public class DriedRose extends Artifact {
     };
 
     public static final String[] GHOST_VOICE_HEROKILLED = {
-                    Dungeon.hero.curAction + ", nooo...",
+                    ", nooo...",
                     "no...",
                     "I couldn't help them..."
     };
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java
index f74d06762..b772456cb 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GhostSprite.java
@@ -40,9 +40,12 @@ public class GhostSprite extends MobSprite {
 		
 		run = new Animation( 10, true );
 		run.frames( frames, 0, 1 );
-		
-		die = new Animation( 20, false );
-		die.frames( frames, 0 );
+
+        attack = new Animation( 10, false );
+        attack.frames( frames, 0, 2, 3 );
+
+        die = new Animation( 8, false );
+        die.frames( frames, 0, 4, 5, 6, 7 );
 		
 		play( idle );
 	}