From e7081b3ae4a1f83837e3ab4d5cd3ef29b0cf9e16 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Tue, 18 Nov 2014 16:54:06 -0800 Subject: [PATCH] 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