From 51ae5e3a09c7251d1ea2e9f12afd40677192b8ae Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Thu, 30 Oct 2014 18:18:36 -0700
Subject: [PATCH] making cat toys.

---
 desktop/resources/cursor.png                  | Bin 3155 -> 3248 bytes
 .../src-common/advent/screens/inventory.clj   |   2 +-
 desktop/src-common/advent/screens/items.clj   |  23 +++++++++++++++---
 desktop/src-common/advent/screens/rooms.clj   |   4 +--
 .../advent/screens/rooms/outside_house.clj    |   6 ++---
 desktop/src-common/advent/utils.clj           |   2 +-
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index 42c939be9a0f5dcc935418d7e520238daff896e0..835a1277016e3932d25c1762460e7676355f36eb 100644
GIT binary patch
delta 2165
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

delta 2072
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
CLG<MS

diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj
index 4a21720e..67c35e73 100644
--- a/desktop/src-common/advent/screens/inventory.clj
+++ b/desktop/src-common/advent/screens/inventory.clj
@@ -91,7 +91,7 @@
                        (if highlighted-item
                          (if (= :main current-cursor)
                            (run! @(resolve 'advent.screens.scene/scene) :on-chose-item :item highlighted-item)
-                           (when-let [interaction-script ((or (:scripts highlighted-item) (constantly nil)) current-cursor)]
+                           (when-let [interaction-script ((or (:scripts highlighted-item) (constantly nil)) (:value current-cursor))]
                              (interaction-script room-entities)
                              (close entities)))
                          (close entities)))))
diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj
index c033ae5c..52f29bfd 100644
--- a/desktop/src-common/advent/screens/items.clj
+++ b/desktop/src-common/advent/screens/items.clj
@@ -1,7 +1,18 @@
 (ns advent.screens.items
   (:require [advent.actions :as actions]))
 
-(def wool {:name "Wool" :value :wool :cursor :wool})
+
+(declare stick)
+(declare wool)
+(declare cat-toy)
+(def make-cat-toy
+  (actions/get-script entities
+                      (actions/remove-item entities stick)
+                      (actions/remove-item entities wool)
+                      (actions/give entities cat-toy)
+                      (actions/talk entities :ego "It makes a little cat toy!")))
+
+(def wool {:name "Wool" :value :wool :cursor :wool :scripts {:stick make-cat-toy}})
 (def mushrooms {:name "Mushrooms" :value :mushrooms :cursor :mushrooms})
 (def carrot {:name "Carrot" :value :carrot :cursor :carrot})
 
@@ -16,15 +27,19 @@
                       (actions/talk entities :ego "It's just like cream of mushroom soup.")))
 
 (def flask-1-with-milk {:name "Flask with milk" :value :flask-1-with-milk :cursor :flask-with-contents
-                        :scripts {mushrooms (make-cream-of-mushroom-from flask-1-with-milk)}}) 
+                        :scripts {:mushrooms (make-cream-of-mushroom-from flask-1-with-milk)}}) 
 
 (def flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-contents}) 
 (def flask-1 {:name "Flask" :value :flask-1 :cursor :flask
-              :scripts {mushrooms (actions/get-script entities
+              :scripts {:mushrooms (actions/get-script entities
                                                       (actions/remove-item entities flask-1)
                                                       (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 cheat-deck {:name "Warlock's Tower cheat deck" :value :cheat-deck :cursor :cheat-deck})
-(def stick {:name "Stick" :value :stick :cursor :stick})
+
+(def cat-toy {:name "Cat toy" :value :cat-toy :cursor :cat-toy})
+(def stick {:name "Stick" :value :stick :cursor :stick :scripts {:wool make-cat-toy}})
+
+
diff --git a/desktop/src-common/advent/screens/rooms.clj b/desktop/src-common/advent/screens/rooms.clj
index 3d60184e..2c042b69 100644
--- a/desktop/src-common/advent/screens/rooms.clj
+++ b/desktop/src-common/advent/screens/rooms.clj
@@ -9,7 +9,7 @@
                                                           (if (= :main cursor)
                                                             (:script spec)
                                                             (when-let [scripts (:scripts spec)]
-                                                              (scripts cursor))))}))
+                                                              (scripts (:value cursor)))))}))
         entities (into {} (for [[id entity] entities]
                             [id (merge entity
                                        {:mouse-in? (fn [entities x y]
@@ -22,7 +22,7 @@
                                                         (if (= :main cursor)
                                                           (:script entity)
                                                           (when-let [scripts (:scripts entity)]
-                                                              (scripts cursor))))}))]))]
+                                                            (scripts (:value cursor)))))}))]))]
     (merge params {:collision (advent.pathfind/map-from-resource collision)
                    :interactions interactions-as-list
                    :entities entities})))
diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj
index ee7ec9ce..683ec941 100644
--- a/desktop/src-common/advent/screens/rooms/outside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_house.clj
@@ -173,13 +173,13 @@
                                                                                    (actions/give entities items/wool)
                                                                                    (actions/talk entities :ego "I guess her wool is shedding."))
                                                                                (actions/talk entities :ego "She's too far away for me to pet her."))))
-                                                                  :scripts {items/wool (actions/get-script entities
+                                                                  :scripts {:wool (actions/get-script entities
                                                                                                       (actions/talk entities :ego "She doesn't need it back."))
-                                                                            items/carrot (actions/get-script entities
+                                                                            :carrot (actions/get-script entities
                                                                                                         (actions/walk-to entities :ego ego-sheep-loc)
                                                                                                         (actions/talk entities :ego "Come on girl, get the carrot!")
                                                                                                         (actions/walk-straight-to entities :sheep [95 150]))
-                                                                            items/flask-1 (actions/get-script entities
+                                                                            :flask-1 (actions/get-script entities
                                                                                                        (if (is-sheep-close? @entities)
                                                                                                          (do (actions/walk-to entities :ego ego-sheep-loc)
                                                                                                              (actions/play-animation entities :ego :reach)
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index 14201302..67f17f11 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])
+(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck :stick :cat-toy])
 
 (defn cursor [filename which]
   (let [scale 2