diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 9e0ef7d3..4a9a8677 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 c03b600e..d03df304 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -24,3 +24,6 @@ (actions/remove-item entities flask-1) (actions/give entities flask-1-with-mushrooms) (actions/talk entities :ego "I'll just put a few of these in here."))}}) + +(def cards {:name "Warlock's Tower cards" :value :cards :cursor :cards}) +(def cheat-deck {:name "Warlock's Tower cheat deck" :value :cheat-deck :cursor :cheat-deck}) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 0473c9ee..bcf22505 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -11,6 +11,7 @@ [advent.zone :as zone] [advent.utils :as utils] [advent.screens.rooms :as rooms] + [advent.screens.items :as items] [advent.screens.rooms.outside-house :as rooms.outside-house] [advent.screens.rooms.inside-house :as rooms.inside-house] [advent.screens.rooms.inside-castle :as rooms.inside-castle] @@ -163,7 +164,7 @@ {:rooms rooms :state {:object nil :active? true - :inventory []} + :inventory [items/cheat-deck items/cards]} :actions {:object nil :channel (chan) :current nil diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 11e8f3e9..b13f9cd0 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]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :cards :cheat-deck]) (defn cursor [filename which] (let [scale 2