diff --git a/desktop/resources/inside-castle/brian-working.png b/desktop/resources/inside-castle/brian-working.png index 14bb7f4e..285adff6 100644 Binary files a/desktop/resources/inside-castle/brian-working.png and b/desktop/resources/inside-castle/brian-working.png differ diff --git a/desktop/resources/inside-castle/brian-working.pxa/2.pxi b/desktop/resources/inside-castle/brian-working.pxa/2.pxi index cdeccd5e..ff67d3d5 100644 Binary files a/desktop/resources/inside-castle/brian-working.pxa/2.pxi and b/desktop/resources/inside-castle/brian-working.pxa/2.pxi differ diff --git a/desktop/resources/inside-castle/brian-working.pxa/4.pxi b/desktop/resources/inside-castle/brian-working.pxa/4.pxi new file mode 100644 index 00000000..0bc3ea81 Binary files /dev/null and b/desktop/resources/inside-castle/brian-working.pxa/4.pxi differ diff --git a/desktop/resources/inside-castle/brian-working.pxa/5.pxi b/desktop/resources/inside-castle/brian-working.pxa/5.pxi new file mode 100644 index 00000000..cd8e9910 Binary files /dev/null and b/desktop/resources/inside-castle/brian-working.pxa/5.pxi differ diff --git a/desktop/resources/inside-castle/brian-working.pxa/6.pxi b/desktop/resources/inside-castle/brian-working.pxa/6.pxi new file mode 100644 index 00000000..01685ce5 Binary files /dev/null and b/desktop/resources/inside-castle/brian-working.pxa/6.pxi differ diff --git a/desktop/resources/inside-castle/brian-working.pxa/7.pxi b/desktop/resources/inside-castle/brian-working.pxa/7.pxi new file mode 100644 index 00000000..d1966f07 Binary files /dev/null and b/desktop/resources/inside-castle/brian-working.pxa/7.pxi differ diff --git a/desktop/resources/inside-castle/brian-working.pxa/CelData.plist b/desktop/resources/inside-castle/brian-working.pxa/CelData.plist index f0b74d60..3cc9cf5c 100644 --- a/desktop/resources/inside-castle/brian-working.pxa/CelData.plist +++ b/desktop/resources/inside-castle/brian-working.pxa/CelData.plist @@ -18,5 +18,21 @@ duration 1 + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 8c2b058d..44f5e4ce 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -120,6 +120,7 @@ (actions/do-dialogue entities :ego "You there!") (actions/talk entities :game-player "What is it? I'm busy!" :anim :talk-down) (Thread/sleep 200) + (actions/play-animation entities :game-player :pause-from-work :stop? false) (actions/do-stop entities :game-player :face :right) (actions/talk entities :game-player "Oh, it's you Tick.") (actions/present-choices entities @@ -165,6 +166,8 @@ :choices actions/previous-choices} "Nevermind." {:run #(actions/respond entities % :game-player "See you around.")}]}) + + (actions/play-animation entities :game-player :get-to-work :stop? false) (actions/do-stop entities :game-player :face :left)) (defn walk-to-blergh [entities] @@ -270,6 +273,8 @@ (aget game-player-talk-sheet 0 i))) game-player-stand-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.1 [0 1 1 2 0 2 2 1 0 2 2 2 2 2 1 1 ]) game-player-talk-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.2 [2 3 2 2 3 2 3 2]) + game-player-pause-from-work (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.2 [2 3 4 5 6 7]) + game-player-get-to-work (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.2 (reverse [2 3 4 5 6 7])) game-player-flex (animation 0.075 (for [i [0 0 4 4 5 5 5 5 5 5 5 6 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 6 5 5 5 5 5 5 5 5 5 5 4 4 0 0 0 0]] (aget game-player-talk-sheet 0 i))) trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1])) @@ -506,11 +511,15 @@ game-player-stand-up {:origin-x 3} game-player-talk-up {:origin-x 3} game-player-talk-down {:origin-x 8} + game-player-get-to-work {:origin-x 8} + game-player-pause-from-work {:origin-x 8} game-player-flex {:origin-x 3}} :left {:stand game-player-stand-down :talk game-player-talk-down} :right {:stand game-player-stand-up :talk game-player-talk-up} + :get-to-work game-player-get-to-work + :pause-from-work game-player-pause-from-work :anim-sound-frames {game-player-stand-up {11 [:blink 0.3] }} :flex game-player-flex)} :monocle (rooms/make-entity :monocle (assoc (animation->texture screen monocle)