From d161328e1ac2b64e9a5c2ab3c609d14d4dcf1cb9 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sat, 15 Nov 2014 08:55:38 -0800 Subject: [PATCH 1/4] need start with grass to succeed. --- desktop/src-common/advent/screens/scene.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 05925a38..a173f230 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -227,7 +227,7 @@ :inside-fangald (make-music "inside-fangald.ogg")} :state {:object nil :active? true - :inventory [items/flask-1-strength] + :inventory [items/grass] :clues #{} :mints-eaten 0} :actions {:object nil From e7081b3ae4a1f83837e3ab4d5cd3ef29b0cf9e16 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Tue, 18 Nov 2014 16:54:06 -0800 Subject: [PATCH 2/4] added winning arm wrestling. --- desktop/resources/cursor.png | Bin 5347 -> 5562 bytes desktop/src-common/advent/screens/items.clj | 2 ++ .../advent/screens/rooms/inside_cafeteria.clj | 16 +++++++++++++++- desktop/src-common/advent/screens/scene.clj | 2 +- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 782a841aef7fdd609e5a5ab9ee1d73c8ad21c7e7..20ebbf60397d2b1f53e6ad5e49c14e701ccbc451 100644 GIT binary patch delta 4498 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

%wr<_7wLjXkM_qq+(=DOCwDM8@$J+9cGycR` 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 screen {:x (:input-x screen) :y (:input-y screen)})] (println (:input-x screen) (:input-y screen) "->" x y))) -(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal]) (defn cursor [filename which] (let [scale 2 From 173b516c1d8c152ac7942a2f2f1aa19e654ffb83 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Tue, 18 Nov 2014 17:04:55 -0800 Subject: [PATCH 3/4] 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 zcmV+=2HN@a5yBK9iBL{Q4GJ0x0000DNk~Le000150000a2nGNE011FCv#}vE1b+qD zNklzV>a-gT3(P zo_p>&zkAN_op;}TqtyS{w%mVy^?#@R9o3YVOa-rcx{?ZxEx)F?NdxH8Wd~yU!KZ)w zh`ZDcH@B*|7_M_&&`F6E53zJ|n`Yz_;h=zsiN5=VlRlihG_c7MND^kVhaNs46!!Gl ze{{U=B1jLyn3(ej$Td@%WTUfw&-gd4FT5e}Ax` zZfP5HhCMHy>Kh*)U(dOKK8$3z`f||m!bo;NB2=>}FZjybOx5h*$!ym)AQO_ia5~!{eQ_mb;E%Q8S-D|mCdfu^rO$?(B4X^w4Odw65Iq?neW9jBGhEeW&-V9$WK=Ln z#spr3cyTNp{$721@M70i6Yyd&zFaiBz#)!qQIBsyK)XIY+Jp;R2cB58v#-0>xgb*q zS#QQ9j_rP?3Mc)<0Ds-Q;)g~b9T-~z$R-9)8$Z6Wwj?nwys6cx=KQa-)bW9@ZP-B- zZ}ZVZ3Oq~4xeL`!JVqrDxOYk*NsuoKgMt`xYW~wZJZpv! z9YnB%^z847VXxXU z*6HrG0E*j)LBAjjLp4Vw8St?6CFe}U_zwd~tq2ElAg+K;QH_1%Li#d+B3WE+Vl z=yM%|F36HXZISkw)jhp`8WVC2g|Kk(EY&@QL%%4TC1!n+=bfYeU;4ebh=0 z!zLfn4zYu5w0|QTA5in}ecpZ7EL>c#Y-#U#8Dc^Q#a-$z^|)kVUIN(UFdPJmeHmBQ z8ViJR|9;KejtJs$z59BBQ*Q4gn&l4*%D7vQu>f^0f<=&alqC)cHf$Ld#KusQWL7hx zn*I50p~3lxHhJLDKm$2k$Yd9$lQ^)=8p+rK`NAU)=zmesa%|$kO7zf<`tb!$sKlhr zgad-JL^8JmKAGf#~ShGp*+XYKnfZu@;dC=IKr&I) zJhHNa*?*fo4Ha!Oq+WgvQ8z`su}b5vWvkM-I6Uif_33;ly2cs_jW|*gC#F zS~`#%sY@cKg)_0XtY9g}3Qbn9l*2&uYL*o&WgRDwXx(^vtW?wr*15_8(TS^8CL5<} zrFx$(2UV?ZE5}(NTE^QDq_e8yY>8PTT9TeAd79`meY;k-%=R4TFxGWZV$^+-;?&mi z#4|D0b)g~Y=V^>}T_{M+Aho6zo?rlwkXRij#k_Rr>G3oJ8DQXF Xiv!x~B10TC00000NkvXXu0mjf9!dX3 delta 1236 zcmV;_1S|W(6!Q@wiBL{Q4GJ0x0000DNk~Le0000;0000a2nGNE04m#jX0ahM1b+mI zNkl(EYUjJI(Uh6yG*?S+N ze>W1DSUT~&Gb1>!?@c!1DddQjTou@78nee2cM+Py~em zGN8MQ8{WYcisT?NV!iW2;oyq}3A5*ykR;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?is4Flk zIWE35qLL$XrOkavAAiVULR$B4rV$(VII2R-=&>m!$#~BujTb5?*uPe@CYfC5jm$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?TONgI;NY??afYzCe&`R62nfEYYVBi;8;OhW3JL_)%0000da3+%d#%D(i4|Fs&Cg7_5N_4 zFequ7XiJIxs0In@(|c5ipmQSfY zak5nCkG#>hBhyqO%a~s8+Km;M!U}tZ3RdW;g8w5$Pi%ey`XN1S2$PCdyPCqI9`Zw<{2e*?e2D%=17 delta 1299 zcmeC{7wGF3XlP+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+>f#Lt=LdMU`y#GN=7zPU6XO@L?VZz8XScxKDB_QR) zL)mj?Nt`|f`jCM1eP&ghy3vC4IDSDn$U%!k3M32yV5LAqk#s>M ah?05_u?waH)j(F5*$=q4XEL&=vH<|V#b^}( delta 1397 zcmeC{7wGF3XlP+W?JM(V# 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+W?JM(V# 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?xTg-*)oNu9ko zgWm@8ppmov2NLfe^bGvs<+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 @@ duration 1 + + duration + 1 + 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:" From 97f2a05be9018316df5d15021d734f5b5428f19f Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Tue, 18 Nov 2014 17:05:01 -0800 Subject: [PATCH 4/4] tweaked animation. --- desktop/resources/ego/grow.pxa/4.pxi | Bin 0 -> 264078 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 desktop/resources/ego/grow.pxa/4.pxi diff --git a/desktop/resources/ego/grow.pxa/4.pxi b/desktop/resources/ego/grow.pxa/4.pxi new file mode 100644 index 0000000000000000000000000000000000000000..5caea1413cc25f1ed2ee2849d02ac9fb3440f2b8 GIT binary patch literal 264078 zcmeI(eQaHI83*vLEiZ$@?luN&ybV_H1(+R^;R`CTL3vwO>9%$-8Mp1Bz2olQaeKE} z5OM@TPy_-kQl3n0) zm+#KG=iK}IJ?C@#oO8OhgPY5xv3gh6vol)T+V|S~fr)|6tx0XHRILnjRtGmGL-nzB zoyFSFXelj@xJ7c?&u})V1WKWuN@iX{VoY_W3J&K7B!7e{r;O zd40>(*Iaw!SH61J*X~=>S=mx9|7PZX`*$30;H<*zIdczMTP}{r6a#}J%d3@3OCuL; zt|ePb$+o`I70KGpp>lC-Z1qU3G~EAcA!%!RaN3a`n;u7)`)oh{gcH+!(?U8sowKH1Dko!Wwv~qKqiaW# z(#U8%CSN-Lfe)uM(^=UNr+n-a6Ce3#x?j5g#Oza}zys0)2g=oo1|Q2 z5FpSXfxPdt-p`Zu{M6*zv)49gTEh?^u!jZStoQSN?>yw{UH1g}eZU?r+4KYmG)Q22 z|L52Iy#KT3`Fgg@o;PS}!w?{_hXtng|McF^`aQq?=jQ&*2<%~jytlLdp4$I;?`PNld_8~d9xmDR1PC-pAn)n?{yx7S$e-u? z=YM?3u73w;(A0(@K%fZ(@*dCc0jBnTwl7QG|4mS?5(p4zpg`W^dEZaH2guJ2`oDqT zh9b~p0#nZcS^wuh_m^+a`aj#&WMwOd0D%Sxti9;BJF;Ybp8f7mc0Z6`|MTAkYS2`M zAwZzX1oHmRdOcsym)ZXVWNEUJl|z6)g9Nhv&ij4pQtvki*f0c|SYUep=Y5|qo49nP z5g_mu1*Tr}v-NB^z5f$KPy}Rze7GeWfEwBz|?zyY&iYj08~Q|c!vn& z_W*gh`ahSjB=GJR(EsoL&)5+XcryY0|7J3_6L@b3bRRnFH9zN*J)geqy&>T!3B30N z^!t17Gk3%U2oNAZfB*pk?|y-&m#;YUtP4Ab%Ehs62;)w`iE zch{?S54C;OncWwzES4$@&o7QAwMD0`+ld@+S-qyecVKes#MuDp!6Sx-lS@a|4aN-1tL18K%~1AtdU$$hdRV&PnbO9N%gUSLX!}P?^(2@k zU(~m`IFy{Rq@~c7&W}T>ZjKjB?wF`{XK$&MH?8biyexm5(vr^KP?*yf?4!x>!rc|d zd$(?jJ-q{y`^I{v7#B`$rClM4dC{M&?BhiOi226*)F?LS#u~Y2@Tc)IZ~sk<%l~BWFg= zj+`4gKhhKFkF1XjwY1MDMJkc;$Tg8$BDY2EiQFG~Eb`sRR?uy(Uc_8vg zVa#*A*a#rLsk&Th7A~!~Ejl_Iy zF<)EE*Y?fGqmekSwivhVrO01f+S_MD_Kw6@?MFtIMox{K7g-Y-jD%r(5*dkvW&7sH ywUO&0H%D%d#IdyB7kMxe$J73u$oC^Zjyx54CX#)9#3Sb1`N+P$c0bzNU-%!aZeo4_ literal 0 HcmV?d00001