diff --git a/desktop/resources/cat-tree/background.png b/desktop/resources/cat-tree/background.png index f492d617..ce9e4709 100644 Binary files a/desktop/resources/cat-tree/background.png and b/desktop/resources/cat-tree/background.png differ diff --git a/desktop/resources/cat-tree/background.psd b/desktop/resources/cat-tree/background.psd index 5aac4184..b2ce83a3 100644 Binary files a/desktop/resources/cat-tree/background.psd and b/desktop/resources/cat-tree/background.psd differ diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index 0c651def..95e34b29 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -42,7 +42,15 @@ :script (actions/get-script entities (when (get-in @entities [:room :entities :ladder]) (get-down entities)))})) - )}}} + )}} + :grass {:box [26 105 60 160] + :script (actions/get-script entities + (if (not (actions/has-item? entities :grass)) + (do + (actions/walk-to entities :ego [60 100] :face :left) + (actions/play-animation entities :ego :reach) + (actions/give entities :grass)) + (actions/talk entities :ego "I don't really need any more grass.")))}} :layers [(assoc (texture "cat-tree/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "cat-tree/tree-and-rock.png") :x 0 :y 0 :baseline 161) (assoc (texture "cat-tree/sillhoute.png") :x 0 :y 0 :baseline 240)] diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 3267cf71..3fbd614e 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -210,7 +210,7 @@ (utils/load) {:object nil :active? true - :inventory [:grass :carrot] + :inventory [:carrot] :clues #{} :mints-eaten 0})) (defscreen scene