diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 92337a73..ea3b850d 100644 Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ diff --git a/desktop/resources/inside-house/flask.png b/desktop/resources/inside-house/flask.png new file mode 100644 index 00000000..19f3f736 Binary files /dev/null and b/desktop/resources/inside-house/flask.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 7b198fc5..14e63c76 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -29,6 +29,12 @@ :right {:talk wizard-talk :stand wizard-stand} :facing :left) - :stand)} + :stand) + :flask (assoc (texture "inside-house/flask.png") + :x 265 :y 80 :baseline 240 + :script (actions/get-script entities + (actions/give entities :flask) + (actions/do-dialogue entities :ego "Hey you think I could have this flask?" + :wizard "Sure.")))} :collision "inside-house/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75)))) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index fc3dc26d..5b72f249 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -144,6 +144,7 @@ :cursor :left}} :layers [(assoc (texture "bg5.png") :x 0 :y 0 :baseline 0) (assoc (texture "house.png") :x 0 :y 0 :baseline 122) + (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 95) (assoc (texture "overdirt.png") :x 0 :y 0 :baseline 240) (assoc (texture "background-trees.png") :x 0 :y 0 :baseline 44)] :entities {:sheep (actions/start-animation screen diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 22da29e4..e21aa86c 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -133,7 +133,7 @@ (update! screen :renderer (stage) :camera (orthographic)) (let [_ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) music (sound "town-music.mp3") - _ (sound! music :loop 0.20) + _ (sound! music :loop 0.80) rooms {:inside-house (rooms.inside-house/make screen) :outside-house (rooms.outside-house/make screen) :behind-house (rooms.behind-house/make screen) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 937a4135..3f98f421 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]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask]) (defn cursor [filename which] (let [scale 2