From 30a5ffd91a4e5f5ce01f7b7a700d1bc009edc4a5 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Thu, 12 Feb 2015 20:44:37 -0800 Subject: [PATCH] starting on a good sequence for blergh fight. --- desktop/blergh.edn | 1 + desktop/resources/ego/Untitled.png | Bin 2460 -> 4547 bytes desktop/resources/ego/pant.png | Bin 0 -> 2057 bytes desktop/resources/ego/pant.pxa/0.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/pant.pxa/1.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/pant.pxa/CelData.plist | 14 +++ desktop/resources/ego/swing.png | Bin 3203 -> 4597 bytes desktop/resources/ego/swing.pxa/0.pxi | Bin 264071 -> 264078 bytes desktop/resources/ego/swing.pxa/1.pxi | Bin 264071 -> 264078 bytes desktop/resources/ego/swing.pxa/2.pxi | Bin 264071 -> 264078 bytes desktop/resources/ego/swing.pxa/3.pxi | Bin 264071 -> 264078 bytes desktop/resources/ego/swing.pxa/4.pxi | Bin 264071 -> 264078 bytes desktop/resources/ego/swing.pxa/5.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/swing.pxa/6.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/swing.pxa/7.pxi | Bin 0 -> 526471 bytes desktop/resources/ego/swing.pxa/CelData.plist | 12 +++ desktop/resources/white.png | Bin 0 -> 1178 bytes desktop/src-common/advent/actions.clj | 6 +- .../src-common/advent/screens/rooms/space.clj | 92 +++++++++++++++++- desktop/src-common/advent/screens/scene.clj | 17 +++- 20 files changed, 132 insertions(+), 10 deletions(-) create mode 100644 desktop/blergh.edn create mode 100644 desktop/resources/ego/pant.png create mode 100644 desktop/resources/ego/pant.pxa/0.pxi create mode 100644 desktop/resources/ego/pant.pxa/1.pxi create mode 100644 desktop/resources/ego/pant.pxa/CelData.plist create mode 100644 desktop/resources/ego/swing.pxa/5.pxi create mode 100644 desktop/resources/ego/swing.pxa/6.pxi create mode 100644 desktop/resources/ego/swing.pxa/7.pxi create mode 100644 desktop/resources/white.png diff --git a/desktop/blergh.edn b/desktop/blergh.edn new file mode 100644 index 00000000..e54d9fee --- /dev/null +++ b/desktop/blergh.edn @@ -0,0 +1 @@ +{:active? true, :convinced-wizard? true, :time :day, :inventory [:ladder :glass-eye :recipe :grass :medal :kiss :trophy :flask-1-strength :sword], :wizard-left? false, :clues #{}, :current-riddle :wool, :last-room :space, :wants-toy true, :mints-eaten 0, :object nil, :obtained-items #{:kiss :medal :sword :flask-1 :grass :ladder :trophy}} \ No newline at end of file diff --git a/desktop/resources/ego/Untitled.png b/desktop/resources/ego/Untitled.png index fd2e23ae523e36997b447ca46d3e5a282fed7891..e4558c5c9d1c5af45f3ffb5c544d0dac58b2703b 100644 GIT binary patch delta 3510 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 bFwmx2EE8~mja0fQE)~F{J)O&)LQ?(({nVVx diff --git a/desktop/resources/ego/pant.png b/desktop/resources/ego/pant.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1c778e95f526812a649c9e86d8101f4e7f4fc7 GIT binary patch literal 2057 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 literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/pant.pxa/1.pxi b/desktop/resources/ego/pant.pxa/1.pxi new file mode 100644 index 0000000000000000000000000000000000000000..2b11eb93ca80a440b6d6c819f923bce119fa0e1c GIT binary patch literal 264078 zcmeI(eT*D+83*v|-SJX-&}~cU3ooto@QqrpRH!c%DJ>iVy`Eg#yOv7byPMuEY@+K)N*{)vIky-97XRILnjRtK+6hU#Nm zJBziU(Nb*Q)LF0Yp4&3xmirzmyz;o?=P&Mjeb>r!&O85Y7p%STlFK*ryyJ?#{^Drm z-Ss^;+<4OmKk~7Uf8x`dJ1cw2<)6~E#=~POffJxvaVX$SsJ-= zcP-glO7``Yu1&Ud4wZ{zW1B{5rQ!Z(3Q1ejQ__y~tn?LywntCtSg>eYPv44XYP)}7 z+Lq4#*{L0;oqooWrLQ=1S$}nRai~-u-(1>N97#4+io25jy`{0zU^z)oPUolX>Aabb zopnmbD_^^!KZdy`86VsKs#m`zJtjRiJ#PQm%U_ospBBDXna<9JSpDX=PQ39==?Uqqi8*Vcz!TGx2Flf;Vm~Egn8pwU z2sEKUe&5e~Kf4ZO*MO&g@%_nbLbl$7Wh;pQfd&X<{h#-K*7I5N{?9)PG+-J-5FpTm z0$Kn6di>JoeCE%4-~GP{PnwblG)N%(yg&WV{@L~5@M}VYrZNlx0!=EA-RJW^2V~2< z|FiWbEm>Iv2sBV2>-qc|kbnNy{|y8-6oDocD1Uk3f%P}fn!N94J)bAr)}$pXivWQJ z2;{w=^?JVEx!{J$>p{M)0n-?Q0D&eH$a?%p$*%?3vI)yp5&;4Y5I9or=lB2l8#^bj z4Goya5CjM`p}>*)Ki{_KEh`UX*MKH0TS){6G(h0+UeDL_`@jBg0I(qlG_gS5^Z94} z{CT$2|4n@2lt!Qd0(sx(Oa0#fR6`IrN(A!0&zIBtKl@%#_8sBu{|X!>honpb1YV#( z*7sSDXF0t0^Uwd;cLB5B|Jv8Tq5of?sh1HrngsIi`%drw>=?4%&+h+g)~uOKb{+Un zIhu}Htpo^632eFYR|lr&NT2!h>%jEo^lQS@$kqrDXm)|=y`TLX;ESnw`t=}t{$k$m zwFC(K?*#Jx&ntMb{hz?82<6`0=p*^&DE|METGj*LJqkoCU)&owLw{C^2_FP#0XzxT_JKHL7E z_T{g!BtYQk7SQKM_xV#j0RjXF5FkK+0DQIaDr=ja7=fl7WM($=LRu zzV)S{dZ}6|*2X6;>K^Fn+c@9Amj!t~U1@nfZ{JFY43 zilglxE!C4?ntV~;?&45#;mVdmTe>I?rMf#_Fu7x*+MT_nR^GLtYsGo_V|7cqXh&gg zU$BoR!%L?sjQ8%{7khdKCijg`?fJrc#;?8Zz1Mdiac9u<4y@l(tye40qB*&DU_-Ss zZS(ftfvI746be0kTLNuewNkHD%jKkYWl!G~$=L2{WjLulHgtMNlD;pF{fu7DV z%f5K0JA-Q>8|QJ4+)Iw;d#yzWwpr@3^yL z*^g|G7=IYPFuuh@bZ3BXc5)Bg-PMi<}c#9eGz| zXJjmLZRDoN9g%w?_eSesWBeNnWMxxFc^CI&j3nGgmOCo1QmPb}bRz=Q@MEx_) zkF1TXi(C}BBywrw@<>mlKe9bC)Y3kq6sbhUBR59wh};#qH*#O(p~zPw-->)Y@^It_ zkzYohi2OeCm&o5E2U^-&TO%h#=10zsToUPzR3q<>j79cD_C;dO)|j*Pwn)s``q9We zk&j0{8M#05K;#>dZ$_eq)~KQNdyyYUeiC^+@|(z0k$*(~)zaQJFLG+6D{^t;wZ(jGF<;vkBM(O6xY}aewkIQhYH4qu5ji#zW3`_VSru6mxh%3dG8hTN z_9QYA3Cs4~k((knM{bYY9f@OU|8(SYkvN|AuSC8c`A+1K$YYW0=OZ35=fOwz^ELHo IZ~x`L0U-k-umAu6 literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/pant.pxa/CelData.plist b/desktop/resources/ego/pant.pxa/CelData.plist new file mode 100644 index 00000000..29c78f8b --- /dev/null +++ b/desktop/resources/ego/pant.pxa/CelData.plist @@ -0,0 +1,14 @@ + + + + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/ego/swing.png b/desktop/resources/ego/swing.png index f0175f3dd3688879b65cef9c378173e404be8ecc..bc93ff2c0ee35bfd679494028d800b2e8f673747 100644 GIT binary patch delta 3560 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 delta 2155 zcmV-x2$c8rBZCFH6Mxb=_KimKG>~m+%%bYp)UiBQfJMYi) zn>qh^&fJ&nGH1y(dgyS2Q|axQ-hah>ot|4OFd<~Rhxgo&h$m!x%rRtFlqro$f#d8@R}JK8gkAtlm~Wkg>a3HbpI{OqpgBZuZ!-JR*ub+ z=F8RAbkp>1;-KyOrkH!LJ8p}uiq2(O(!?WgniMi7=o52U9@tJ}LOUVQam=g8kJrm60yT`=*=-Lft^O`5k`7`>= z15Z3;^FCu$)RUz#^0zrTvdf%z>&=$skF5iR-BI9L$S~xK%Gyax9)H*-llH^1WObeE zLwUHVw12tbe0|8~N<(>EwnFNhf?hmtk&Vm{@q2IgnZJJAZEZu?xGueGraf!^`tiZ0 zBa7`2@lV1szt37F3xsX2fkCIYCAai6KKt@e6CVYFh>R<*km)3phvSh_G+IpTLq?Rd zI74~J5E_Zes?$&&ZGR`U>=ZPjq3Je>kYSucl8zwkszsfbMRK|F6iJpqTw`TjEFLXp z^3hjb&R9J3i22nM6h50iwQU!BMkw z&55RHD7pn@i?V1Zh|*8JxWQIaASe`#%CsAUM?W>Bkc%>w<$s}Yv!ZlXd#v@LoieFc zghxJK*Esd_-bB=Ng1VlEKkT|~?c~OHd#AD5R2iwWSP}@4!59?r9^k~O8MY-<$il46 zhVWpZJO)w7MMbPxP!8q6Se}!Smro5@uiH>gyUOsS+0E1D6f_t6>Y=x+jjq$tnwLw= zY^ze#qy5XQK!05<^e@v*#~0b+%CCoQsw1Q98Ykr@?L3fVe5{RdBkJS^;wlw1%J z$}vUl2r=?|hTz__5;&t_F5;Vnp?F$FZ_rrgh ztL9#ij6)e01WmCdjTL5Aebn7ZV{y6GeDZPc>R+TTjmKw)o3V-~Mi!56labXWUbe{; zf|kOPdD*WlkF-@Z@BDER#Y|%m(~gyoC*r>Uk+E+K*f;zF5yRR&>td z!De^8=6{bIFuenVU9mVguRJ`6mUwZDP9aqJ((Nom`0^1i^X!wChy9DD*hFb##zkmG zXB;(rSF59Q+Kp&63)Uoy$G2|si4pS%l$QseMB&Pc*65QKv2~P2e|hEMDZ(Oc=gB)G zv}@q#o6p)Oe} z2q))!rtnBHeKTja{X#~I2xnwDx1#wx>q8FNH`b;~jvU-6bC(@3c&93NSkXzv=+8;h z*0jEPsqb#tuTIlf0PD)N#kZ)q@J%Y7(tjMuPdr$zD#fPSy5ME|4QebOiJ)av#z$lL zXih(xVmZxghfLUH*kJrDH}CkmpMM4L5h7ao<`iF~Nl~NC7p-Hwam1#=Z-acB3jRZ` zM9>&a0YNzZlb^mW`ADm4`n8=Eb-%HXpPPEO88f1X&(al@m$67@m1#V?Wx1JZmJ5Ha zXMuD6>Tv3oHv|i^XBH2mGsq$8g$ozjpFAK^>whMIsPjhVkoC#(55_!K>KlOj9{eFW zSHal6o$r`~zr30{CXdsQKApq@{(rNX2f|+6|B}5;TG$kIR@4q%ANYo2_}9KIP?O_8JnSFJBbBzaPfrBEylRmJP;OM`dpotwJZ;P7xh2x4DEv5_U^2vh}Kwp-Li{CfqBGf=18E+0!fj~kt`Hm%}-sG`3~D*&HY z)J-4TNgrj-K+;Z(ypN@RTEtl0GsDJzn<^F78KHdlLV1 hpk9G`1v+a5{slu|8)3VjS3v*(002ovPDHLkV1g~&M`8c~ diff --git a/desktop/resources/ego/swing.pxa/0.pxi b/desktop/resources/ego/swing.pxa/0.pxi index 81277d1393dc280313fcd9bd1a5e9edfa763d41b..38388afc3d0dbc5da89ad6c6f10e036b18635a95 100644 GIT binary patch delta 1614 zcmZwFdr(wW90%}w?>WMn+jM!!@^lM9N}xqXtZYOjStfaGA+i{?F0jDLvI{IIs}LvA z&_Y;*xFBM(z$lZ98QGntA=_SmG&uvY%s5Ut+2aqVtSp*pYO?QLAo`;-^SSdozw`K= zbMI~M5<9!Zpwe2K)!Cra`FMfQ6#>JZ?x4hV34yAx$h8maQa7Y;$=JGWdv;E4-cwH( z6q&2+bq$TrA8tE-;+6h^p>9)F;A*C3@$CNY3mM6wER0bWvT`9z?+cbQ;hF1uZh9@?O4G=n6$4A@b(~V@F^e|o}yIn*R zEngTWpDKN|GAB_UJwbd#s=Z98#D>s6-%X~M`$!HW`TD@Z8mdfG$!v`L^q)C$(>VFv z-xsB06GW8U6NJkB6G~DECHEylX~gE#yEu`L$k;=RhUH!?YC@7y4ozlW ze-STH`}-35p>n^Md`_h1t3)L=PZ5p8ZV~My9;Hw3nZ2 zaveO>+#-b&TANW8qqeXYP%4(KF^TtO*~|^v<*6ul43HN6GLIW@T3VAR)J%RQ&{ixIMCUNstwnP&Tbv(s}{xk2LMF{6csuEHHBX2YsI4}S&d6)oPjI?57aua^wDCHpluo;boGiD6kTY_Pqy4Bz5Wl%bgRPv delta 1609 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 OaKm_Zhg-Fw^xU7na{s6R diff --git a/desktop/resources/ego/swing.pxa/2.pxi b/desktop/resources/ego/swing.pxa/2.pxi index 59d79827fbcba62c4d580ead603c2de643eaf354..a2e194230b56436d477c732867bcf0df25e7cb0b 100644 GIT binary patch delta 1950 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 diff --git a/desktop/resources/ego/swing.pxa/3.pxi b/desktop/resources/ego/swing.pxa/3.pxi index e73eaa8c38a971a84e75a521fbaef4a6a17d0509..0a38b33f3a9d053c13dab6ca173761d1732fcf69 100644 GIT binary patch delta 1988 zcmajedr(wW90%}w?>Wjfx9Nh5EC{;gs+2&BCRQ@OP}WJ1O7atfbGR7ohg@}!snb;pq%uuW|WQ~)RGd4{*mQB+%)Aqf~E^Ee2cjj|B=lA=a z*WJVZ2C2S53eL4#iXG*8y_**ZoiMS()f5~(XLgVn8lih$A3rZ)@sg#>maj@lUGwVN z^lbBHYiW7K?!7e!4;^hi*4C7h95j`w*ev#R)7d4lY8J{Un=)y5)>PH(=i;*0q{nS7 zsC0DBiGG$%U=vwT=iHcBCNhZyvyd7MzhA>EgnkWA>g@fk733jlX1v&6S4k3SFXPV= z8BIyvw}-44?UvV)jIo3md8c!&=kBEg9>dZZ-oN)pu8*~QOZjhzTz-h?#LzUIM}d$V zp(dhJ`9r?&5W+|Q8~&WA&i7sLBqk<$$yLXQR$Ng#*+1I=k(B(uYId{{t;%2HoBr}R zb@mPt{rEO6j#FppA~DoA&&QAL2RV(*x`~Eb-qR?@yG%s?W|~WRwahvQm8*J4By!)9 zv94Owh3)o)FN#;j;46)m^$}5KH^>Y4z?c289wpXC)cuWjiLX#p#&LMO3AwQcOPuT? zS`54R$S^uua)qe>uOzT!8=<1|dpJHBtcw~wpjA0H{R2Sn<1 z@&kyW)$HUW``PcrO_cY&$=IPp<;^_J2$EKRnY1F!C|~1g*vn}v4eL|Q#a3;Kxw4>a z=F)Y_{y7d68JXEelQ-(hGWeS}P3u(aH*DPadd?;}M4&mbS{BBl+^XEDy!?W~qIJ3E zysb$#i>)j(PkFOQreV`q#BlKz)mBT1d`h6xqQfz{&5r*~Z=uU(P_ku~l2mb+`dTFao#Xd-w@{hWqdUeuIbb7sv60$5~)<8CFgglP&#bAX>*b5C@HRTVZaRS=m z9Q48^xB^#U0B*r;_z`}EKfuFLL4YS96z0Mz$Oapff&(gGJ77@(iwbpsHH9P4QjJ$D z9ET3*h70f^U=sp1A$$U#!63NdJNN)V@rMLb83fV^_ delta 2764 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 delta 1886 zcmZ|Odu&rx90%}w`#Wq^ZbBK|)(r+#I-K&b5Hc~DGPXfcwlNux0>RR)WveUQ);**^ z-5EGw;x^`74on8N1A>I%W6l!s0ZO7V5=9_r1Vw|!Cc|A3?R_j?+M{Gpg%c1ts8I#iE^@*vL2d&d*WIj4Odrr>${DPt< z7A;*}wzjIKHrTjn+w(7qox9st&x=pw8n@XY!OOT+a>ojozH1ZcR}oT_i;%ySinJMDP{Ti{|}gjCA(XrD)%*Ph4mj$ZHxo&{3@p z#qP#jFPRB*ksbYX5#86xtjW+=cqG&>Pt*7=8JU6-33WzO_L6>9EJmiaBtH{PFJojG zoVaGVac?22I|2EGAODoIa)a z!51R7^;5bg=j47_Sy=;e{$nC65&V=q*eNm^Vga`YiQrY-bIWP6ve?R#xWTJr5TT1? z6+sW_BhA%x6mRJ(GK&2e9Euz^ICE(5&0CRK5iEc0RzF+z58v!Zkm-{A#Z45A+m@3o1)77cX8` zWY2d7-2U(qTda9*nO$4HV&%$JPdY@Rjya}I;7NSkS(6OYrr`HA6Z`deOiB(N3Nz+^n9Gj)_@eaeNd0uDj?Ta=) zD|(5UMl@~Ny3r<^$zl~T^El*dehxbo*>CNUTj^WlDGP5GX^bW7TUy(+iR~|Rh%Cl3 zw0roye4;#XCmyGYG2=p$eZ%z3Ddy>!LFC%iwY11?^Lt$3mu!PAjCSv_7uj>2zIta( zc&}}!je`~zFK`Fkt~vhFa!&VF&M-Eq!GZ6}4Soo~CTN9D=z=ipg9C674#8nK z0)6lv9ET6!Bzy+v;UatwKf@LH6|TeY@CW>(D5_3T8q_#6^l&$5V1NWLLK2u@JXl~d zSYZatgiLq@vLOfZzy^=O0w{o`uo6lXrk2B6SO<;Jsx&aQ9gQy73rFA$cpKh<6L22B zh9BV?{0aZTfWma~kN_Dl7Z!sTd{6~`sD*lHfM#d|?5XR3PB|!G4;+9#cngjK4xxJ= zK7vo+G<*x+!Qb$&!pHz7mEVT=ID z*jTW_!!REffdf_pu93N54d5ynhfS~@b^soRbwLR5KgF&RTR8o Mlzq`URxx(|f2?K~_W%F@ diff --git a/desktop/resources/ego/swing.pxa/5.pxi b/desktop/resources/ego/swing.pxa/5.pxi new file mode 100644 index 0000000000000000000000000000000000000000..31ba94b30d8c57561d5704b04d4f40743df74d2b GIT binary patch literal 264078 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 DMPy)t literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/swing.pxa/7.pxi b/desktop/resources/ego/swing.pxa/7.pxi new file mode 100644 index 0000000000000000000000000000000000000000..b9589a025e22e09f3feb6e82690f249a109ebb3a GIT binary patch literal 526471 zcmeI(3ve9ueZX#nxlod^3$)uYFbzxRO;{^Ey!`PYX|efqbb{N2xgVNX;4(NgJ~bI+OAaPE2Ya|;$O zI={V?AB-b)9_rmv?!UX(yZ=a~aI9E3-c~$OXm9E+xxz^4-Pi;GW{)d~acQ zfBtZx<5+Q^c&JoJ&QBI6b;+W+&tA5q;qt53cEq0EUKkuWb;XreCH2W!$=Ro_xpqx5 zC&?uXl7)M!#ZqBl&+%eUwXeOeQ0(oi#_`{@?BN@dxyk%=7eBS>EkifHIXNepH?-j9 z7~{Fgd7Y(lcfJ~oyLT3KVK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7csfgh2;i(lI~{3F`6-4Y-$1qB|eEE*o$ z6da-<5g;%L0_pudo$J{$oA-y>77V9N!XfN}0D&nekj?e+%R6peIePz}g2Of>0t6;O zAf5N=JwBc9e|ze#;qN^Czz;MDhp`I+1g4-scHd9u{tJWKM@p{&|MHh#9(_Cohiym% z2uy-NI{&l#emdvVviYBV7np>@*aZOsQ&1qC|LJ`{o9h!Tr{J&+i2#8~5J-RSAOExe z*q;N^>%k-(#x4jDn8E_-JkNd(82cR{-8O}XZD<4tOp-u$-%sa!)+FtEbT=<9Yjiys z)v!Wf>IiJTf8OYS^G~k@>EkytI&=Mv=y@-JAD=+!@ueg4JzZv{^Z$)r1AcsG;79}r zydHsU?x%A-TW`AH-J|QTXP;x=<9onZ4eJD^mOyr&pJ=&wSJQCX)EcqT5FjvF0u#;q z^!}f2H~%L~*?tI2ZGj6ntsj~5W3LD4h+PAw_UC4F1SUfuo#)xy&+h-}e$D^M(6tW& zQ(Iu{{Liif*@&}iK)TGfSrQ;Ha|B*({%3zDF#Ws2Gv|z*2>}9`zz>`M+5an$EwlGo z5+E@B1+wq>*?0eRnVnTO=Wn{{rr{@^d}?%i_Piwl0@GWdegC(H$CsT^_Psxw|E>X< zj3t4YAuxXKr+)^Jomn>j)5qC0AbZY|0DOvcXtY+Jg_=D+U%V^ypZnBD^E z{2zM;uQva)YrxpoTPHwZ`U?DC=YM*J>HK#Mn7*I2krNm%@LJ}7`d;&Yyr9Pfrmw*3 zng6Z<)A#c>asp!oUhDkN-kV+nvUN)W1g59J8=3$9EMR(m=0;5*6S!mP{8!w^)5qht zWv?B-^c`Tlh{pt`m%wY8@6+qdjFtca0t5&UAV7e?Pp-f-TW{ZX$G)cSQhs2dKYzH; zd3v=laG<4aYq7gpEcfRtgG1YzJ6qaz9lEE`U5$5azw=;A+s>oa{Gn1|bET3WJhgpC zb4N?t$a=0RcW1n&^=)0bMWe4ev#V3B+nV?7%oqC`cjN~PmDRWIJ&hl4+0)+9+Bvdy zsG~Vseg5Kx#IJqFXXzsI@EotcLUVG|_E3ZoGle3buPxV~8CRv)~ zk_E}aXO=V+mpyz>a$zz*ecjRb1o9>VkQ z7;HFk?>pc5?)M~JxkdR>wNUBLR|~i0yWiehDIe|c>B=n|-P&3y94i)%pLz1&;e4_G z%)_qS;&j6gyez4Se=bi}Bu&pXyl=&QKXd>4e|GPoIKq~4sa)C9o&GynovchQNmf1k zb028<`I8TJw6t~f6|02u z^6Y&p8t(tZ!*TAHCYN>P=5H(ItFIjHCm-p`O?a3`e&bWWnGSctCx6%&!r{^18adT7 zLyZyMUF;ot>@>mn?azJYvyV44eeQRjIM`b$_O$htkCuA2R`SR9rVmFxiUaA|p8jIB zt$3m^H@PyoD!DrSY@Ry#;I3S5-J0vxo&I%wA~g zc}Ki|==YmnUW=`N@Wsy7&Mo==WBGxhKWrXd52u#4I}3w_p3Rl+zT&Y$8ht+cLiE+>kE5?g--up}UW)!b`d&@ltlDU9)DWE?t&CPhtD{S!%cCozwbAv_ z4bjHv#^~ngmS}UdCAvM@9_@%)qSmM*+7}&&4o3N?J1RuIHFIVij!s1PMIVel8GR}G z^XR4MAEJMZ{yF;B=-;C6*36k*AI*!-jpj!SqD9fN=#pq{bY1kOXhXCq+7fMxc1HW7 zpN=Zg@#tjq;po%R7o%@Re;55{&78Vf(cCDGR~N^ti{sU;iY|+8j$*%c`=U6Xx;U4* z_e8O;x{pSWMNdXwiM|niEBfo`Z=x5XZ%2P0eJ}cc&7AtPqlPHXrG81YJc{$FzdBkI eZH(R;?TFqMzyIP_UG3>*%~xMuo?gtUZ~I^8?P%Ws literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/swing.pxa/CelData.plist b/desktop/resources/ego/swing.pxa/CelData.plist index 1ff35422..3cc9cf5c 100644 --- a/desktop/resources/ego/swing.pxa/CelData.plist +++ b/desktop/resources/ego/swing.pxa/CelData.plist @@ -22,5 +22,17 @@ duration 1 + + duration + 1 + + + duration + 1 + + + duration + 1 + diff --git a/desktop/resources/white.png b/desktop/resources/white.png new file mode 100644 index 0000000000000000000000000000000000000000..8752cfba1afbcffdbf429ec68ffae9966b90ae18 GIT binary patch literal 1178 zcmV;L1ZDe)P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000nNklPf^ sR`)yHKWuN>0RjXF5FkK+009C72I>a{BRTaJT>t<807*qoM6N<$g3f*}VgLXD literal 0 HcmV?d00001 diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index e4069050..71510dcf 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -116,7 +116,7 @@ (update-in entities [:room :entities target-id] (comp #(start-animation screen % :stand) (if face #(assoc % :facing face) identity)))) -(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed anim override-dir]}] +(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed anim override-dir stop?]}] (let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id]) final-x (int final-x) final-y (int final-y) @@ -155,7 +155,9 @@ (< (utils/dist final-x final-y from-x from-y) 1))) (terminate [this screen entities] - (stop screen entities target-id :face face)) + (if (or (nil? stop?) stop?) + (stop screen entities target-id :face face) + entities)) (can-skip? [this screen entities] false)))) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index cb1c9a4d..0a175940 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -10,6 +10,7 @@ [play-clj.core :refer :all] [play-clj.ui :refer :all] [play-clj.utils :refer :all] + [play-clj.math :refer :all] [play-clj.g2d :refer :all])) (defn taunt [screen entities] @@ -23,6 +24,88 @@ "Pick up your weapon and fight!"]))) entities)) nil) +(defn start-swing-if-necessary [screen e] + (if (and (not= (:anim e) :swing) + (> (:x e) 190)) + (actions/start-animation screen e :swing) + e)) + +(defn start-fade-if-necessary [e screen] + (if (and (nil? (get-in e [:tweens :flash])) + (< (get-in e [:room :entities :ego :y]) 100)) + (assoc-in e [:tweens :flash] (utils/tween :flash screen [:white-fade :opacity] 0.0 1.0 0.5 :power 3.0)) + e)) + +(defn swing-at-blergh [entities] + (let [jump-path (bezier (map #(apply vector-2* %) [[15 45] [110 145] [195 180]])) + swing-path (bezier (map #(apply vector-2* %) [[195 180] [205 45]])) + jump-dist (utils/dist 15 45 205 45) + speed 190.0 + jump-duration (/ jump-dist speed) + swing-dist (utils/dist 195 180 205 45) + swing-duration (/ swing-dist (* speed 1.5))] + (actions/run-action entities + (begin [this screen entities] + (-> entities + (update-in [:room :entities :ego] + #(actions/start-animation screen % :jump)) + (assoc-in [:tweens :jump-pos] (utils/tween :jump-pos screen [:room :entities :ego :move-pct] 0.0 1.0 jump-duration :power 2)))) + + (continue [this screen entities] + (let [v (vector-2 0 0) + a (bezier! jump-path :value-at v (get-in entities [:room :entities :ego :move-pct] 0.0))] + (update-in entities [:room :entities :ego] #(assoc % :x (vector-2! v :x) :y (vector-2! v :y))))) + + (done? [this screen entities] + (= (get-in entities [:room :entities :ego :move-pct]) 1.0)) + + (terminate [this screen entities] + (assoc-in entities [:room :entities :ego :move-pct] 0.0)) + (can-skip? [this screen entities] + false)) + + (actions/run-action entities + (begin [this screen entities] + + (-> entities + (update-in [:room :entities :ego] + #(actions/start-animation screen % :swing)) + (assoc-in [:tweens :swing-pos] (utils/tween :swing-pos screen [:room :entities :ego :move-pct] 0.0 1.0 swing-duration :power 10)))) + + (continue [this screen entities] + (let [v (vector-2 0 0) + a (bezier! swing-path :value-at v (get-in entities [:room :entities :ego :move-pct] 0.0))] + (-> entities + (start-fade-if-necessary screen) + (update-in [:room :entities :ego] #(assoc % :x (vector-2! v :x) :y (vector-2! v :y)))))) + + (done? [this screen entities] + (= (get-in entities [:room :entities :ego :move-pct]) 1.0)) + + (terminate [this screen entities] + (-> entities + (assoc-in [:room :entities :ego :move-pct] 0.0) + (update-in [:room :entities :ego] #(actions/start-animation screen % :pant)))) + (can-skip? [this screen entities] + + false)) + (actions/run-action entities + (begin [this screen entities] + (assoc-in entities [:tweens :flash] (utils/tween :flash screen [:white-fade :opacity] 1.0 0.0 3.0 :power 2.0))) + + (continue [this screen entities] + entities) + + (done? [this screen entities] + (nil? (get-in entities [:tweens :flash]))) + + (terminate [this screen entities] + entities) + (can-skip? [this screen entities] + false)))) + + + (defn make [screen] (let [blergh-stand (texture "space/blergh-stand.png") blergh-talk (texture "space/blergh-talk.png") @@ -47,8 +130,9 @@ :talk-color (color 0.95 0.4 0.2 1.0) :script (actions/get-script entities (actions/do-dialogue entities :blergh "Come on! Try and hit me!")) :scripts {:sword (actions/get-script entities - (actions/walk-straight-to entities :ego [205 45]) - (actions/play-animation entities :ego :swing) + #_(actions/walk-straight-to entities :ego [205 45] :anim :jump :stop? false :speed 3.0) + (swing-at-blergh entities) + #_(actions/play-animation entities :ego :swing) (actions/do-dialogue entities :blergh "Ha ha ha! Is that the best you can do?" :blergh "Take this!") (actions/play-animation entities :blergh :swing) @@ -56,8 +140,8 @@ (actions/do-dialogue entities :ego "Ouch!" :blergh "My turn.") - (common/go-to-jail entities) - (actions/do-dialogue entities :ego "Hey!" + #_(common/go-to-jail entities) + #_(actions/do-dialogue entities :ego "Hey!" :ego "What's going on? I was just about to teach Blergh a lesson!")) :magic-slingshot (actions/get-script entities (actions/do-dialogue entities diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 96af308f..0cb21139 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -176,12 +176,14 @@ 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)))) hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0]) - swing (utils/make-anim "ego/swing.png" [36 36] 0.05 (flatten [[0 0 0 1 2 3 3 3 3 ]])) + jump (utils/make-anim "ego/swing.png" [36 75] 0.2 (flatten [[1 2]])) + swing (utils/make-anim "ego/swing.png" [36 75] 0.145 (flatten [[3 4 5 6 7 ]])) grow-talk (utils/make-anim "ego/grow-talk.png" [18 36] 0.2 (range 2)) get-sick (animation 0.3 (map (partial get [(aget talk-sheet 0 0 ) (texture "ego/get-sick.png")]) [0 1 1 1 1 1 1 1 1 1 1 1]) ) spear (utils/make-anim "ego/spear.png" [18 100] 0.2 [0 1 2 3 2 3 2 3 2 3 2 1 0]) crowbar (utils/make-anim "ego/crowbar.png" [36 36] 0.1 [0 0 0 1 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 3 3 1 1 0 0 0]) shoot (utils/make-anim "ego/shoot.png" [24 36] 0.075 [0 0 0 1 1 2 2 2 2 2 2 2 2 3 4 5 4]) + pant (utils/make-anim "ego/pant.png" [31 36] 0.5 [0 1]) ego {:right {:walk walk-right :stand stand-anim @@ -202,12 +204,14 @@ :reach-up reach-up :reach-down reach-down :reach-start reach-start + :jump jump :reach-stop reach-stop :shoot shoot [:fire 1] fire-1-anim [:fire 2] fire-2-anim [:fire 3] fire-3-anim - :spear spear} + :spear spear + :pant pant} :left {:walk (utils/flip walk-right) :stand (utils/flip stand-anim) :talk (utils/flip talk-anim) @@ -230,7 +234,8 @@ [:fire 1] (utils/flip fire-1-anim) [:fire 2] (utils/flip fire-2-anim) [:fire 3] (utils/flip fire-3-anim) - :spear (utils/flip spear)} + :spear (utils/flip spear) + :pant (utils/flip pant)} :baseline (- 240 (last start-pos)) :facing :right :origin-x 9 @@ -402,7 +407,11 @@ :scale-y 20 :baseline 9500 :opacity 0.0) - + :white-fade (assoc (texture "white.png") + :scale-x 20 + :scale-y 20 + :baseline 9500 + :opacity 0.0) :actions {:object nil :channel (chan) :current nil