From b6b7a11d344501e92e4cde594aed5762253baf82 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sun, 2 Nov 2014 08:49:37 -0800 Subject: [PATCH] added stool. --- desktop/resources/cursor.png | Bin 3527 -> 3474 bytes desktop/src-common/advent/screens/items.clj | 1 + desktop/src-common/advent/utils.clj | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index add30f6204949e0e481475be88e558daeca40e1f..824741df0b2c66aa08c7550f5c7094174b4456e6 100644 GIT binary patch delta 2392 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

#15m0BC1R0#heH zuFBv3KoR(eiMo`!5%CABzXboF!mG8l)IpIX6CmKR`m=t#^3OEl2wQDyYilzC5&TdJ z3JMhKTH)}A0H&X9Zef{(^ySzsodme@kDFQ=+?{{w&FN&&HLsxyB!HSE0)iZ%H_KZu zA4^lsdZ|lVn~hJl|BClPZv$q$zEi&&_r5*Q`)2aDY3~W`qvXYm#c}pt(Sg-iS-7xY zu;`tuJ)^EIXs>;subH+N!i4W5z8lF7SS;|4XYk<(~}&KmC?2wP&lDk^ti-krKf0v(0J7j2YIDrZ0^y z<@`BjQkm1XEC)oul%IfSoTJAZYJEnj9FhS0APN2>gT>0{6T&P%3ouClgkj490NgS6 zcgvatfCpr`nZ%N*zx;i!bqRi(k4Xah5YT@#Bng=Ms5a7m6rBMGkem8LwLh!5&rb*# z$`+HWKKdm1ZMI>$)1^K17`I+`jW!ux-%erGH&^~Je^XBo*;ZrIHq&+(fL-Fn`6ih^ z4glqtNzVbyL*=-00D>MQ(6LWr79i(2x0WEvD{58J3_xygvyH`xxUBvFwh4Z${wS1;CvBT#05pPhIT#F9f9(BJt3PAtEFh%= z@L75m+`?)TIlt;q&H~jllpxUmiSz2wK1zMO?<#Hb?!M>~e;6TU zjw@m5v@0=4JDJ84z^?O<^JGk(F~omm4X~GE%UA&a#EBETQg`_9;VGzt1XyREO`7ja zU0t0{S3m-++x+78_w=!?{#ebisvr4mzZyPtv^It8w(U2i9;RoyBng(| zUIEDcww@cnPBQrLqpb=y-+h0O^VSjvdRyw0N}cR$-P1$z)T*tijbDG7b$El|@15IL zz4p1M%BpGu1`PLV>=5tMS=tt=iR2?BNy=FV2|m)34A#o`#=N$Kl}m$ zAlM=C0HvdA9l$2I$3HeiyWwVl43Hr}q924IW8zaD{>ew4?2mb7P0qSE$9W(DNVKJo zSts}#R{iAQM?Bl%8dqf7s%_2zZGu?#5ri%=O#e8r%W*Du{osGj_k#BZ^;4(Ms!kpK zFE1CqRJm;)(DJD#DwjpgvmqNO^9Xv{#_j)McWTKdZQjo(0)T(iBjZx;=Tfp!R26qo zX8O-w?)&i%J=D2Ke(Ek6IU&s)B#GmzZ><2(QdfKeF$eIWtbR2nbU z*1CM}&G&yiX{>FP8#FEkmyB}8s06+QIVX#L9u~6SIXHu4BYA^tHz(7$_|^~KiwS(r z1z?H;4Q<0@wlT8x51Ut*K8^&!{HVwFao5&zHUrsz==4PI8V~$3Apn3rsw5!*#7RN| zQR60!MG}Bt91#%w1UP&Ma@5266Fn3JYAyf$J79nN?jM)>%e!Lx?(e$tBhJ1J%47P^ zvjCSYfd3H~wzo%rQt)FwOx;~G0r-TKOk#luKma5J8yRqQ=eYdbM-s60qpy_!c*k00 zi?{<4{G3n{5};3*j3bFKKj<%aCLl=w^C1!N8$UnwQNqSnm%4ue=JO^INxy0300000 MNks-uM6N<$f~nc0Hvj+t diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 6e26d8d7..2dbddcae 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -47,5 +47,6 @@ (def stick {:name "Stick" :value :stick :cursor :stick :scripts {:wool make-cat-toy}}) (def balloon {:name "Choicest of balloons" :value :balloon :cursor :balloon}) (def frog-legs {:name "Frog legs" :value :frog-legs :cursor :frog-legs}) +(def stool {:name "Stool" :value :stool :cursor :stool}) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 4fd9ca0a..ed51c75c 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -11,7 +11,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 :cheat-deck :stick :cat-toy :balloon :frog-legs]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs]) (defn cursor [filename which] (let [scale 2