background script pt 1

2015-11-19 17:39:24 -08:00
parent 462abe747b
commit ff04d07a0f
8 changed files with 70 additions and 53 deletions
--- a/desktop/src-common/advent/screens/rooms/dream.clj
+++ b/desktop/src-common/advent/screens/rooms/dream.clj
@@ -281,7 +281,7 @@
 (defn return-from-island [screen entities]


-  (when (and (not (get-in entities [:actions :script-running?]))
+  (when (and (not (get-in entities [:fg-actions :script-running?]))
             (get-in entities [:state :active?])
             (get-in entities [:room :entities :fairy-godfather :distracted?]))
    (if (> (get-in entities [:room :entities :fairy-godfather :distracted-time] 0) 15)