From 39cbd94df6a16d4cbeb850e6422a49b21e6da1cf Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Sat, 8 Nov 2014 11:29:56 -0800
Subject: [PATCH] puzzles.

---
 desktop/resources/cursor.png                  | Bin 3474 -> 3935 bytes
 desktop/src-common/advent/screens/items.clj   |   1 +
 .../advent/screens/rooms/inside_antique.clj   |  18 +++++++++---------
 .../advent/screens/rooms/outside_castle.clj   |   7 +++++--
 desktop/src-common/advent/utils.clj           |   2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index 824741df0b2c66aa08c7550f5c7094174b4456e6..0f63380bfdcdff362d0a36b2091860c32aa1da55 100644
GIT binary patch
delta 2893
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

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

diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj
index 2dbddcae..c35f1a21 100644
--- a/desktop/src-common/advent/screens/items.clj
+++ b/desktop/src-common/advent/screens/items.clj
@@ -48,5 +48,6 @@
 (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})
+(def teddy {:name "Teddy Bear" :value :teddy :cursor :teddy})
 
 
diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj
index 62732c08..3f136510 100644
--- a/desktop/src-common/advent/screens/rooms/inside_antique.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj
@@ -43,21 +43,21 @@
                                         "Listen, I really need that teddy bear you have.")
                                       {:run #(actions/respond entities %
                                                               :shopkeep "Why?"
+                                                              :shopkeep "It belonged to my long lost son."
                                                               :shopkeep "Why should I give it to you?")
                                        :choices ["I just need it ok?"
                                                  {:run #(actions/respond entities %
                                                                          :shopkeep "I'm sorry, it's not for sale.")
                                                   :choices actions/something-else} 
-                                                 (when (get-in @entities [:state :knows-about-son])
-                                                   "Your long lost son said I could have it.")
-                                                 {:run #(actions/respond entities % :shopkeep "REALLY? You've met him?")}]}
+                                                 "Your long lost son said I could have it."
+                                                 {:run #(do (actions/respond entities % :shopkeep "REALLY? You've met him?")
+                                                            (actions/give entities items/teddy))}]}
                                       "How's life in the antique shop biz?"
-                                      {:run #(do (actions/update-state entities (fn [state] (assoc state :knows-about-son true)))
-                                                 (actions/respond entities %
-                                                                  :shopkeep "Pretty lonely."
-                                                                  :shopkeep "My long lost son used to help me run this shop, but he's been gone for five years now."
-                                                                  :shopkeep "I've been couped up in here by myself ever since."
-                                                                  :shopkeep "Now all I have is this grandfather clock to keep me company."))
+                                      {:run #(actions/respond entities %
+                                                              :shopkeep "Pretty lonely."
+                                                              :shopkeep "My long lost son used to help me run this shop, but he's been gone for five years now."
+                                                              :shopkeep "I've been couped up in here by myself ever since."
+                                                              :shopkeep "Now all I have is this grandfather clock to keep me company.")
                                        :choices actions/previous-choices}
                                       "Nevermind." {:run #(actions/respond entities % :shopkeep "Feel free to look around.")}]}))
 
diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj
index 4d60d4fb..d69cfdeb 100644
--- a/desktop/src-common/advent/screens/rooms/outside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj
@@ -61,8 +61,11 @@
                                                          :ego "But I haven't got any money!"
                                                          :peddler "Then you won't have the choicest of balloons."
                                                          :peddler "I could, however, give you the balloon if you could procure for me a ware I'm missing."
-                                                         :peddler "A child's toy. And I mean the choicest of children's toys.")
-                                    (actions/give entities items/balloon))}}
+                                                         :peddler "A child's toy. And I mean the choicest of children's toys."))
+                           :scripts {:teddy (actions/get-script entities
+                                                                (actions/remove-item entities items/teddy)
+                                                                (actions/give entities items/balloon)
+                                                                (actions/talk entities :peddler "Thank you for your business!"))}}}
                 :layers [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]
                 :entities {:peddler (actions/start-animation screen
                                                              (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index ed51c75c..084ee7e5 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 :stool :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 :teddy])
 
 (defn cursor [filename which]
   (let [scale 2