tweaks for edning.

desktop/asset-work/ego/hand-hold.pxa/CelData.plist

@@ -0,0 +1,14 @@
+<?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>
+</array>
+</plist>

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

@@ -103,7 +103,8 @@
                        :ego "Also, you'll need to add a split second."
                        :ego "Then, dip the Slinger's Shot in to complete the spell."
                        :ego "Don't forget about my secret stash of helpful stuff.\""))
-(def frankie-color (Color/valueOf "9907CFFF"))
+
+(def frankie-color (Color/valueOf "CF81ECFF"))
 
 
 (defn listen-to-frankie [entities]
@@ -536,10 +537,12 @@
   (Thread/sleep 3000)
   (actions/do-dialogue entities
                        :georgia "Hey, I'm home!"
-                       :georgia "Tick, was it really you that saved me?"
-                       :ego "Aww, it was nothing."
-                       :georgia "My hero!"
-                       :frankie "Wait a hot second!")
+                       :gandarf "Young Tick here saved you from Bloodclot's minions."
+                       :ego "Aww, it was nothing.")
+  (actions/play-animation entities :ego :shy)
+  (actions/do-dialogue entities :georgia "Really?" :georgia "My hero!")
+  (Thread/sleep 500)
+  (actions/do-dialogue entities :frankie "Wait a hot second!")
   (Thread/sleep 500)
   (actions/walk-straight-to entities :frankie [95 23] :anim :stand)
   (actions/do-dialogue entities
@@ -551,6 +554,8 @@
   (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)
+  (actions/play-animation entities :ego :hand-hold :stop? false)
+  (Thread/sleep 500)
   (fade-out entities)
   (on-gl (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits))))
 

desktop/src-common/advent/screens/scene.clj

@@ -496,6 +496,8 @@ void main ()
                                             (texture  (aget cat-toy-sheet 0 i))))
         cat-toy-last-half (animation 0.1 (for [i [3 3 3 2 1 1 0 0]]
                                            (texture  (aget cat-toy-sheet 0 i))))
+        shy (animation 0.2 (for [i [0 1 2 2 2 2 2 2 2 2 1 0 0 0 0 0 0 0 ]]
+                                     (texture  (aget fire-sheet 0 i))))
         fire-1-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 2 2 2 2 2 2 2 1 0]]
                                      (texture  (aget fire-sheet 0 i))))
         fire-2-anim (animation 0.1 (for [i [0 1 2 2 2 3 2 3 2 2 2 2 2 2 2 4 4  4 5 6 7  4 4 4 2 2 2 2 2 2 2 2 1 0]]
@@ -539,6 +541,7 @@ void main ()
         crawl-stand (utils/make-anim "ego/crawl.png" [39 25] 0.2 [0])
         crawl-hide (utils/make-anim "ego/crawl.png" [39 25] 0.1 (flatten [(repeat 10 3) (range 4 7) (repeat 50 6) (reverse (range 4 7) ) (repeat 20 3)]))
         standup (utils/make-anim "ego/standup.png" [45 55] 0.2 (range 5))
+        hand-hold (utils/make-anim "ego/hand-hold.png" [18 36] 0.2 [0 1])
         choose-step-sound (fn [entities]
                             (if (#{:inside-house :inside-stash :inside-cafeteria :inside-antique :inside-jail}
                                  (get-in entities [:state :last-room]))
@@ -601,6 +604,8 @@ void main ()
                      :crawl-hide crawl-hide
                      :standup standup
                      :frustrated-talk frustrated-talk
+                     :hand-hold hand-hold
+                     :shy shy
                      }
              :left {:walk  (utils/flip walk-right)
                     :stand (utils/flip stand-anim)
@@ -647,6 +652,8 @@ void main ()
                     :crawl-hide (utils/flip crawl-hide)
                     :standup (utils/flip standup)
                     :frustrated-talk (utils/flip frustrated-talk)
+                    :hand-hold (utils/flip hand-hold)
+                    :shy (utils/flip shy)
                     } 
              :baseline (- 240 (last start-pos))
              :facing :right