From 98d8a17fba66aee06f9e17066a64f8411d5ccc12 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Fri, 31 Oct 2014 12:26:47 -0700
Subject: [PATCH] added red balloon.

---
 desktop/resources/cursor.png                  | Bin 3248 -> 3380 bytes
 desktop/src-common/advent/screens/items.clj   |   1 +
 .../advent/screens/rooms/inside_castle.clj    |   7 ++++++-
 .../advent/screens/rooms/outside_castle.clj   |  12 ++++++------
 desktop/src-common/advent/utils.clj           |   2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index 835a1277016e3932d25c1762460e7676355f36eb..72af70e0c8443ba31820ddc59c7acc16ab702f08 100644
GIT binary patch
delta 2297
zcmV<V2nP4C8MGR(R0My^Nkl<ZcmeHN4QQ5C6uz_Q2Y)hUv0SazoD`;&iMm#1mQHj?
zX|WLcK~txO5f(-oveJk`0>PY4B{QT^TF4BiWoE6J_*1DMZZcWTMne<J=m-3IpX>L$
zo$r3{-~E2(pj~*sbMCq4oO{3bd!KX8z3->g|D+A6%8TLR*EN6ply}qaJJ1#Gz@FUv
z7_Mxur3WU6UAU03iDG{@$8c%Cahj<waesclSXF6}dqwptfuC2_+YJPVm$c^u`N+@D
z{tpl|KgQBoLpru~b#*_sw6y$=D{PHk<9Mccd5w29*~F6TV%0AWPa6koRxXI8>q`P(
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
Tl^ity00000NkvXXu0mjffa!6Q

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

diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj
index 52f29bfd..649cdbd8 100644
--- a/desktop/src-common/advent/screens/items.clj
+++ b/desktop/src-common/advent/screens/items.clj
@@ -41,5 +41,6 @@
 
 (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}})
+(def balloon {:name "Choicest of balloons" :value :balloon :cursor :balloon})
 
 
diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj
index 13e5055f..94be2bdb 100644
--- a/desktop/src-common/advent/screens/rooms/inside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj
@@ -83,7 +83,12 @@
                                                                                    (actions/do-dialogue entities
                                                                                                         :game-player "That's right! Now for your second riddle:"
                                                                                                         :game-player "Filled with air, light as a feather,"
-                                                                                                        :game-player "If you want to keep it, best have a tether."))}
+                                                                                                        :game-player "If you want to keep it, best have a tether."))
+                                                         :balloon (actions/get-script entities
+                                                                                      (actions/do-dialogue entities
+                                                                                                           :game-player "That's right! Now for your third riddle:"
+                                                                                                           :game-player "Hippity-hop, I jump really far,"
+                                                                                                           :game-player "Now I'm dead, or at least a have a scar."))}
                                                :anim nil
                                                :talk game-player-talk)}
                 :collision "inside-castle/collision.png"
diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj
index db346d97..dc01c9af 100644
--- a/desktop/src-common/advent/screens/rooms/outside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj
@@ -52,13 +52,13 @@
                                                          :peddler "I have the choicest of all types of wares..."
                                                          :peddler "...I'm well stocked on used earplugs..."
                                                          :peddler "...glass eyes, motivational tapes... " 
-                                                         :peddler "...and useful books like this:"
-                                                         :peddler "'Checkers Mastery in Less Than 10 Seconds'"
-                                                         :ego "I sure am interested on that book on checkers."
-                                                         :peddler "An excellent selection! It is the choicest of checkers book you'll ever find."
-                                                         :peddler "This book will only set you back 75 sheckels."
+                                                         :peddler "... and this nice, big, red balloon."
+                                                         :ego "I sure am interested in that balloon."
+                                                         :peddler "An excellent selection! It is the choicest of balloons you'll ever find."
+                                                         :peddler "This bundle of joy will only set you back 75 sheckels."
                                                          :ego "But I haven't got any money!"
-                                                         :peddler "Then you won't have the choicest of checkers books."))}}
+                                                         :peddler "Then you won't have the choicest of balloons.")
+                                    (actions/give entities items/balloon))}}
                 :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 67f17f11..a2f2da21 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])
+(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck :stick :cat-toy :balloon])
 
 (defn cursor [filename which]
   (let [scale 2