From 805a30b4f986eb609e2ad8c388da6dbc1313f0e5 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Fri, 31 Oct 2014 13:05:43 -0700
Subject: [PATCH] trophy

---
 desktop/resources/cursor.png                  | Bin 3511 -> 3527 bytes
 desktop/src-common/advent/screens/items.clj   |   2 +-
 .../advent/screens/rooms/inside_castle.clj    |   3 ++-
 desktop/src-common/advent/utils.clj           |   2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index 09fdd7a9b26b817ddf6a80e5e76ae993c3675eb2..add30f6204949e0e481475be88e558daeca40e1f 100644
GIT binary patch
delta 2446
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
MNks-uM6N<$f(w15TmS$7

delta 2429
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

diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj
index 69e93026..9e3a28cc 100644
--- a/desktop/src-common/advent/screens/items.clj
+++ b/desktop/src-common/advent/screens/items.clj
@@ -36,7 +36,7 @@
                                                       (actions/give entities flask-1-with-mushrooms)
                                                       (actions/talk entities :ego "I'll just put a few of these in here."))}})
 
-(def cards {:name "Warlock's Tower cards" :value :cards :cursor :cards})
+(def trophy {:name "Trophy of wisdom" :value :trophy :cursor :trophy})
 (def cheat-deck {:name "Warlock's Tower cheat deck" :value :cheat-deck :cursor :cheat-deck})
 
 (def cat-toy {:name "Cat toy" :value :cat-toy :cursor :cat-toy})
diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj
index 316f2b67..db47452c 100644
--- a/desktop/src-common/advent/screens/rooms/inside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj
@@ -97,7 +97,8 @@
                                                                                         (actions/do-dialogue entities
                                                                                                              :game-player "Wow! That's right!"
                                                                                                              :game-player "I guess I'm not the wisest person in Remington."
-                                                                                                             :game-player "You have earned my trophy."))}
+                                                                                                             :game-player "You have earned my trophy.")
+                                                                                        (actions/give entities items/trophy))}
                                                :anim nil
                                                :talk game-player-talk)}
                 :collision "inside-castle/collision.png"
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index 2610246a..4fd9ca0a 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 :cards :cheat-deck :stick :cat-toy :balloon :frog-legs])
+(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :cheat-deck :stick :cat-toy :balloon :frog-legs])
 
 (defn cursor [filename which]
   (let [scale 2