From 173b516c1d8c152ac7942a2f2f1aa19e654ffb83 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Tue, 18 Nov 2014 17:04:55 -0800
Subject: [PATCH] tweaked animation.

---
 desktop/resources/ego/grow.png               | Bin 2291 -> 2626 bytes
 desktop/resources/ego/grow.pxa/1.pxi         | Bin 264078 -> 264078 bytes
 desktop/resources/ego/grow.pxa/2.pxi         | Bin 264078 -> 264078 bytes
 desktop/resources/ego/grow.pxa/3.pxi         | Bin 264078 -> 264078 bytes
 desktop/resources/ego/grow.pxa/CelData.plist |   4 ++++
 desktop/src-common/advent/screens/scene.clj  |   3 +--
 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/desktop/resources/ego/grow.png b/desktop/resources/ego/grow.png
index e107234b25593bf372f526aebac93793e4d32389..c0e567873392e64c30e97181e69c5391e095f228 100644
GIT binary patch
delta 1573
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
Xiv!x~B10TC00000NkvXXu0mjf9!dX3

delta 1236
zcmV;_1S|W(6!Q@wiBL{Q4GJ0x0000DNk~Le0000;0000a2nGNE04m#jX0ahM1b+mI
zNkl<ZXa((8TZoNO6kcZ<C1y+wa)fvo5)U#MqD(Xs<HeL~E)OmlO3LMdrX)4x0Y!==
z)FAhGafu}5GH620B<5izWW*%7q)d+U{b$y1{rmD?&K#Vh*>(EYUjJI(Uh6yG*?S+N
ze>W1DSUT~&Gb1>!?@c!1<VP(MKz~E0HpHUlb;TQth>DddQjTou@78nee2cM+Py~em
zGN8MQ8{WYcisT?NV!iW2;oyq}3A5*ykR;<?+fS#wqZd9JaWrSTKne*#<b)z9h#Utb
z1VQo(mUW(MET9FYUmVx!y&W1CT9MrWk_#v8tRo0YdDGF44zHR(`SCKPTz{e=m0OJj
zX+JR&P*s({+q+dva>txHJdY}?Q{=3yJ4i=s*HNEg(`fP9WsYs@Bu{+-AZ8gr7yx2h
zjn9>N<@j<(Iq2o|p%ZS|Aj)rO3i1L?qi?V7I{86Bev4$oyF~MMqByzzpeF9kuRcvd
z4p3Jz1Mt%iD4XA5Gp@PcM1P&_58X0<+`2>f1Pu>C-2qY-!iHzu^prT?DUR^4$G9KR
z_1kSRe6Tq)Nxf!HCwws2XTmTx@#e;^1d`O<9=_qrFB)@9;7Om~X%-sC@3@ab;J~>h
ziAQ5bIi<$N^ma?0c>Wo^zuaQ1$LK_6>$W*ga}p>5Iex^rg(VH^`hN)WBgO*~a2HyC
zDelzsyy-JNeK?qyBw$QxenE>?r0zlos@t`CGzTwSQP($d<V!hE9UvRaZcxeyOAe<Q
zYY0n@3t}M&<bW7CK$0Be%HBHD(PIlqB}qHQ5XqpsCpWq{;|h|Cl=V&Ato>?is4Flk
zIWE35qLL$XrOkavAAiVULR$B4rV$(VII2R-=&>m!$#~BujTb5?*uPe@CYfC5<l(&p
z$R%4<&ZjA-obo{!K4*><XzgeONjb6&mSJN7_Gw62?qG6QJt(*6!IHqLHG)hTkRnF@
zheB75rnqeNLH)cDGf{X#L2_=Y-%3!^mDF*FBq%5s2mfSL)qgW7tRS9Cb#cE|f;tEM
z-uYQUoRo`CkOUR+euF0zgeQI(CUVfHMi8?pNr<2zzY|VEvTclya`^+0EgshrQ$NUI
zKR@9!ozNOV2>jm$lK>U*Y0Qe@r>*D61j$>d1=OetORUvxQ-w9b@`5k7OcKIy0p>YB
z<)v6cX#@cf!G9(q9`9J>{=t(V20QCWno)3-ikqL%mWEQN2UZTAetj8l()=&C`1n3g
z??Y-wW~6Zs=wF_ow~fc=Q8CS<8MqfV6P53;w^m_oc;V8Qo*Q%H&3bBix6>MLSizHT
zcpnNY=x;~ZpJK_N?TONg<ysl&3&Yl%Q9%;r?8%gBuz!H`=eo_r1offqK{A2Kk-l!&
zQZdqw1Su6G?H~|UJyJ2!R&jg@QiF4O9#%1GkAIS&v{fRDjG_{mr`mohQDf!&PZA{8
z$qKSqMNzhnzeSKFE2r!pg3|rEX2pv<$2#V!FC?}HCz*q}>I;NY??afYzCe&<fZ9Xa
yeWjhKS1FkmAu3F|gs3<f>`R62nfEYYVBi;8;OhW3JL_)%0000<MNUMnLSTX_G&=nN

diff --git a/desktop/resources/ego/grow.pxa/1.pxi b/desktop/resources/ego/grow.pxa/1.pxi
index 787e225a1e939851ae446859f8eeb32059306b45..359bd30a7a2ef044335827b5f637b25201b966a1 100644
GIT binary patch
delta 1309
zcmd6lu}i~H5XOxsQYdJ}iV*}IA~<BIASk#v2t^m6qKliG;8F*{MI0))*scz4{sV%7
zgQG<p96EFe*daoN4ubv#eZDWrXI?_w91I+H@9z8E-Aht$6zYw_Y0at)-pNHZcXc?f
zx=%~$wrYJz5fL)9sN%~kb*#YeZH)znSo0lm%qrvZ>da3+%d#%D(i4|Fs&Cg7_5N_4
zFequ7XiJIxs0In@(|c5ip<d6AG!3d1Q&d9Dn98Hdc9W!@)sjWb!W_;rw^RMTf*J-A
zHUD@6Z{S6iu?Y+rQiwsNHzc`smIwVD)8<@m2{q$^=$Y7b6fE2tbFxU}NWhbtT3HCm
z63DcfL?-28Z<9jb-zdFdTjmdLYy}FQhBJ+u1!|XS67bICNkAfo8h429q5HE>mQSfY
zak5nCkG#>hBhyqO%a~s8+Km;M!U}tZ3RdW;g8w5$Pi%e<vwJi_SNTWo?7k|~^!yJg
pni<5{KUv||O;(tN|3?+OY>y`XN1S2$PCdyPCqI9`Zw<{2e*?e2D%=17

delta 1299
zcmeC{7wGF3XlP+<VcNpnTR6Fak)QGZ=0e8L%)I{@7#QFfD0H7$7S2VMg0aC$6!9tn
zDIFflo-<40^eNDX1f=gXtK!rR3r=WQU1!!MN-0bm(DL)lh9qf$+BB*Sk=&s{a+z6^
z=#T^k{B_cl-zGj4+-Ih4#v+)L9}~{(k1?|VFxVhrh&>A+OTT6oMGjgVQXpXv04oI=
eilhr7L6p>ch+Qxps0Oma%znVVJ(H0|l??zcPiZLt

diff --git a/desktop/resources/ego/grow.pxa/2.pxi b/desktop/resources/ego/grow.pxa/2.pxi
index eb2eefa82a47a7d101c5eb0fc120f09742233a3d..787e225a1e939851ae446859f8eeb32059306b45 100644
GIT binary patch
delta 1298
zcmeC{7wGF3XlP+<VcNnxvyg>>f#Lt=LdMU`y#GN=7zPU6XO@L?VZz8XScxKDB_QR)
zL)mj?Nt`|f`jCM1eP&ghy3vC4I<qcON@3c7mY-)fBuNW2Rz|fUk~=g=E;DNq9g@I+
zzfPL++r+1W`^?nMSOjzOW5SvJF=iG31{)*{v1b8f>DSDn$U%!k3M32yV5LAqk#s>M
ah?05_u?waH)j(F5*$=q4XEL&=vH<|V#b^}(

delta 1397
zcmeC{7wGF3XlP+<VcNnxvykQgk3au67czce767r3F;MglvjVaRHa1w53N{&Zv0<t5
z39}5kKau%BKND7Qhgkzz4?Z@~yerHG_*7t%1L``%Y=TXOkl3hBB0}f_vkoCu$nxMg
zBvr=^lG4Z>W?JM(V#<OCM3op1Fmnw95WqqS7(!Tb4VsD<%n~s5AR4zUNCpI8s)42>
d>4nIVAo~VlFH9eX$s9=bJmB7*$;hJ01^~MXr2PN@

diff --git a/desktop/resources/ego/grow.pxa/3.pxi b/desktop/resources/ego/grow.pxa/3.pxi
index 5caea1413cc25f1ed2ee2849d02ac9fb3440f2b8..eb2eefa82a47a7d101c5eb0fc120f09742233a3d 100644
GIT binary patch
delta 1397
zcmeC{7wGF3XlP+<VcNnxvykQgk3au67czce767r3F;MglvjVaRHa1w53N{&Zv0<t5
z39}5kKau%BKND7Qhgkzz4?Z@~yerHG_*7t%1L``%Y=TXOkl3hBB0}f_vkoCu$nxMg
zBvr=^lG4Z>W?JM(V#<OCM3op1Fmnw95WqqS7(!Tb4VsD<%n~s5AR4zUNCpI8s)42>
d>4nIVAo~VlFH9eX$s9=bJmB7*$;hJ01^~MXr2PN@

delta 1397
zcmbW0u}T9$5QcM35Fv#pBAyU1#R(}a6a)(!3n5@5DA?H92{y5_5sL^`NiEp<0)m2t
zrC?=Yks^>3Cqzgg=o_s2@A2P`cbdY3VRvV~Z)PuC+MTf73C~+WYvNw6n&sj1y18ox
zUlLxQ%o-gwJCGXc$Z{odxHn@Ej*6MhuZ_*ctfwd8q4IXKYu+C(3*kxhBLxHWXYa|`
z*n5%`stA(o@5$tJyD*WI?}=&oJHphq?KzYx98TALkV}cVo!EJBk!2w7?o~g&jSOPz
zqGB`+183GP-IW!Rpc$ZaFb~#RFS7QRMKYd0%jR?D?<VKa#F=}nI2X;l1(Gvq7frso
zwz<d3dER6e71)}_9y4_gTzXq=(#FbQePLrY%USbPmRZSLdJZjXbW>xTg-*)oNu9ko
zgWm@8ppmov2NLfe^bG<Te3h^`k6-Ce5?NYY@mnDrS;LMMy(%h^0>vs<+bfZ(_OUP7
zM-ldag_EXo#7Ls?Rr>JosP5MNclAS}Ml|j2oAxc0a7NfS8_AS9C6$Mxpu9Bs4Lz`<
AZ~y=R

diff --git a/desktop/resources/ego/grow.pxa/CelData.plist b/desktop/resources/ego/grow.pxa/CelData.plist
index f0b74d60..1ff35422 100644
--- a/desktop/resources/ego/grow.pxa/CelData.plist
+++ b/desktop/resources/ego/grow.pxa/CelData.plist
@@ -18,5 +18,9 @@
 		<key>duration</key>
 		<real>1</real>
 	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
 </array>
 </plist>
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index beb4f8bc..b0def159 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -108,7 +108,7 @@
                                      (texture  (aget fire-sheet 0 i))))
         fire-3-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 8 9 10 11 2 2 2 2 2 2 2 2 0]]
                                      (texture  (aget fire-sheet 0 i)))) 
-        grow (animation 0.1 (for [i [0 2 0 0  0 0 2 0 0 0 2 2 0 0 0 1 1 0 0 1 0 0 1 0 1 0 1 0 1 0 1 0 1 2 1 2 1 2 1 2 1 3 2 3 2 3 2 3]]
+        grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0  0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]]
                               (texture (aget grow-sheet 0 i)))) 
         ego {:right {:walk walk-right
                      :stand stand-anim
@@ -153,7 +153,6 @@
                              items/flask-1-with-cream-of-mushroom (actions/get-script entities (actions/talk entities :ego "Blegh! Gross!"))
                              items/flask-1-strength (actions/get-script entities
                                                                         (actions/talk entities :ego "I'll just take a sip!")
-                                                                        (actions/talk entities :ego "Woah! I feel something!!")
                                                                         (actions/play-animation entities :ego :grow :stop? false))
                              items/recipe (actions/get-script entities (actions/do-dialogue entities
                                                                                             :ego "The recipe says:"