From 1c48866338b448fa55ba4d7e579d65f4276799ba Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Mon, 29 Sep 2014 01:16:40 -0400
Subject: [PATCH] V0.2.1 : Initial Improvements to Goo's sprite

---
 assets/goo.png                                | Bin 857 -> 1854 bytes
 .../actors/mobs/Goo.java                      |  17 ++++++++--
 .../sprites/GooSprite.java                    |  29 ++++++++++++++----
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/assets/goo.png b/assets/goo.png
index 5e07a35a85a02ce64506654ce8d083fde6660d24..de000b3fe27e16ffc87632b67f53c57cf601ddc3 100644
GIT binary patch
delta 1839
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

delta 834
zcmV-I1HJsd4%r5fB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0008}
zNkl<Zc-rh*OOC=Y44sTda0gbbdI(l<4UWQrI0q{Z!HN}!VAHA5xH860oF;{#_(@2m
zw3eIrJ%37Q+xDv_LI_`DfciO~&!bLXuh#(AkLAldq4xedrhkQy3J^{<B-g710Q^}l
zm$&2XcH95H-|ze5^ZD#T-~!+%5db7Ul1(GmGX+2+za#?a>${6UiomJoashB;3jh+0
zlZ<CsNd&Zjq#2x76c$Hkvssk<79YX4rfJ&K=@j0H{8G!q*FLrGDQIm~s^W7@Q~-9n
zU6f!}0pLNLs(&c7Kt=)3$j`HXtO~G-R*FbtRu#PE;q8vJ{*pg2@>0_CeMt$uV;cC$
zxmY8aCA(-91qNOhXl+m!MYBKL6RS)(;67>_0(rC9w1>k%3~DXV={<0aoO>quQ|q78
z>R4tebp6J9R>waR01OOHG$}B;Qu;<LjWqOptZX;*{(nV6)Mc=TbL;iG_ni}m3j`s2
zpEa$mODXxa=cU3%*V!ThR`SQz&oK>rr!qc%O2KW^u$jv(JUAYYAOI)=J#i!<1M<VQ
zm&@f=i9Cb+Rse~?Cm?j~%#Y|q-dW-;Kw^;41z+rKLM)T<ib5(iYiA&^hrR%TXck4n
z10SLCz<+9p_&EBe&^5D&0Bxb9iY8_E1!C;@C*VV*wrLvk&4dhhlXh0Vn}hk!UJ&})
z-pL&QgbWsVH30T-5V=~dZk0hsHXK|DP{DzAgPzOX2flvNz%yqbq-X8y_zd6^1i(r%
zPAp9Ta)Q|+09GMTGWCN1r0hj9ez2DCKyqk1_<uBAJ3mD5xEON*NbPN^vT*_UAOR?`
zBME>dm}vkD0w9t$*GFw8P-=^k?5};e1I!Nqi^byMeB^ar(Ozf*P$NzpE&ziBKoWse
zSzSp0r0i8>kN%+uUky_7Yi)$|N>BO6Vr>B!YBR*D8^^Q+U`UVzA<%}BH)#EGX#kID
z4?Euu0CESG-Mx3;nGm!!o|WxOJH(y~zy}C`!{KlNa5x+vf?oj!0BlmnNAi@M<p2Nx
M07*qoM6N<$f`7w(0ssI2

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
index 714f1d026..b15992892 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
@@ -108,8 +108,21 @@ public class Goo extends Mob {
 	@Override
 	protected boolean doAttack( Char enemy ) {		
 		if (pumpedUp || Random.Int( 3 ) > 0) {
-		
-			return super.doAttack( enemy );
+
+            boolean visible = Dungeon.visible[pos];
+
+            if (visible) {
+                if (pumpedUp)
+                    ((GooSprite)sprite).pumpAttack();
+                else
+                    sprite.attack( enemy.pos );
+            } else {
+                attack( enemy );
+            }
+
+            spend( attackDelay() );
+
+            return !visible;
 
 		} else {
 			
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java
index ef6deecbc..7a19cd54e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java
@@ -23,6 +23,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
 public class GooSprite extends MobSprite {
 	
 	private Animation pump;
+    private Animation pumpAttack;
 	
 	public GooSprite() {
 		super();
@@ -32,19 +33,22 @@ public class GooSprite extends MobSprite {
 		TextureFilm frames = new TextureFilm( texture, 20, 14 );
 		
 		idle = new Animation( 10, true );
-		idle.frames( frames, 0, 1 );
+		idle.frames( frames, 2, 1, 0, 0, 1 );
 		
-		run = new Animation( 10, true );
-		run.frames( frames, 0, 1 );
+		run = new Animation( 15, true );
+		run.frames( frames, 3, 2, 1, 2 );
 		
 		pump = new Animation( 20, true );
-		pump.frames( frames, 0, 1 );
+		pump.frames( frames, 4, 3, 2, 1, 0 );
+
+        pumpAttack = new Animation ( 20, false );
+        pumpAttack.frames( frames, 4, 3, 2, 1, 0, 7);
 		
 		attack = new Animation( 10, false );
-		attack.frames( frames, 5, 0, 6 );
+		attack.frames( frames, 8, 9, 10 );
 		
 		die = new Animation( 10, false );
-		die.frames( frames, 2, 3, 4 );
+		die.frames( frames, 5, 6, 7 );
 		
 		play( idle );
 	}
@@ -52,9 +56,22 @@ public class GooSprite extends MobSprite {
 	public void pumpUp() {
 		play( pump );
 	}
+
+    public void pumpAttack() { play( pumpAttack ); }
 	
 	@Override
 	public int blood() {
 		return 0xFF000000;
 	}
+
+    @Override
+    public void onComplete( Animation anim ) {
+        super.onComplete(anim);
+
+        if (anim == pumpAttack) {
+
+            idle();
+            ch.onAttackComplete();
+        }
+    }
 }