diff --git a/desktop/resources/castle-gate/frankie.png b/desktop/resources/castle-gate/frankie.png index bcdb9451..94ef6267 100644 Binary files a/desktop/resources/castle-gate/frankie.png and b/desktop/resources/castle-gate/frankie.png differ diff --git a/desktop/resources/castle-gate/frankie.pxa/10.pxi b/desktop/resources/castle-gate/frankie.pxa/10.pxi new file mode 100644 index 00000000..a2afa1df Binary files /dev/null and b/desktop/resources/castle-gate/frankie.pxa/10.pxi differ diff --git a/desktop/resources/castle-gate/frankie.pxa/11.pxi b/desktop/resources/castle-gate/frankie.pxa/11.pxi new file mode 100644 index 00000000..ace74201 Binary files /dev/null and b/desktop/resources/castle-gate/frankie.pxa/11.pxi differ diff --git a/desktop/resources/castle-gate/frankie.pxa/12.pxi b/desktop/resources/castle-gate/frankie.pxa/12.pxi new file mode 100644 index 00000000..6eda8c8f Binary files /dev/null and b/desktop/resources/castle-gate/frankie.pxa/12.pxi differ diff --git a/desktop/resources/castle-gate/frankie.pxa/CelData.plist b/desktop/resources/castle-gate/frankie.pxa/CelData.plist index 222d28b8..0aa530db 100644 --- a/desktop/resources/castle-gate/frankie.pxa/CelData.plist +++ b/desktop/resources/castle-gate/frankie.pxa/CelData.plist @@ -42,5 +42,17 @@ duration 1 + + duration + 1 + + + duration + 1 + + + duration + 1 + diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index 7f33d52e..13cc9caf 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -79,7 +79,8 @@ talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0]) laugh (utils/make-anim "castle-gate/frankie.png" [24 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" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ]) - reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8])] + reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8]) + flex (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])] (assoc (animation->texture screen stand) :x 235 :y 90 :baseline 150 :origin-x 12 @@ -91,6 +92,7 @@ :scale-y 1.4 :talk-color (color 0.6 0.2 0.6 1.0) :talk talk + :flex flex :stand stand :laugh laugh :glance glance diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 0975c5af..09e960e7 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -190,7 +190,9 @@ :ego "Uh, oh. Frankie Rockfist!" :ego "Listen, I don't want any trouble." :frankie "Well you found it tonight, Dipstick." - :frankie "Am I right boys?") + ) + (actions/play-animation entities :frankie :flex) + (actions/talk entities :frankie "Am I right boys?") (actions/play-animation entities :frankie :glance) (actions/do-dialogue entities :frankie "You looking for another beat down Dipstick?") (actions/play-animation entities :frankie :laugh)