diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 72af70e0..09fdd7a9 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 649cdbd8..69e93026 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -42,5 +42,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}) +(def frog-legs {:name "Frog legs" :value :frog-legs :cursor :frog-legs}) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 312ab594..a4a43849 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -20,7 +20,13 @@ (actions/walk-to entities :ego [237 1]) (actions/transition-background entities :outside-house [262 88])) :cursor :down} - :wizard {:box [228 80 248 126]}} + :safe {:box [34 70 70 115] + :script (actions/get-script entities + (actions/walk-to entities :ego [59 65]) + (actions/play-animation entities :ego :squat) + (actions/give entities items/frog-legs) + (actions/talk entities :ego "I found some frog legs inside."))} + } :layers [(assoc (texture "inside-house/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240)] diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index a2f2da21..2610246a 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 :balloon]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck :stick :cat-toy :balloon :frog-legs]) (defn cursor [filename which] (let [scale 2