diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index bd1d123d..5bd547e8 100644 Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ diff --git a/desktop/resources/cursor_light.png b/desktop/resources/cursor_light.png index d59f07e8..157f8f5a 100644 Binary files a/desktop/resources/cursor_light.png and b/desktop/resources/cursor_light.png differ diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index a1fd3e43..3029f4a2 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -142,7 +142,7 @@ :feather {:name "Feather" :value :feather :cursor :feather :scripts (mix-ingredients :feather)} :spell-component {:name "Spell component" :value :spell-component :cursor :spell-component} :money {:name "Money" :value :money :cursor :money} - :watch {:name "Watch" :value :watch :cursor :watch} + :charcoal {:name "Piece of charcoal" :value :charcoal :cursor :charcoal} :broken-clock {:name "Sliced time-keeping device" :value :broken-clock :cursor :broken-clock} :slingshot {:name "The Slinger's Shot" :value :slingshot :cursor :slingshot} :note-2 {:name "Bingo card" :value :note-2 :cursor :note-2} diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 6926ba9a..b897a447 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -794,6 +794,7 @@ (actions/play-animation entities :ego :start-squat-2 :stop? false) (Thread/sleep 200) (actions/remove-entity entities :charcoal) + (actions/give entities :charcoal) (actions/play-animation entities :ego :end-squat) (actions/talk entities :ego "It's a small, sharp piece of charcoal.") ) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index a935880e..2ef9357b 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -26,7 +26,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 :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :watch :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot :active-main :shovel :broom]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :charcoal :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot :active-main :shovel :broom]) (def settings (atom {:music-volume 50.0 :sound-volume 75.0