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

correct cursor logic, scared animation update, choosable volume.

Browse Source
This commit is contained in:
Remington Covert
2015-03-06 07:13:18 -08:00
parent b057593b86
commit 183b369441
18 changed files with 129 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,13 +344,14 @@
scaled (get-in entities [:room :entities target-id :scaled])
scale-fn (get-in entities [:room :scale-fn])
scale (get-in entities [:room :entities target-id :scale-y] 1)
height (* scale height)]
height (* scale height)]
(screen! dialogue/talking-screen :on-talk :text text
:x target-x :y (+ (get-in entities [:room :entities target-id :y]) height)
:color (get-in entities [:room :entities target-id :talk-color])
:target-id target-id
:scale scale)
:scene-viewport (:viewport screen)
:x target-x :y (+ target-y height)
:color (get-in entities [:room :entities target-id :talk-color])
:target-id target-id
:scale scale)
(if animate?
(update-in entities [:room :entities target-id ] #(start-animation screen % (or anim :talk)))
entities)))
@@ -611,7 +612,7 @@
entities (if apply-state
(apply-state entities)
entities)
entities (utils/update-override entities)]
entities (utils/update-override screen entities)]
(when (and (not= new-music old-music) transition-music?)
(doseq [[k v] (:musics entities)
:when (and v (not= new-music k))]