better interaction!

This commit is contained in:
Bryce Covert
2015-07-30 12:44:45 -07:00
parent 39f5d7de1e
commit f6f046bbb9

View File

@@ -80,7 +80,9 @@
laugh (utils/make-anim "castle-gate/frankie.png" [48 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0])
glance (utils/make-anim "castle-gate/frankie.png" [48 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ])]
(assoc (animation->texture screen stand)
:x 215 :y 90 :baseline 150
:x 235 :y 90 :baseline 150
:origin-x 24
:origin-y 0
:anim stand
:anim-start 0
:night-profile :sprite
@@ -134,7 +136,7 @@
flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ])
search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0])]
(assoc (animation->texture screen stand)
:x 214 :y 102 :baseline 138
:x 214 :y 102 :baseline 151
:scale-x 1.4
:scale-y 1.4
:origin-x 6
@@ -144,6 +146,7 @@
:flip flip
:search search
:anim-merges {search {:origin-x 12}
talk {:origin-x 6}
:default {:origin-x 6}}
:update-fn (fn [s es e]
(if (and (= (:flip e) (:anim e))