rooms are beginning to be affected by state.

desktop/src-common/advent/actions.clj

@@ -6,6 +6,7 @@
             [clojure.pprint]
             [clojure.string :as s]
             [clojure.zip :as zip]
+            [clojure.set :as set]
             [advent.pathfind]
             [advent.actions :as actions]
             [advent.screens.dialogue :as dialogue]
@@ -26,6 +27,9 @@
 (defn has-item? [entities item]
   ((set (get-in entities [:state :inventory])) item))
 
+(defn has-one-of? [entities items]
+  (seq (set/intersection (set (get-in entities [:state :inventory])) (set items))))
+
 (defmacro get-script [entities & forms]
   `(fn [starting-entities#]
      (let [~entities (atom starting-entities#)]
@@ -407,7 +411,11 @@
                              entities (-> entities 
                                           (assoc-in [:room] (get-in entities [:rooms new-background]))
                                           (assoc-in [:room :entities :ego] ego))
-                             new-music (get-in entities [:room :music])]
+                             new-music (get-in entities [:room :music])
+                             apply-state (get-in entities [:room :apply-state])
+                             entities (if apply-state
+                                        (apply-state entities)
+                                        entities)]
                          (when (not= new-music old-music)
                            (doseq [[k v] (:musics entities)
                                    :when (and v (not= new-music k))]