diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 835a1277..72af70e0 100644 Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ 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