From bbaf3658a7c2bb39947a71df53835c2c198e8f17 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Mon, 10 Nov 2014 19:38:59 -0800 Subject: [PATCH] inventory items. --- desktop/resources/cursor.png | Bin 4246 -> 4856 bytes desktop/src-common/advent/screens/items.clj | 5 ++++- .../advent/screens/rooms/inside_house.clj | 6 +++++- .../advent/screens/rooms/outside_castle.clj | 20 +++++++++--------- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 95d8609f19173ff06ec613ad0fa0e09b2031e111..8132e284bfb26fa8d161cbcd54cc077834418545 100644 GIT binary patch delta 3786 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 AF8}}l delta 3171 zcmV-p44m`$C6*zuQv`nuElET{RCodHU43v>M-|@}Ym1W5T1Dxkh-m<&K&O=swIYa2 zlMF4xC{+9Lm+~10$FW5%9~mG_T56r@*pU$kptiLYEw#f?nUD@r6srtr8G%-T5HQV@ z5v>-2itTW{zkT`LoV)Mt{dg}V%yf6=<(xfx&bj+eZr<=|0=;nkmWIq>*A53kQwULAQ|jyK(NQ{;Gm&edJZMZiU%^a$kO!n<(6 z%axUBzEqdq|BmSohuq~ObKpTs^+|htFirc|2iR3B_qM0w?ctuHO<&zx^mj4n?YDl| zoB5fKs`~HlFX{KaVeMk?xhJ1crT8*|f6D3pxd#F4t$R*}!uw*^n>jNfsF^ZCH9Y-_ zj#Jf`>x193G|c4+!+8AF!-Ya=ED1%NADe&5VcXKuqU!4EicVqx{1p`y z8|gDE1@M=bm#<4}=bdjTh})S%O@aB96IA3qwC-CsdmkFvt^R(jT#>@a#?xV`U{61N zNdf+&W-WhEN1xpgxP>fh5@03~aF*5w0G_QzjR^ft%me{?OIA0khrTwCCYmn$VfeQB z&dODxao2GXa1j{z2m}ehsL`WKsss@5o11^6=Fk7Cevt=dWdMAdWZg6Litm?Vi z-*xZ}HEsMg%A_#k>Ypx5@Q3{2o`hhDkqFSnQ5OLhfq{=ekN{vRr6vLM=YCN&Z~CPo z@WX#6cu939<_A{)68vu+HArhq83arOVq6771bnRi$)9RD8%i8(tL=`Cj-o&mc4$>q zRf>Etp#+8iPP?eN*(wRrme;=2lK`&#XU}g4B6IkKa56A_Sbhje05~QB0Pv3wAFO57 z*XFl&0w)%x{q=k`=r5h;f_vcCFZ~U?CzF4IPi?xz`@`Hn209jZ1>(N+Mdt_KQ$aS7 zj(YG09SFhvf;hL=hpJ&R9 zzU#UOxCjh%1VRY_CR0oj5Ul=v@JAAW#w36VKp^*Z;+hHc(3LW*{9pS>9u0o}?B0La z53`0zRo=<2|LDuLR-UthKj*V+@!pME+|<+*Wps2r03jseJ#1Q6IMkE0U&sR!Wp_wGwh0`T{MDpxVSWa*#t z%0eahN7ftpTS~YE`y`JjI{+sJnah!{Qi$MQI zpr8UEFQ4XMV6ghf-ha>PpFV$d6`)53;Ag9@x|VDK#mW9gRc%cWFn;%}-pBb09QXo& z|B=(@)#t}4_1vM$waOER;!pfT2_^HSW-F(sO$?--EaMZv)6PTAlRkOIAgO8qeR*x^ z3*f(c_3Gi2ojrSY9(W`H{^51aPU7me1-7hxE+Ddj$VQr~YhBegNpQ)Q|b0-?j00U{g6SpAd6906LJh?l=iH z)S|#Wq+oPb)Q-`Tr3-6SXWOf4>4KV&hCTq8D^u5v9q%1Kd@z_(NXd0v1Y89AJp!Qw z;OLPfdJ6zF?W0>*@zj6bHod;=rGC1hC7Mz65{hpbx;8I?MKAL85s zNSg%ge4#B@H)DU1chij{1CaOo`Yi$MnG8JhtKAAZuN*iQdb>E#x9fyb@)`eorw&t3 z?e5w54Qbmu1pm=PuTYQt##2puJ2HLH*nk^Xv;nuA4FJ{$cm2s1dy}T@E3Ks zjw|x0Rl7L{^aZ&3BlNT3$tA>_M*0g5Y z&(_DyGhYp8@(B9Wjobf6IUg%+^AO;DcaKpl7^PtNsB7Kr zcZIZ(1Z43=@P`xdS&{%G0ybcWKPC#M4j=!6PRY&xOYPkMn!m>|J>&}I|7w35AS84h z7XcT60gHe>1W54bEYLS)9J5gq)B*fh{bR+C#)^QchcN*B;s-vbuDNAQsJsZ!MptoZ9oC+N&EiV@`_ru7BDAOF)w6=)jp z=QRlG1bNC$N*dU&CtK|aY22mes|hn_qHDDC2&20+4C{mFavO27T(r_|f!FKbgI0swx{8>fHP z$FBb6wbJrj{oC|Q*~{-K-`iXl$g%R5<$tM=)fa5{v^-ysph%x4p9K6E#~A=q4<&!R z_-G&e@*tq3ydL%0AJnl-D{o6Rf3LrAs*OK>uX6tjARH#wa}j?S=m-R7 z0QzGheF^-W@5KOq`tFNTd#OH3wdZ?DOR@ToTIna1{^=i;fTZXCscWN$p3i^VAIH(R zB>@2DI6&ta0Qv$o&kD#f8=nQZZ9XVZ>x-bzM1YiX`Xl8Descreen 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]) +(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]) (defn cursor [filename which] (let [scale 2