diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index ea3b850d..8ded96a2 100644 Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 5b72f249..81657eef 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -161,7 +161,10 @@ :carrot (actions/get-script entities (actions/walk-to entities :ego [132 140]) (actions/talk entities :ego "Come on girl, get the carrot!") - (actions/walk-straight-to entities :sheep [95 150]))} + (actions/walk-straight-to entities :sheep [95 150])) + :flask (actions/get-script entities + (actions/give entities :flask-with-contents) + (actions/talk entities :ego "Sheeps milk."))} :left {:walk (utils/flip sheep-walk) :stand (utils/flip sheep-stand)} :right {:walk sheep-walk diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 3f98f421..bac04070 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]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents]) (defn cursor [filename which] (let [scale 2