diff --git a/desktop/pre-rob.edn b/desktop/pre-rob.edn
new file mode 100644
index 00000000..95d11b65
--- /dev/null
+++ b/desktop/pre-rob.edn
@@ -0,0 +1 @@
+{:active? true, :seen-intro? true, :seen-frankie? false, :knows-about-stash? true, :convinced-wizard? true, :time :night, :broke-lock? true, :opened-bars? true, :inventory (:slingshot :trophy :medal :flask-1-strength :walkie-talkie :note-2 :spear :camera :note-1 :key :crowbar :ladder :grass :kiss :sword), :wizard-left? false, :dropped-ball? true, :hay-searches 4, :clues #{}, :stop? false, :warden-sleeping? true, :current-riddle :wool, :warden-fast-asleep? true, :last-room :outside-castle, :wants-toy true, :bent-bars? true, :chest-contents [], :mints-eaten 0, :object nil, :talked-to-owl? true, :obtained-items #{:flask-2 :key :slingshot :flies :rope :kiss :spear :medal :sword :magic-slingshot :flask-flies-ash :flask-1 :flask-1-strength :flask-water-flies :walkie-talkies :ash :grass :camera :sack-lunch :ladder :walkie-talkie :trophy :broken-clock :monocle :alarm-clock :crowbar :note-1 :flask-water :note-2 :ball-n-chain :feather :spell-component}}
diff --git a/desktop/resources/castle-gate/Untitled.png b/desktop/resources/castle-gate/Untitled.png
index d0f85471..9310c1de 100644
Binary files a/desktop/resources/castle-gate/Untitled.png and b/desktop/resources/castle-gate/Untitled.png differ
diff --git a/desktop/resources/castle-gate/frankie.png b/desktop/resources/castle-gate/frankie.png
index 10433c31..bcdb9451 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/0.pxi b/desktop/resources/castle-gate/frankie.pxa/0.pxi
index 82c4a9cd..955a109d 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/0.pxi and b/desktop/resources/castle-gate/frankie.pxa/0.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/1.pxi b/desktop/resources/castle-gate/frankie.pxa/1.pxi
index e42c373f..cebd0004 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/1.pxi and b/desktop/resources/castle-gate/frankie.pxa/1.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/2.pxi b/desktop/resources/castle-gate/frankie.pxa/2.pxi
index 5dcddb41..bbf683a8 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/2.pxi and b/desktop/resources/castle-gate/frankie.pxa/2.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/3.pxi b/desktop/resources/castle-gate/frankie.pxa/3.pxi
index e75afd9e..db123e67 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/3.pxi and b/desktop/resources/castle-gate/frankie.pxa/3.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/4.pxi b/desktop/resources/castle-gate/frankie.pxa/4.pxi
index b5fb090c..dd77dcf7 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/4.pxi and b/desktop/resources/castle-gate/frankie.pxa/4.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/5.pxi b/desktop/resources/castle-gate/frankie.pxa/5.pxi
index 2cbea69f..70e04e06 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/5.pxi and b/desktop/resources/castle-gate/frankie.pxa/5.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/6.pxi b/desktop/resources/castle-gate/frankie.pxa/6.pxi
index 8098e6e5..faaf4da4 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/6.pxi and b/desktop/resources/castle-gate/frankie.pxa/6.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/7.pxi b/desktop/resources/castle-gate/frankie.pxa/7.pxi
index 9f657553..6470ac59 100644
Binary files a/desktop/resources/castle-gate/frankie.pxa/7.pxi and b/desktop/resources/castle-gate/frankie.pxa/7.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/8.pxi b/desktop/resources/castle-gate/frankie.pxa/8.pxi
new file mode 100644
index 00000000..8bf25850
Binary files /dev/null and b/desktop/resources/castle-gate/frankie.pxa/8.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/9.pxi b/desktop/resources/castle-gate/frankie.pxa/9.pxi
new file mode 100644
index 00000000..709da481
Binary files /dev/null and b/desktop/resources/castle-gate/frankie.pxa/9.pxi differ
diff --git a/desktop/resources/castle-gate/frankie.pxa/CelData.plist b/desktop/resources/castle-gate/frankie.pxa/CelData.plist
index 3cc9cf5c..222d28b8 100644
--- a/desktop/resources/castle-gate/frankie.pxa/CelData.plist
+++ b/desktop/resources/castle-gate/frankie.pxa/CelData.plist
@@ -34,5 +34,13 @@
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 d1e992fc..7f33d52e 100644
--- a/desktop/src-common/advent/screens/rooms/castle_gate.clj
+++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj
@@ -75,13 +75,14 @@
(defn make-frankie [screen]
- (let [stand (utils/make-anim "castle-gate/frankie.png" [48 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
- talk (utils/make-anim "castle-gate/frankie.png" [48 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0])
- laugh (utils/make-anim "castle-gate/frankie.png" [48 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" [48 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ])]
+ (let [stand (utils/make-anim "castle-gate/frankie.png" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1])
+ 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])]
(assoc (animation->texture screen stand)
:x 235 :y 90 :baseline 150
- :origin-x 24
+ :origin-x 12
:origin-y 0
:anim stand
:anim-start 0
@@ -93,6 +94,7 @@
:stand stand
:laugh laugh
:glance glance
+ :reach reach
:script (actions/get-script entities
(walk-to-frankie entities)
(actions/talk entities :ego "Listen, Frankie...")
diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj
index ae33d382..0975c5af 100644
--- a/desktop/src-common/advent/screens/rooms/outside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj
@@ -205,13 +205,17 @@
:frankie "Now.")
(actions/walk-straight-to entities :ego [254 80])
(actions/do-dialogue entities
- :frankie "Now what have we got to give us today, Dipstick?"
+ :frankie "Now what have we got to give us today, Dipstick?")
+ (actions/play-animation entities :frankie :reach)
+ (actions/do-dialogue entities
:frankie "A strength potion, oh very nice!"
:frankie "And some gold..."
- :frankie "And what's this?"
+ :frankie "And what's this?")
+ (actions/play-animation entities :frankie :reach)
+ (actions/do-dialogue entities
:frankie "The Slinger's Shot?"
:ego "No, not the Slinger's Shot!"
- :frankie "Look like we hit the jackpot tonight boys!")
+ :frankie "Look like we hit the jackpot tonight boys!")
(frankie-comment-on-item entities)
(actions/do-dialogue entities
:frankie "Bubba, put this stuff in the secret stash."