more bug fixes.

2014-12-14 12:04:51 -08:00
parent 97e7e433dc
commit 77e7d7f59c
6 changed files with 30 additions and 15 deletions
--- a/desktop/src-common/advent/actions.clj
+++ b/desktop/src-common/advent/actions.clj
@@ -35,7 +35,10 @@
    ((get-in @entities [:state :obtained-items]) item)))

 (defn has-obtained-one-of? [entities items]
-  (seq (set/intersection (get-in entities [:state :obtained-items]) (set items))))
+  (some (partial has-obtained? entities) items))
+
+(defn has-obtained-all-of? [entities items]
+  (every? (partial has-obtained? entities) items))

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