This commit is contained in:
2015-02-19 23:22:28 -08:00
parent d8af16b82a
commit 843fde014d
10 changed files with 28 additions and 4 deletions

View File

@@ -323,6 +323,7 @@
:game-player (assoc (texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191
`:talk-color (color 1.0 0.3 0.2 1.0)
:script (actions/get-script entities (do-game-player-dialogue entities))
:blink (sound "blink-other.ogg")
:scripts #(condp = %
:wool (actions/get-script entities
(walk-to-player entities)
@@ -371,6 +372,7 @@
:anim game-player-stand
:anim-start 0
:stand game-player-stand
:anim-sound-frames {game-player-stand {11 [:blink 0.3] }}
:flex game-player-flex
:talk game-player-talk)}
:monocle (rooms/make-entity :monocle (assoc (animation->texture screen monocle)

View File

@@ -295,8 +295,9 @@
:sunrise [(assoc (texture "outside-castle/background-sunrise.png") :x 0 :y 0 :baseline 0)]}
:entities {:peddler (actions/start-animation screen
(assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
:anim-sound-frames {peddler-stand {23 [:scratch 1.0]}}
:scratch (sound "scratch.ogg")
:anim-sound-frames {peddler-stand {23 [:scratch 1.0]}
peddler-talk {23 [:scratch 1.0]}}
:scratch (sound "outside-castle/scratch.ogg")
:talk peddler-talk :stand peddler-stand
:talk-color (color 1.0 0.9 0.4 1.0)
:script (actions/get-script