diff --git a/desktop/resources/behindhouse/collision.png b/desktop/resources/behindhouse/collision.png index ce805620..2170857e 100644 Binary files a/desktop/resources/behindhouse/collision.png and b/desktop/resources/behindhouse/collision.png differ diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 5c6b7c01..b1f3bfa5 100644 Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index f029a06d..be31c5d9 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -210,7 +210,21 @@ (actions/talk entities :ego "I can see Fangald, the wizard inside.") (actions/talk entities :ego "It looks like he's opening his Magi-safe.") (actions/talk entities :ego "[todo: sounds play.]") - (actions/talk entities :ego "A lot of good it'll do me to know his password while he's still there."))}} + (actions/talk entities :ego "A lot of good it'll do me to know his password while he's still there."))} + :mushrooms {:box [247 59 269 76] + :script (actions/get-script + entities + (if ((get-in @entities [:background :entities :ego :inventory]) :mushrooms) + (actions/talk entities :ego "I've already got a junk ton of mushrooms.") + (do + (actions/walk-to entities :ego [242 75]) + (actions/give entities :ego :mushrooms) + (actions/talk entities :ego "Perfectly ripe mushrooms!"))))} + :window {:box [103 44 130 140] + :script (actions/get-script + entities + (actions/walk-to entities :ego [128 100]) + (actions/talk entities :ego "I can see Fangald moving around in there but it's hard to see at this angle."))}} :layers [(assoc (texture "behindhouse/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "behindhouse/house.png") :x 0 :y 0 :baseline 122) (assoc (texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240)] @@ -273,8 +287,7 @@ :override nil} :background (assoc-in (:outside-house backgrounds) [:entities :ego] (get-ego screen)) - :fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000) - })) + :fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)})) :on-render (fn [screen [entities]] diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 9a78e354..bc91bdd0 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 :look :talk :right :down :left :up]) +(def +all-cursors+ [:main :wool :mushrooms :talk :right :down :left :up]) (defn cursor [filename which] (let [scale 2