This commit is contained in:
2015-02-25 09:19:14 -08:00
parent f4e39b5d0f
commit f1ef3eb31b
10 changed files with 6 additions and 4 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -157,11 +157,11 @@
:bloodclot-head "You're no hero. You're just a morsel."
:bloodclot-head "Come here, and I promise I will spare you much pain.")
(actions/talk entities :ego "Wait a second. I'm just a kid." :anim :scared-talk)
(actions/walk-straight-to entities :ego [115 45] :override-dir :right)
(actions/walk-straight-to entities :ego [115 45] :override-dir :right :anim :scared-walk :speed 0.5)
(actions/talk entities :ego "I'm just trying to impress Georgia McGorgeous." :anim :scared-talk)
(actions/walk-straight-to entities :ego [75 45] :override-dir :right)
(actions/walk-straight-to entities :ego [75 45] :override-dir :right :anim :scared-walk :speed 0.5)
(actions/talk entities :ego "I just... accidentally pulled the sword!":anim :scared-talk)
(actions/walk-straight-to entities :ego [35 45] :override-dir :right)
(actions/walk-straight-to entities :ego [35 45] :override-dir :right :anim :scared-walk :speed 0.5)
(actions/talk entities :ego "I wouldn't taste very good anyhow!" :anim :scared-talk)
(actions/begin-animation entities :ego :scared)
(actions/do-dialogue entities

View File

@@ -190,6 +190,7 @@
passed-out (utils/make-anim "ego/burnt.png" [40 46] 0.12 [9 10 11 10])
scared (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1])
scared-talk (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1 0 1 0 1 0 1 2 3 2 3 2 3 2 3])
scared-walk (utils/make-anim "ego/scared-walk.png" [16 36] 0.05 (range 6))
ego {:right {:walk walk-right
:stand stand-anim
@@ -222,7 +223,8 @@
:burnt burnt
:passed-out passed-out
:scared scared
:scared-talk scared-talk}
:scared-talk scared-talk
:scared-walk scared-walk}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
:talk (utils/flip talk-anim)