added new screen.

2014-12-28 18:57:53 -08:00
parent 905398a3f5
commit 218afe3973
11 changed files with 68 additions and 7 deletions
--- a/desktop/src-common/advent/actions.clj
+++ b/desktop/src-common/advent/actions.clj
@@ -41,7 +41,9 @@
  (every? (partial has-obtained? entities) items))

 (defn has-one-of? [entities items]
-  (seq (set/intersection (set (get-in entities [:state :inventory])) (set items))))
+  (if (map? entities)
+    (seq (set/intersection (set (get-in entities [:state :inventory])) (set items)))
+    (seq (set/intersection (set (get-in @entities [:state :inventory])) (set items)))))

 (defmacro run-action [entities & forms]
  `(let [c# (chan)]