From 5ffc811dc0ee65c8cbea27edf0712ae5682e1dad Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 28 Dec 2014 15:17:38 -0800 Subject: [PATCH] can grab spear. --- desktop/resources/cursor.png | Bin 7843 -> 7926 bytes desktop/resources/outside-jail/spear.png | Bin 0 -> 1058 bytes desktop/src-common/advent/screens/items.clj | 3 ++- .../advent/screens/rooms/outside_jail.clj | 18 +++++++++++++++++- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 desktop/resources/outside-jail/spear.png diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 32d9db4e4ec2e677792be3e3fa2a6ec7d253f200..a80a6ee55013030c0f0e2fa601331ac8ef3e4c7e 100644 GIT binary patch delta 6879 zcmX|_gKXl;J3zqHLZ5pk|_V(Yf`Ea8i?doeRgj|5kv78|nj;&Vi zYC^aBjU@p2-fYQ>z24le^D|^)HJJX9cB3mZU`V%iO7!vaZCUfnx7XUQ{j?^>Iy-6} z>35<9c}2-A^?lB?4bb9zaC2IvhJ=+Cge|rwaEE6P5gOJg8I$2fv*$3r@77CRvc`hj zV;*vgLaWw4Jo4&!5Sx+uUN)81xP7Jn&$vBqzE;%>s`47pNIr7ydC%SZSWepS7xe9O#GzR2!wE7+ zpwkBiF)T~3k@>8wzxn)E{=xI?xqBRiq-%L!Jqj*wDK320mMt-C_wJnc4s}=f*6N3~ z5hysz+sEIVXN9k(?ac*P|4pHJa2Z zX8gX>O={K0 zA_;L1|MrI|+S_jNoTa!Z;iIp(u5)-4u97auZwLG)7!B< znZ$`pJoEcD$rxZvD-c8P^Dm$YRb%ZMR{mIgyZ$>sq5b-#)KlPrd-TRm1S@NX*>&P1 zo&?iOEB9}lB8h!hSiC^~=baDPC(6rOeol$|lO5Lm&V*AWc&wq2kRLkocH+_a$#rK= z$4T~_WmUQp8k)*c5ytxc?brO6Bi}c@o*nXOKYzh5g1N%UqcJH<8N*QJHT#7J7X=l% zyGF zHD|iJU|Sd?pRY%O$uDl1X$1g+^BS=~U0Vs2gse)K(^4;~0xl`JE1JdcIQDxN?d(zA zMe)(F{tp%(Mhc6dT6$>RM!$&ly)os$uCJ%>s_0gaR=rEjX*ybCSgX=cl1J;IT3HB_PbBozJK<}P?M#q`B<^fJHNE}50LH8aKU*{2^HNj*d* z3P49EatUhdEU}%WeR_zm#dA2k+9g!!ht7iOd0PoAkwKL<2CaX%IRQYzb>?xP#tk>x z%smhVpD=?b+m8xjm>AAyLdvU`7P89Gx_Z=Oaa%}6=(iu(UndV~ul^#8pEVsg_@uiX zgM2>z#G1Tau5W_CIO}tRdJ9DfZGU+mI%ZovxA#&hVb&GHevzgnVw+Hnir&fcT5ixj ze!)avApB-$NLd2#%vliN9^_^@dPqHK(QZi}HBK}CaOMuLFEvov%5*A+{b@O6Dmr7h zC+u|EUsW-*EDC?nGV>LT;U>Q6p43+6T*>WNzrJ=_vEZM%ptPP-+7yCRa?X}L5CxC= zDy;7)yz|WK#T$aJLKbBh|0NG6dN|>-8M?Vjc}$7V4h@!7sgh`&Q(m@gI5C`s+UT8bV5_LsWt^ZuL&kMfJ$?}0)mB&Q4Cn(pAy6d9!R@ws_ z+Z(&@3&#O}o$E8hR^w1B0xK14EtdRwU~jR3{^B7XEd1?=MI={VOKq}*){P8CwAbz| zZYVa!gzLC3wsiQP3Uw$x=~z+sYT=l&!uam5VT9B*8Q&-Hx11#{hFA1YM?l+@erKP z|GfR}@=1nhSDr6tk=*^vO|#VSb6oG)d>OiwWPNf@?;V* z$d2)4-q;Dh?6=tPIH{~HSf1q+ED_fiIp!!;l}ZKEw3ZYM$LPemzyuj5RIe0 zZ|jOcj_Et{7D6%&&Mx0GbrwB-M3--25N@vC7><1gIZY>ZJQ)?=>UVMe~12FWN5g`DqDm93-NrQE3OL?GlP|b<#T$F7Mo{ylo*!y9as54!{00d zYHiVc%T^iBEsEk6Zho?+m6F zy`MTzxYH)dP*@v^NjXBD)l%T!1Ir=rmT>-Vmp_}XU+f7y;2{r6ijm02x`t7NeNc+2 zrXcUI%yGe|>5_mhGdCc z+3zY;mUv%*4LPNzgJWJRc!uv(vaHw0Q`ZYanES5K*XBroLF9XdoYY%E6>cJvM*Rc{ zdu}N&QEP|VOj3KYcKMU4LEqQ+p~+rd1a+I5d! z+_vs`C9VX!oN&6~-Nsq{<7q|>g^esP9pZ%^n$x<)B_Rz==SpqD9Gc-dp8P7!oqH5m z#X;$A4vFK$btvY25^@!-hfld{_T2XBG6NUUQ zl<7DtP|aR;(tf&&5N0(MiU2l-qkb_mVf#)IB@E)UVoD&AvF!ZnumQboD;cc3i~Hd( zvJAy!w_z#8eyxxC9Y9^J*&1^Gc?=K673H_Okqg<2?E6Kk_YL9zNq8$SJ^j@E-GCd# z7j@`vxm*aInEoIn^MB&KlZ8hUcbyJUcdgjKMKS}PWonjeP&EPc=9c%YlHO$Bh2&P5 z$QJHnwKl?!*wr>^IyCmYxSLl_B-uI9rRPq)0>UKN*g?I6Ro+U4y=B)dLeE_!wzlw~ zu=ImhQUjY?Iu)opNRM{G_0o<%(M(#6|D|hH{-OtA%(t2HvGLmq-JQP#Wl?9V{$8*p zctV6_uR^5a!Pbzc-ns0w*|_YCHg_o)!?0HH)-F_${^21rV#qv-EEqw};? z%9X2mkZ)>*<_}M8yhW7R&WiT1u+UeZBZP;_sn3yBSmKmHI<#;M7j**l1|}3 z^0iknvqO8&*4;2WthoPP7lIuAb=#zn8!aG8O&8FRu$09yWfC z!>CgMMH>jwR^i8w5>9sOF z^Hzpq-I3g{YJxruwP}3F`;HDNZIJHF5zRr7_*};_2YGay!Yn$I5`S^MbuyjN>~=_V zrcyL<#WyK^m;4UEw)$!!vDpL-QFbDo+jKW3Y0rDTF!r^n?MdkcqS(V&o;Z+gIYolS zt7&OQH3Zl|9(89M$N?u5;$CLId83e5P;g)|K(MmRcr+|52{l+iKB);2U&Uhl)|;w> zMeqE}nYr*iXxE@7kv<#?Da@Vm{C_r=LC{N?@0ig?m(>&boxHj}-*3 z{fIl>&#UfI6!;B zt7*pJd)c_(oooDC<8K5HT?hx9Tp(gnyK1vHAT})2=~_ONI+XLP>jyF?b4gsGF~Sm z@Z7>NOGiXmdR0!!O}F)(uBNT02u7Ko9dH)rLUT5Dybd1;%P9Jrn0kYnD>GfG0$J@L zOr+u^`6NL6&5om+d!USZ->Hjaf)N+XOi3%dygQa9&*b09U`~aN>FvqY3-ia%?yOnK%d$^VMzT#m^E`gGNQ{l^yFs`)@h$vBP*|yF3-6HJ1bXfV zAGjqjw-PIw_749~cdR@lt}Y{RujZbAvRjIGl~V-d@Vv|)4`YxrugRta5XT8wNCtzT zMg@2eA--s6`B|EuGd#Pg=Jh7($j%E)s1{2Lcw>0RuroGnwf1@(SkodLn|_5t`n#wM zNRs*OU_bvJKzGUDl^v_;bE#^4M*a)gG^^_so1Dw+-Ve1c1nXMTmdT}dD*anEwXBss zhprdlD0&OH6Hc65R08^Knzr34L0U(Ln2fmD)=_Cyzc+iaf-Br0MPv4v^6B`~ku;0Q zE9Lgl=~6Rpg(7AY9AEDQS=KXy%fW z@S^Ei3fZ&SiIc=}FoSPDe;3`o6ASY}#yt3V05;-y`%QNpX72jnu67Oo!mfiE@hlX} z?aHeYu(at*1aC}3hJz{pl2xQ9wz*wd%?p=G(otXrJIBv`Rjr9q$7ld?baSWZC*seh zM|Xyug8*GxW)EGjNX^=6yKM<}d^pv!!qKlm%iDZcvMPbe*b_(IlsRs3FV z>4ho9@KEiJIn`q4<)q2ryNe!!RfY4rr40fv^eGj1=5*Z{S$g_V^7nX3EZ+`Ev1J?0 zb}rOvml{AL0F!Nwdfs)k+D1i)=c!w%2_v@Ds>2Ws3;3ae`{k`%TNw*bT>jDfx2Gaa zzCF7dXdb_RQ}aUA5K8LEwgaX(n#qHOaw;D)_jKT4KW`p5!}(V%=T>Ks=Ny`AtzoVp z%*a)FTlStJnFHb;ETTkspE{y`zXVsvL+ORw?xrb%#LsqvR@WmqSH}bp5d8Ew4VH#a zS^sV|z;R3itIFqE{WCdNhtBkDW++#a7xD;6G4EdFat}e(EzMPWXFpFt4bS9|@tq*Q z1@=?>z{kF?h!WczUhlD?hS?Rw%m-D{Qu9-1_3z8>soJTsPNBnCqPC34oipXdHzhZG z$s0F%#+!{IR&dZ9o1Fd(1N$cm(B)tSET#4!Ka-!4sj-d@#C+iSdDMSM;$N2Al%SO1u-BzbC9Pxn@TR>h{T=%y3fPE*0;bmR z^~kIK*PC84F2Z5PX#DGo3|tZBUUsyZ&Se5z9cZN>?3b&&h>l7+-CKg}L0KK#G=ABt zU;e3x+6UL5P^<9*+}Fw^*pkMD1bE~GB(jzqdLCJzNod5d^7o#P1Yvj7-1lELYI$l) z6;*&)rx%oDn8C*m*b)&G5mJ?=J=PzSIK6WRwa+q461lL zwGVz7X}Gujsy+!gX>x`KE{B;~H8t8Iudit-IVUR`z4H!Gz``UTBM6ZsC<;_fM<#*Q z+On5nDg_c|x$YzaFi?d#&H+D-?fY0Vu@r*)QtwbPU@u-j*}LkuLbhf=Bc-O8qmTJy zb>=$ZO8L5z(P%%jwi?K{HKRLz@R{uzEjrm+*Ba8D zS%{mB3VSqNy%LV0)H82@v}oU@|M~Ui-{CKDI0vaeZvF~zAq@`zSMKq%u)Yy)jR0(7 zt~3mww27rCno)cq)0S9o%EuTfcB`+e883 zAs8K|z7L8JCVp>dTPG2X(aH1^t=Y<=oIk(9lr+86)_u}Kt*I3)Iz-)Y-a)5Y_DC8n zVA8F$(RA=Nsxdtl!&PX0uw^6gY}U*~4v;g7i!D=H5Qlp#8d9zemfHADLxed?l~w)I zlHiEIoaGf0sBjRs*VK&Nn_Moe`!7eKV;)~iiy#oT|^)8=HE$s zF4bjU-agh+^D>CC#-hXMg5PQMbgE)o59X&a3Ty@4LLRW$@BN-R3{s z;cBss;*<;hLTb-%V~(Bv0dWeA=7ZZ}su*pm_ommd)vJAD+hp4MPTdK~)vGx)8>%!5 z*q361pZ??~>ikJxx_*UvT?UA-bA(~7;{qk8$BS&1&KGhu(V)|G@Og#33$*rQG9L0= z<6cs|12y~C;3R+n7IZ@cTy-~{1y|y7lL@et(UuVxu)Z6s{uBx=YvZuWW?3&{y7)1R zew6KRsNI9;&3G=B8;sr!LTY)zFJ!v+T~{Z#zYm;OI0hUf(ESbZ#@+No#*bLifilGB zJjf{P)PaBuBR<=F_s=yOT0#YxynUMev9U}K5)U8lOIAC6# z=)h&CE5z5!Gas0TN&*S?Hx(@h5-h>+t#{B9QCGnNG`(v#tB|bX063btcx{qdc4xnCGBFFL{ zU;ojX{j@mHoOcT{;Q;)tfMK=qH_zMZy{H|{y0*LNACh;}1& z4s#AMHYHY_9HGS+I*yW=->?UqVo(>#Mx9U=If(FIW#B(&CTaqsut%HRB~V7 z;nUl{0PFTuc9)!G2bwDv`*d?f#F$|ikRH%86yuPd#uswdW!4I#fuC8t7%BMH-EZdS ztAZu6R6qRn4*b_P%)F3^;)c(?@THNb_1k$Q*a1GCB+%OHk>S2#;3?zaWk#oJ%p?j> z^0|3SR#2OJnsORva>0)?|+;S+cL=HFy^-B4mjgrBWy=gk(mt zBx{x|VamP_X3Q|l>+AdZy?>wY{kX34-+i6yzRtPM{d}Gc{X+e6TO_D!ddAQ;61LMKGrxi1P5hZNJNTL?&*j#-wG00Kk!m>8c&9cYAvJ?_e)7a;ybSh)l!kGN zVD;UGmW11l4cHGQ#DmI032MYTL%f8l!NJc5zmBr)m=QB8^R=H=mY(iCe4}3{qIkXx zf&v-1QFShX;V_!H^)wT-^vsKid~?hgOh4_vaUf(0gM(Xfic5I<#$VDs$Zo~sh>N;O z(S9DiXs&Mb^4LY65SJ5S$@McT#&ys4EV7(B2|5NbooaTgU)S0M;3tEKWYBitcH?RFB&5sAfO;QapFd z_&P=&0Z%$t_~OO4k@tnmKu%E1=y7k6rok$|q2LiB3=vw6iJE*^=pS+~{f~ar>f`9Z z9=A&bd$6Riu5x7K)up`X%#T?U4w)M3TW+DnN3&!i=ikTF<$`gRyC?2ZN$VxY&;@I? z>vd5=pVq2s`F0Vzo=9Xd{q~Ci{=*Ti`wCr;K4SO$u86jKm&TX7RaklKEl;)X>JQ_~ zH-0_U_oWs{uWhwem-e=e(66aNeRC0gKXjT=CeJ|9_^)Xd0ax5|h~tVYLya%TXZ)$Y ztqaG$7zGF3%cCwxA}M*PZqqKYBRAgMUG}eQJDVp5CUFBv&%qg?qVck5*L4-&0nbD^ z#_DC~pj|iri+1R)Yu}uH$)f-gaQZ|2)CRvNs2Is@e&FbKP^TqmJ-k?}Di-Vvc)pK< zxkV*$V=V{tNynikvuZd5Sf(JXF=s7T!Mn1Wt5frjvB45Uw`t=l*U-ew^prty( zZk-@@aj}{zuIgSJTNb?+7&G;WeY@dj5+eD0NuU1rF~x^)1K@o6ytSv2_oyi0jbTfxeQyB)kX|}hc5Xe%0g*8JZOFTHAJ`)Hcs6>na40ZuJViD`Lw4XmtEhCBf}1w8 zzjV`@>@yx0HLllp{6!Xpw2{_y02UziYd9vn&t4x_(N#~qrt#N!^E-O1rF1h_Ka%FY zq0(gA-kZwa)G&k^#d{yD)Hx{X*t@j?2~dsDxZpumcGbe$73rg(QVh5&@2K+XP6QF$ z*A{Mj4gkVF**tJCGvGPHY!NhZPNU>-r70ZXfOQM18vf>BU`O4f{QAmfXH{c~_V4_V z{g)$uV$7y@oJbfG{ru?HypM*Ta^$FoXJ(>=ho0$Zg@;WbGk)|<*+ADX=Cz;iA`Iiw zfA`MS3RM3u;CA@uEEWq4KZ$yE^fnSpC7qnJnxD=K?3WyQox7J9E~DnYx)m5aeZL<> z1G(lvS5~o-a2`|t@C+&1nI?+6m2hn^w~2q^)sYGnAojK8AmD$(b(Yf@`zuR^3Qd{z zyN`#HRI(LSFsKWphA&GRrn$nLkW-2%RaU3?b?~xF>hQ(Us*1FMu6~}D{jzO#sPD7( zecs+%WEAh&`pC`$s=u*t)jjsWm`?}cu+;K6^W3fa(nLcu#71KF1A%h`V=T#0-n*vv zcfS!$k0vu;R$?EGHT=v%|vWs7u)%|=ons7pQMw`9q3+FxPklrfZ`~7PMPGEvUf1MQ(O_t7 z+qp6Jg^HRr9Ccc-X<EJssf>C^ESfHE} z95+kwGdNOW>PD~m0RB1QH~n@bMNc7z3HkAKyR+BuQa=F}d2LNOT0&!Mv+cz$ghZM1 zXemykrg1NdVxW@TofURzi;RT$pE4!h#YNa%8#$*(ww25zm5s>5LyP!8_m^%7VD&k$ zOAC4%URK}GsBt~Nt+t@?5eNqrjr0_0fkPi2ol`WRmAQf+ZWmrwLUSfGzwE(ff4x<8 z7#V9#)Ro_<>b(abIFAf0+E=?q`_x>%u(4jy71XO7fZNIGm8D{^B!Xkh4k)qq6MXNLrPSu(W3Td~?N1YnM(E)BJLg zNSS%OfO{KQLNC+4`Ee;D^kW6-{Ez^!xIkVQ-nj5r^87%2s=3h*t~re0N|Zs~WHOgy zu&~HIfC({zA99#vn{VNzN&H?l5`WEJ@$%v(=zn|Zcdqww287cp-;hjS+Ooi~u#mcVT>M(;?=8YyL zAPs0mCY$l~9b(PgLw1A42WZ*;#K`+rIofA#U4@IylGiuG!~U!uuT)v*H-X(Zau{pr z`^Z?22Yb)G6ZG`^Q^9z3w-V<~!ym_}U%mac4d*LSp{E%*XW>+#&sv;=LHrK9GDY%v z1lV@b3=I&{0OzZz89RV(vQHzo*q2wN`pe6ZT-q5tKzUQJfKa(>^Yzi@oy)*E)lqt zJ!Jxy&qY!U+T=0Ri7O|jq_qMan4@f)1xcad*4-eArz2a$EB+fwNF8Y5;Y+etw9k9= zk2`~#sS`rF$ezlYbXh*?MEePnfBNPGfRD0TR?PbFy6O~uXY^(#3_Ht@>V9$Zi|>tf zQCeVz&F$TsYKM`mxkT*sANw|x6wJp;w|lzg%gak{`NsMEAP^(Y31N^lxVg25Sw*sV zoJ!lJ#^#DV+T=oX$t67OE4jf;BjWIPh)fVG>Bb^}Ap`>DLGHk&WX+55}nQSQG)vWE?dG##sx z=q5kARJga|*Hm>Df$5+g<4eL+6*FhOL3tR|3a?&KaA}DA$lMH3BeFKU8!?F)nx1v{on6VPQ!H29n|}D)3lXpNX+L4V!SeW+2SfAV zQlYv^U-C0TU)9x;{$!`Nk9~9)@eSWR{lSwuixPXjko5D~TqxCww`~MSdtvghuN2${ zLrw^EKmQ9Q=mYp^M?CV44A}5Df#>)D?jpd3))?c4{{Eq?^^D-5R}XSsg(-o@u&_N2 z7;&-J=5JX?uBHRp2%;kpeXIKG)im6=2fxRW8
9xwDv;B_fTkHf6NpB+T8xK5%-?Aly2k6halpHt4-i0`a{$4Ao@3St=rN1>?Z}w zSYz(umJs7W{9z9OO>wyU1f?3xkyCuZM$D><6MbN+LRcU838bB!o$K}M*X_Z4&z#*a z&^|b_6GP=lMQ7_-%6}-xI+%7AD0TZ}>A}E+{XPy{T3rmeE*ZGI*wRP4o0M>!SGD%8 zKo|{pB6;aMiRcZ7Hap0mtMt4}Oc;}D_8@mYa3fKAQ#b)^O(%l0Wcp9D*9U*}TH)UM zQTM6=3wZ&xreO3Duz@_n&)~&V|KCW+nxBfppxhI{ z#<)vTD1a*Jj@hyN=ibEOi|(dSQZ$WcXe@C&RaZ%jf=OL1xs%?Poq|k;L-}&VFV1t> zRE+K{f@ZdVP-*a@1sX3p$4xb_-q(Sha*I&I;YC^#wMM{`r~?yqp{$2I6%s%+V)`Y` zH0a0IJ9?H5nJPSMbJ`Pk63;lrn8J&`00e(RPN#HgEdfI*mgwQDCv%3a&_LrUaeTmz zaL&c^;|a zyrR_F-p}5@%^nLBbcJp~_e;rU0Ce%JH@vkUd|DSce1(j&;h|WLd9~h{RJI(8e=qI# zZF26>`P`nXg5O$O=FV>B2MPElAPYRxfm5J-8b31lx4m0T|CDYs7IySl+)LMdouUB) z=Ba*+29r7CG?ls~eJw`ca{3_kUoQ0S5)c3q;)vP-uw*lM9S`%vnow3Zs#mtY7uL#T zN52Eu@(6Fv)%t|awcXMmT=_-lF`oCVb2GS%!LDd6hpw(JKThXQkrgqJLmHyrWKi;+ zwlO(ZdTpd`Cb>%8%r*eZ2{+5gv4gQw>xS$jXc!X_FJ^ZWvuEg4yS*7rWyD(RE;5bk zRwc|fK?AjJ$|dx2Vd4lJJHZ3RS)Qfc3F~mb8Nj^@SHID@)(Z(8k0gEc`hfmWPY+Ql zl&tfxvax>H4 zitr0s_EldgPzfj)*krFY)&uL`K&c=GNyJ33JaFLB(6~-$Y0^nZu{fGU_HP=mXqv~_ zGcM+!E+mWiJ*PksB;lTbKv@kPbeioKhFx)mu{f6v^6w%l0U-uK?4XYTEq4cte-QG9 zc+0JDihef}44J=45}@hXqXG6-P%FliSRIlP-LYI_(c)#prr((h-bsWO?B<}o(RvM6 zbS{t9KQGN~Q7X7X0V`Wr$DgvSgi1L@R**wm)e0&4LzX)!I2T6j2h)MQX%>}KMLh{H zbHgCFV^E{BeeY(`j(wA<6-2Q2Va=9GOGY|?DRq_1Q5Of`UWiFK7(jm}RGzAKjpiTy z!}X`Ru75s_-+to|E7eo>9I^R*n65JX|D&-ho(NzEjZ;(-Z)x+FD^z1x6Jx_WC}ORE zmq0asEAV7eGY3ypnQoVy0i6eX={hMS1ZaF0!M5BQ-c&YLv9D2tq5e&rt zq^mG(^u=&P?!GJ;Ln6JIL-$ zfDPeR7&tq5%z0?05PEH;!}icH@FC}@x-gc8jD)ph8Isje`T?pV%`iWU>5wjbTa~OzD-vV1vq7Z0@MSCm~%ktzm~3VL}1nk*cNnVbc?+$Uwy^<5G+py<{0ltyMQV~m5&H^ z5hP3Y%zWxPufjKLd>CJ!F3jVqAmWaC8c2u8P)6!ri}P38NQUu!GkXYXEaA)yL(OAC zTxW$Cy8Z`+u=BS8_L1$;FDXw93UU~%rV*)VG-PKCG<8;I{*Px% z+q+J9E80sp$bP{P4pKi1Vb14n%AUnYI&dBQhhIi|JTd2J`)L@ZEu%GCS1&Pqzw(%S9OHBpvx6Q_kwy>s&x{K*s z9{vXNDt-I5E?TKtGd#sNsGI4&9HH_IZvsS-B43lw^;k5LDQ33@ODZ^$mUJvSK z$`b0Bb;DrA_yzrwySgh(YnQ|4-tKtU)#f-j!ddHT6a;edB z;JqAwQSW{)ap^Dd%9sL%)}q}B0{G*mz$?x~PaJZybk1p@uV^v3L(cA=vi?aJ-mx&m zz$T^YzV&#%=7WPSf%jYCM7Sjzj2K!}lJ-X6JHxY1?|NcU;xJWbB^c(D4$u;f5yO@Qxhh4~ZrP;;bkDsbCrLI2F4k>hFa$daekX0jsi$Tn&om_CPL#HfS(rrv-M^ySc zaFdEziC==Xixrp;s4;LQ$1OS8TOLa)+z{J(Zi8@x9Q2j$w>G5*z00z)z$_aRRZNK_ zQqXC4Z#^khsS5DqUvD^25CR#P0=11*K+XPbjb#e>RRH)N-V3)1;Nh&UpB7k>oiJK(Pn<+&#p(`z5_s~Mk4M`Z zcG;kLBJ&DC;s(a&fpwBRG4s%MPj>5v&5U64TF_PPWKWE+oA)226U>itehk2m@v&Y$ zc)S0X$T6n8lwVwWYdR~v>rG&mT@7mz-U`pdI7^q^-5|XNzp9M6$t0RIl#{vkDyY{_I-DV zVIMt}|HqIf%3V{lD?tL=v;5HaDtVGq0>~=gy`4!J1;DB6T;pQ0vST*eqg-1H^F%Uh zjRfn}k!{a}s`;UwT|YN_ltKOC_XdARYvucVb`+fPhpGCf-Uxr3)P9>eW0kU7JRL?0 zu}o5D*ue4dI?a$O14(MqXd41&{j08Q(F_g*iwUf8ZmXgJBwpf<+{&(^{ox|#Wt@s8 z{!c6UArruYCf(o-2t0_#9&o$p48Wwvd8q66ssc$`AcLf7S9UaY4mu@-y^Bm1nw%qr zIqSVzR)C4uB{@p|y_XBfBmKMp2WAv516iJuflWgKczwd4ZyInI=05*2SOCDcCcZ}j zy`;C8usuWz=)#Y7C1N!am`O2$8N$!(0=gfOM&(J4V+s?6ue(%Q^%6h;%o=V3R2y*M zO7;srR%!_;6^Ugfk+*M!!qP4#JyNA%UXg4q(G+j~E5J+NK#ienB&XNM8V!V_eIu_a+B-sb#7 z8qoK)L-+eUp*~6;Ts;(z8=+Yp1d6r_yNtQ-v($z(TTV=$=cW?nVK)!s2~St=8<&W> zHlE@idxjCdc+5umAKQ{gcly$7G6Y`xQv>tDCH4Z`(-hoF;xC8U8wb0$71b3vSR}?# oe9ryptjcOw%Cd$yOW1$mPSc-6B~3xNdwJ6(9P~NS?cbryHk_) zA_&q79typ9QBb@oMZuGbRjG%lP!L2B4I-4}nL+irq%>4Y{_kaImE)AxS zwXEN>o?)1l)PR(s`v$rKo@V-wUHtx;Zo5e$M~3hSDJeE$Vj9jPkTR44${KU+cl z4Aa!BXLBScpAb}R_!QU2S2iq)W|;n?WlK><5dnEr(9I~j_+X9&x)x=JLozR0A}ZDDXU3{#Y8#)<%Sklw6KQZ&9{Lh$V1b zsZ{cn0zPaPI2egUINs0s{a)(fb;eDil)a|YRcDZpquRPfbZi2bQOV;m5@o5=P&b*zNdF$0;Tj@2kOkc50P7z*}<`IWKmKo}N{EFoJz zhqR=P4Ny&7&{x$WC05r`!)hyNspTOhSH*Hv4Cl7@pLW+xbcWnxV|eMMG5*M;GjG%3 zo@v{9n?8)`loZRB-{q&b4F6pGGV^nvXO~CW-`vWaygP?qoxibTThp$X*$iKv*!yHn zTX;deIa`^(l73WKIQ70Te{0Y7w;!Lj{{Hd$<*%Vo=EMCdc=h4ej@+}}4)CecxfqLI zYv0*1|D|&MYwWq$G(5HO;O6|&r#nmFe$V8Mb-QDmde(MJ-M^1}UbNf`oMymd2DW!j TzWJ88?7rGmA}!6vPha>0gTz)q literal 0 HcmV?d00001 diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 7919ea86..49d1d78b 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -107,4 +107,5 @@ :note-1 {:name "Note from Gandarf" :value :note-1 :cursor :note-1} :ash {:name "Ashes" :value :ash :cursor :ash :scripts {:flask-water (make-water-and-ash) :flask-water-flies (make-flies-ash)}} :sack-lunch {:name "Sack lunch" :value :sack-lunch :cursor :sack-lunch} - :flies {:name "Flies" :value :flies :cursor :flies :scripts {:flask-water (make-water-and-flies) :flask-water-ash (make-flies-ash)}}}) + :flies {:name "Flies" :value :flies :cursor :flies :scripts {:flask-water (make-water-and-flies) :flask-water-ash (make-flies-ash)}} + :spear {:name "Spear" :value :spear :cursor :spear}}) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index d1147ca4..834f7df1 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -9,10 +9,16 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(defn add-spear-if-necessary [entities] + (if (and (not (actions/has-obtained? entities :spear)) + (get-in entities [:state :dropped-ball?])) + (assoc-in entities [:room :entities :spear] (get-in entities [:room :spear])) + entities)) (defn make-night [entities] (-> entities - (assoc-in [:room :entities :guard] (get-in entities [:room :guard])))) + (assoc-in [:room :entities :guard] (get-in entities [:room :guard])) + add-spear-if-necessary)) (defn search-guard [entities] (actions/walk-to entities :ego [121 75] :face :left) @@ -24,6 +30,13 @@ :ego "Looks like it's pretty mangled from his spill.") (actions/give entities :sack-lunch)))) +(defn grab-spear [entities] + (actions/walk-to entities :ego [76 49] :face :left) + (actions/play-animation entities :ego :reach) + (actions/remove-entity entities :spear) + (actions/give entities :spear) + (actions/talk entities :ego "I guess he won't need this anymore.")) + (defn make [screen] (let [fountain (utils/make-anim "outside-jail/fountain.png" [42 50] 0.2 (range 3)) guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) @@ -99,6 +112,9 @@ :talk guard-talk :sleep guard-sleep :script (actions/get-script entities (search-guard entities)))) + :spear (rooms/make-entity :spear (assoc (texture "outside-jail/spear.png") + :x 60 :y 65 :baseline 180 + :script (actions/get-script entities (grab-spear entities)))) :collision "outside-jail/collision.png" :scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3) :start-pos [145 15] diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 48bff919..ff5b4b45 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -14,7 +14,7 @@ (let [{:keys [x y]} (input->screen 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 :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear]) (defn cursor [filename which] (let [scale 2