diff --git a/desktop/resources/castle-gate/goon-2-search.png b/desktop/resources/castle-gate/goon-2-search.png
new file mode 100644
index 00000000..36ab1149
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.png differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/0.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/0.pxi
new file mode 100644
index 00000000..694c9304
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/0.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/1.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/1.pxi
new file mode 100644
index 00000000..ed32639c
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/1.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/2.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/2.pxi
new file mode 100644
index 00000000..910ebd8d
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/2.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/3.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/3.pxi
new file mode 100644
index 00000000..edf42946
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/3.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/4.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/4.pxi
new file mode 100644
index 00000000..ed32639c
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/4.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/5.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/5.pxi
new file mode 100644
index 00000000..aef138fb
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/5.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/6.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/6.pxi
new file mode 100644
index 00000000..ac5c54d6
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/6.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/7.pxi b/desktop/resources/castle-gate/goon-2-search.pxa/7.pxi
new file mode 100644
index 00000000..5e539042
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-search.pxa/7.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-search.pxa/CelData.plist b/desktop/resources/castle-gate/goon-2-search.pxa/CelData.plist
new file mode 100644
index 00000000..3cc9cf5c
--- /dev/null
+++ b/desktop/resources/castle-gate/goon-2-search.pxa/CelData.plist
@@ -0,0 +1,38 @@
+
+
+
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+
diff --git a/desktop/resources/castle-gate/goon-2-talk.png b/desktop/resources/castle-gate/goon-2-talk.png
new file mode 100644
index 00000000..0b4e82f6
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-talk.png differ
diff --git a/desktop/resources/castle-gate/goon-2-talk.pxa/0.pxi b/desktop/resources/castle-gate/goon-2-talk.pxa/0.pxi
new file mode 100644
index 00000000..3d95b968
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-talk.pxa/0.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-talk.pxa/1.pxi b/desktop/resources/castle-gate/goon-2-talk.pxa/1.pxi
new file mode 100644
index 00000000..9b5ba1aa
Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-talk.pxa/1.pxi differ
diff --git a/desktop/resources/castle-gate/goon-2-talk.pxa/CelData.plist b/desktop/resources/castle-gate/goon-2-talk.pxa/CelData.plist
new file mode 100644
index 00000000..29c78f8b
--- /dev/null
+++ b/desktop/resources/castle-gate/goon-2-talk.pxa/CelData.plist
@@ -0,0 +1,14 @@
+
+
+
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+
diff --git a/desktop/resources/castle-gate/goon-2.pxa/1.pxi b/desktop/resources/castle-gate/goon-2.pxa/1.pxi
index 4b4fa12c..9b5ba1aa 100644
Binary files a/desktop/resources/castle-gate/goon-2.pxa/1.pxi and b/desktop/resources/castle-gate/goon-2.pxa/1.pxi differ
diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj
index 8589bef2..ef54e987 100644
--- a/desktop/src-common/advent/screens/rooms/castle_gate.clj
+++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj
@@ -130,7 +130,9 @@
(defn make-goon-2 [screen]
(let [stand (utils/make-anim "castle-gate/goon-2.png" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1])
- flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ])]
+ talk (utils/make-anim "castle-gate/goon-2-talk.png" [12 32] 0.175 (range 2))
+ flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ])
+ search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0])]
(assoc (animation->texture screen stand)
:x 214 :y 102 :baseline 138
:scale-x 1.4
@@ -138,7 +140,11 @@
:origin-x 6
:origin-y 0
:anim stand
+ :talk talk
:flip flip
+ :search search
+ :anim-merges {search {:origin-x 12}
+ :default {:origin-x 6}}
:update-fn (fn [s es e]
(if (and (= (:flip e) (:anim e))
(animation! (:flip e)
@@ -149,7 +155,7 @@
:script (actions/get-script entities
(if (get-in @entities [:tweens :coin-y])
(do
- (actions/talk entities :ego "Hey goon!" :wait false)
+ (actions/talk entities :ego "Hey Bubba!" :wait false)
(actions/update-entities entities (fn [entities]
(update-in entities [:tweens] dissoc :coin-y)))
@@ -169,8 +175,10 @@
(Thread/sleep 50)
(actions/walk-straight-to entities :coin-flip [185 44] :update-baseline? false :speed 0.5)
(actions/update-state entities (fn [s] (assoc s :has-dropped-coin? true)))
- (actions/talk entities :frankie "You made me lose my coin, Dipstick!"))
- (actions/talk entities :ego "Hey goon!")))
+ (actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search)
+ (actions/talk entities :ego "Umm, sorry!"))
+ (actions/do-dialogue entities :ego "Hey Bubba!"
+ :goon-2 "Beat it, Dipstick.")))
:night-profile :sprite
:anim-start 0
:stand stand)))