From a04259a9da225c46b310915f6d2064c19dd8ccfe Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sat, 15 Aug 2015 10:33:21 -0700 Subject: [PATCH] can't get stash too quickly now. --- desktop/gametodos.txt | 3 --- desktop/src-common/advent/screens/rooms/cat_tree.clj | 8 +++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index e6c8e4bc..ecb0ef2c 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -28,9 +28,6 @@ during the animation when he drinks the potion. + only interact with something if you started your click on it -+ Frankie should talk less when you enter room -+ Frankie should say something "Shhh, Tick's here." -+ You can find Gandarf's stash too quickly + Click on cauldron should tell you what you need to add diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index b8121e17..7b2463cb 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -104,12 +104,18 @@ (do-saved-grandma-dialogue entities) (do-grandma-dialogue-with-cat entities))) +(defn remove-rock-if-necessary [entities] + (if (actions/has-obtained? entities :note-1) + entities + (utils/remove-interaction entities :rock))) + (defn make-night [entities] (-> entities (update-in [:room :entities] #(dissoc % :grandma)) (utils/remove-interaction :ladder-area) (utils/remove-interaction :grandma) - (update-in [:room :entities] #(assoc % :owl (doto (get-in entities [:room :owl]) println))))) + (update-in [:room :entities] #(assoc % :owl (get-in entities [:room :owl]))) + remove-rock-if-necessary)) (defn talk-to-owl [entities]