starting on a good sequence for blergh fight.

This commit is contained in:
2015-02-12 20:44:37 -08:00
parent 1ac64cfb2d
commit 30a5ffd91a
20 changed files with 132 additions and 10 deletions

View File

@@ -116,7 +116,7 @@
(update-in entities [:room :entities target-id] (comp #(start-animation screen % :stand) (if face #(assoc % :facing face) identity))))
(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed anim override-dir]}]
(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed anim override-dir stop?]}]
(let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id])
final-x (int final-x)
final-y (int final-y)
@@ -155,7 +155,9 @@
(< (utils/dist final-x final-y from-x from-y) 1)))
(terminate [this screen entities]
(stop screen entities target-id :face face))
(if (or (nil? stop?) stop?)
(stop screen entities target-id :face face)
entities))
(can-skip? [this screen entities]
false))))