notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final blergh encounter.

Browse Source
This commit is contained in:
Remington Covert
2014-12-19 12:31:16 -08:00
parent d097517c46
commit 5aee0724f5
4 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop/src-common/advent/actions.clj
View File

@@ -110,7 +110,7 @@
(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))))
(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed]}]
(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed anim override-dir]}]
(let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id])
final-x (int final-x)
final-y (int final-y)
@@ -138,10 +138,10 @@
(update-in entities [:room :entities target-id]
#(start-animation screen
(assoc (jump-to screen entities % [(+ moved-x from-x) (+ moved-y from-y)] update-baseline?)
:facing (cond (< delta-x 0) :left
(> delta-x 0) :right
:else (:facing %)))
:walk
:facing (or override-dir (cond (< delta-x 0) :left
(> delta-x 0) :right
:else (:facing %))))
(or anim :walk)
))))))
(done? [this screen entities]
@@ -455,6 +455,8 @@
music-changed? (not= old-music new-music)]
(run-action entities
(begin [this screen entities]
(doseq [[k] (get-in entities [:room :timers])]
(remove-timer! screen k))
(-> entities
(assoc-in [:transition]
(assoc (texture "black.png")
@@ -508,6 +510,8 @@
(<= (get-in entities [:transition :opacity]) 0.0))
(terminate [this screen entities]
(doseq [[k [start time fn]] (get-in entities [:room :timers])]
(add-timer! screen k start time))
(dissoc entities :transition))
(can-skip? [this screen entities]