diff --git a/desktop/resources/ego/Untitled.png b/desktop/resources/ego/Untitled.png index e4558c5c..2393f1ff 100644 Binary files a/desktop/resources/ego/Untitled.png and b/desktop/resources/ego/Untitled.png differ diff --git a/desktop/resources/ego/scared-walk.png b/desktop/resources/ego/scared-walk.png new file mode 100644 index 00000000..fb6559e9 Binary files /dev/null and b/desktop/resources/ego/scared-walk.png differ diff --git a/desktop/resources/ego/scared-walk.pxa/0.pxi b/desktop/resources/ego/scared-walk.pxa/0.pxi index f5f61e98..7c266220 100644 Binary files a/desktop/resources/ego/scared-walk.pxa/0.pxi and b/desktop/resources/ego/scared-walk.pxa/0.pxi differ diff --git a/desktop/resources/ego/scared-walk.pxa/1.pxi b/desktop/resources/ego/scared-walk.pxa/1.pxi index ef67bec0..de6c0618 100644 Binary files a/desktop/resources/ego/scared-walk.pxa/1.pxi and b/desktop/resources/ego/scared-walk.pxa/1.pxi differ diff --git a/desktop/resources/ego/scared-walk.pxa/2.pxi b/desktop/resources/ego/scared-walk.pxa/2.pxi index 2cf9213b..076b624e 100644 Binary files a/desktop/resources/ego/scared-walk.pxa/2.pxi and b/desktop/resources/ego/scared-walk.pxa/2.pxi differ diff --git a/desktop/resources/ego/scared-walk.pxa/3.pxi b/desktop/resources/ego/scared-walk.pxa/3.pxi index 37698e8c..4faf8ae3 100644 Binary files a/desktop/resources/ego/scared-walk.pxa/3.pxi and b/desktop/resources/ego/scared-walk.pxa/3.pxi differ diff --git a/desktop/resources/ego/scared-walk.pxa/4.pxi b/desktop/resources/ego/scared-walk.pxa/4.pxi index 4f393051..2a27a31e 100644 Binary files a/desktop/resources/ego/scared-walk.pxa/4.pxi and b/desktop/resources/ego/scared-walk.pxa/4.pxi differ diff --git a/desktop/resources/ego/scared-walk.pxa/5.pxi b/desktop/resources/ego/scared-walk.pxa/5.pxi index 709afa54..5ffc1be0 100644 Binary files a/desktop/resources/ego/scared-walk.pxa/5.pxi and b/desktop/resources/ego/scared-walk.pxa/5.pxi differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 1c9bff62..50277701 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -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 diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 3c3acabf..1a30f7db 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -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)