fixed dialogue and minor bug fixes.

This commit is contained in:
2014-12-14 11:24:23 -08:00
parent 19394e78a7
commit 1ab740a30e
3 changed files with 56 additions and 61 deletions

View File

@@ -204,7 +204,8 @@
:collision "inside-antique/collision.png"
:apply-state (fn [entities]
(as-> entities entities
(if (actions/has-obtained? entities :teddy)
(if (or (actions/has-item? entities :teddy)
(actions/has-obtained? entities :balloon))
(update-in entities [:room :entities] #(dissoc % :teddy))
entities)))
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50)