diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 8132e284..9a06201f 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 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