From 38f7dcfefb8bdbc94816609bf022d38a7dba1958 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 22 Nov 2015 14:55:34 -0800 Subject: [PATCH] can get a piece of charcoal. --- desktop/src-common/advent/screens/rooms/outside_house.clj | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index b897a447..59f304e5 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -507,13 +507,19 @@ (update-in entities [:room :entities] #(assoc % :note (get-in entities [:room :note]))) entities)) +(defn add-charcoal-if-necessary [entities] + (if (and (get-in entities [:state :seen-frankie?]) + (not (actions/has-obtained? entities :charcoal))) + (update-in entities [:room :entities] assoc :charcoal (get-in entities [:room :charcoal])) + entities)) + (defn make-night [screen entities] (as-> entities entities (update-in entities [:room :entities] #(dissoc % :butterfly)) (update-in entities [:room :entities] #(assoc % :cauldron (get-in entities [:room :cauldron]))) - (update-in entities [:room :entities] assoc :charcoal (get-in entities [:room :charcoal])) + (add-charcoal-if-necessary entities) (utils/play-sound! screen entities (get-in entities [:room :cauldron-sound :sound]) (utils/sourced-volume-fn :cauldron 0.15 [139 73])