bubba leaves.

desktop/resources/castle-gate/goon-2-walk.pxa/CelData.plist

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>

desktop/src-common/advent/screens/rooms/castle_gate.clj

@@ -138,7 +138,8 @@
   (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])
         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])]
+        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])
+        walk (utils/flip  (utils/make-anim "castle-gate/goon-2-walk.png" [24 34] 0.075 (range 7)))]
     (assoc (animation->texture screen stand)
       :x 214 :y 102 :baseline 151
       :scale-x 1.4
@@ -148,10 +149,12 @@
       :anim stand
       :talk talk
       :flip flip
+      :walk walk 
       :search search
-      :anim-merges {search {:origin-x 12}
+      :anim-merges {search {:origin-x 12 :origin-y 0}
-                    talk {:origin-x 6}
+                    talk {:origin-x 6 :origin-y 0}
-                    :default {:origin-x 6}}
+                    walk {:origin-x 12 :origin-y 3}
+                    :default {:origin-x 6 :origin-y 0}}
       :update-fn (fn [s es e]
                    (if (and (= (:flip e) (:anim e))
                             (animation! (:flip e)
@@ -184,8 +187,9 @@
                                       (actions/update-state entities (fn [s] (assoc s :has-dropped-coin? true)))
                                       (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!"
+                                    (do
-                                                         :goon-2 "Beat it, Dipstick.")))
+                                      (actions/do-dialogue entities :ego "Hey Bubba!"
+                                                           :goon-2 "Beat it, Dipstick."))))
       :night-profile :sprite
       :anim-start 0
       :stand stand)))

desktop/src-common/advent/screens/rooms/outside_castle.clj

@@ -221,6 +221,10 @@
       (frankie-comment-on-item entities)
       (actions/do-dialogue entities
                            :frankie "Bubba, put this stuff in the secret stash."
+                           :goon-2 "You got it boss"
+                           )
+      (actions/walk-straight-to entities :goon-2 [0 100])
+      (actions/do-dialogue entities
                            :frankie "Now move along."
                            :frankie "Before we decide to take all of your stuff."
                            :ego "But I need that slingshot!"