able to get back to blergh.

This commit is contained in:
2015-01-08 16:36:27 -08:00
parent f41a9deae1
commit 16639ef14c
11 changed files with 106 additions and 71 deletions

View File

@@ -123,7 +123,8 @@
(defn should-block? [entities]
(and (= :night (get-in @entities [:state :time]))
(actions/has-obtained? entities :flask-2)))
(actions/has-obtained? entities :flask-2)
(not (actions/has-item? entities :magic-slingshot))))
(defn frankie-comment-on-item [entities]
(cond
@@ -370,6 +371,8 @@
:script (actions/get-script entities
(actions/walk-to entities :ego [210 79] :face :left)
(actions/play-animation entities :ego :squat)
(actions/give entities :note-2)
(actions/remove-entity entities :note)
(common/read-note-2 entities))))
:collision "outside-castle/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)