more blinks.

This commit is contained in:
2015-10-11 18:59:20 -07:00
parent 8ead5bbf6b
commit 343d1f0e26
5 changed files with 27 additions and 10 deletions

View File

@@ -164,7 +164,7 @@
(defn make [screen]
(let [shopkeep-sheet (texture! (utils/get-texture "inside-antique/shopkeep-talk.png") :split 18 21)
shopkeep-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 1 (repeat 50 0) 1 0 1 0 1])]
shopkeep-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 1 (repeat 50 0) 1 0 1 0])]
(aget shopkeep-sheet 0 i)))
shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]]
(aget shopkeep-sheet 0 i)))
@@ -282,6 +282,10 @@
:sigh shopkeep-sigh
:anim-merges {shopkeep-sigh {:origin-x 9}
:default {:origin-x 9}}
:anim-sound-frames {shopkeep-stand {31 [:blink 0.5 1.5]
81 [:blink 0.5 1.5]
83 [:blink 0.5 1.5]}
shopkeep-talk {6 [:blink 0.5 1.5]}}
:script (actions/get-script entities (do-antique-dialogue entities))
:scripts #(condp = %
:teddy (actions/get-script entities