couple bugfixes.

desktop/project.clj

@@ -14,7 +14,7 @@
                   :classifier "natives-desktop"]
                  [org.clojure/clojure "1.6.0"]
                  [org.clojure/tools.nrepl "0.2.7"]
-                 [play-clj "0.4.2"]
+                 [play-clj "0.4.2-SNAPSHOT"]
                  [org.clojure/data.priority-map "0.0.5"]
                  [org.clojure/core.async "0.1.338.0-5c5012-alpha"]]
   :source-paths ["src" "src-common"]

desktop/src-common/advent/screens/rooms/cat_tree.clj

@@ -331,6 +331,6 @@
                                        entities)
                                      (if (= :night (get-in entities [:state :time]))
                                        (make-night entities)
-                                       (utils/remove-interaction :rock)
+                                       (utils/remove-interaction entities :rock)
 )))
                 :start-pos [203 1])))

desktop/src-common/advent/screens/rooms/inside_castle.clj

@@ -115,6 +115,8 @@
   (actions/transition-music entities :pull-sword :town-1)
   (actions/do-dialogue entities :ego "That was weird."
                        :ego "I have to go show my friends!")
+
+  (walk-to-blergh entities)
   
   
   

desktop/src-common/advent/screens/rooms/outside_castle.clj

@@ -122,7 +122,7 @@
         :else (do-initial-peddler-conversation entities)))
 
 (defn should-block? [entities]
-  (and (:night (get-in @entities [:state :time]))
+  (and (= :night (get-in @entities [:state :time]))
        (actions/has-obtained? entities :flask-2)
        (not (actions/has-item? entities :magic-slingshot))))
 

desktop/src-common/advent/screens/scene.clj

@@ -341,7 +341,7 @@
     (utils/load)
     {:object nil
      :active? true
-     :last-room :dream
+     :last-room :outside-house
      :time :day
      :obtained-items #{} 
      :inventory []
@@ -404,7 +404,7 @@
 
         (doseq [[k [start time fn]] (get-in entities [:room :timers])]
           (add-timer! screen k start time))        
-        (when (not (get-in entities [:state :seen-intro?]))
+        #_(when (not (get-in entities [:state :seen-intro?]))
           ((actions/get-script entities (rooms.dream/do-intro entities)) entities))
         (if-let [apply-state (get-in entities [:room :apply-state])]
           (apply-state entities)