ending

desktop/asset-work/georgia/stand.pxa/CelData.plist

@@ -14,5 +14,13 @@
 		<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/common.clj

@@ -550,6 +550,7 @@
   (actions/walk-straight-to entities :georgia [131 40] :anim :stand :speed 1.0)
   (actions/play-animation entities :frankie :fall :stop? false)
   (actions/do-dialogue entities :georgia "Let's go, Sir Hunk.")
+  (actions/play-animation entities :georgia :hand-hold :stop? false)
   (fade-out entities)
   (on-gl (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits))))
 

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

@@ -37,6 +37,7 @@
         duke-knight (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [8 9 10 9 8])
 
         georgia-stand (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 20 0) 1 (repeat 10 0) 1]))
+        georgia-hand-hold (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 3 0) 3 4]))
         georgia-talk (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [0 2 0 2 0 1 0 0 2]))
         georgia-kick (utils/make-anim-seq "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2)
                                                                                 3 4 5 6 7 8 9 10 11 12 13 (repeat 10 14)
@@ -62,7 +63,9 @@
                                                        :stand georgia-stand
                                                        :talk georgia-talk
                                                        :kick georgia-kick
+                                                       :hand-hold georgia-hand-hold
                                                        :anim-merges {georgia-stand {:origin-x 10 :origin-y 1}
+                                                                     :default {:origin-x 10 :origin-y 1}
                                                                      georgia-kick {:origin-x 19 :origin-y 0}}))
                 :entities {:peddler (assoc (animation->texture screen peddler-stand)
                                       :x 245 :y 46 :baseline 200