From 949d7f71c1312b0f5508bd78205e157f9683d957 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 14 Nov 2014 16:34:03 -0800 Subject: [PATCH] adding grass and slobber. --- desktop/resources/cursor.png | Bin 4856 -> 5162 bytes desktop/src-common/advent/screens/items.clj | 2 ++ .../advent/screens/rooms/outside_castle.clj | 8 +++++++- desktop/src-common/advent/screens/scene.clj | 2 +- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 8132e284bfb26fa8d161cbcd54cc077834418545..9a06201f6e80f871a0680aa0103c93757404003e 100644 GIT binary patch delta 4094 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 delta 3786 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 AN&o-= diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 7e7e6b66..b1d2eb29 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -55,3 +55,5 @@ (def glass-eye {:name "Choicest of glass eyes" :value :glass-eye :cursor :glass-eye}) (def motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes}) (def used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs}) +(def grass {:name "Huge grass" :value :grass :cursor :grass}) +(def slobber {:name "Bull slobber" :value :slobber :cursor :slobber}) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index a1398369..f4bcad67 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -120,6 +120,12 @@ :stand) :steer (assoc (texture "outside-castle/steer.png" ) :x 203 :y 155 :baseline 80 :script (actions/get-script entities - (actions/talk entities :ego "That is one buff bull!")))} + (actions/talk entities :ego "That is one buff bull!")) + :scripts {:grass (actions/get-script entities + (actions/walk-to entities :ego [168 150] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities items/grass) + (actions/talk entities :ego "Eww! He slobbered on my hand.") + (actions/give entities items/slobber))})} :collision "outside-castle/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 7bf236a3..f25a66c4 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -219,7 +219,7 @@ :inside-fangald (make-music "inside-fangald.ogg")} :state {:object nil :active? true - :inventory [items/flask-1-with-cream-of-mushroom items/recipe] + :inventory [items/grass] :clues #{} :mints-eaten 0} :actions {:object nil diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 00f245ff..c0f7badb 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 :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber]) (defn cursor [filename which] (let [scale 2