bloodclot scene.
This commit is contained in:
@@ -160,13 +160,13 @@
|
||||
entity))))
|
||||
|
||||
(defn stop [screen entities target-id & {:keys [face]}]
|
||||
(update-in entities [:room :entities target-id] (comp #(start-animation screen % :stand) (if face #(assoc % :facing face) identity))))
|
||||
(update-in entities [:room :entities target-id] (comp #(start-animation screen % (or (:stand-override %) :stand) ) (if face #(assoc % :facing face) identity))))
|
||||
|
||||
(defn do-stop [entities target-id & {:keys [face]}]
|
||||
(run-action entities
|
||||
(begin [this screen entities]
|
||||
(update-in entities [:room :entities target-id]
|
||||
(comp #(start-animation screen % :stand) (if face #(assoc % :facing face) identity))))
|
||||
(comp #(start-animation screen % (or (:stand-override %) :stand)) (if face #(assoc % :facing face) identity))))
|
||||
(continue [this screen entities] entities)
|
||||
(done? [this screen entities] true)
|
||||
(terminate [this screen entities]
|
||||
@@ -365,7 +365,7 @@
|
||||
:target-id target-id
|
||||
:scale scale)
|
||||
(if animate?
|
||||
(update-in entities [:room :entities target-id ] #(start-animation screen % (or anim :talk)))
|
||||
(update-in entities [:room :entities target-id ] #(start-animation screen % (or anim (:talk-override %) :talk)))
|
||||
entities)))
|
||||
|
||||
(continue [this screen entities] entities)
|
||||
|
||||
Reference in New Issue
Block a user