Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

desktop/resources/ego/love.pxa/CelData.plist

@@ -98,5 +98,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/actions.clj

@@ -746,3 +746,9 @@
                                  entities)
                       (can-skip? [this screen entities]
                                  false)))
+
+
+(defn in-love [entities]
+  (transition-music entities :love :duration 1.0)
+  (play-animation entities :ego :love)
+  (transition-music entities nil :duration 1.0))

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

@@ -81,6 +81,7 @@
                        :ego "'Because maidens love guys with might.'"
                        :ego "Awesome!"
                        :ego "If I become a knight, maybe Georgia McGorgeous will love me!")
+  (actions/in-love entities)
   (actions/stop-walking entities :ego :face :right)
   (actions/do-dialogue entities
                        :fairy-godfather "Tick, I told you that you can't be a knight."
@@ -276,10 +277,6 @@
                 :interactions {:pit {:box [54 0 219 36]
                                      :script (actions/get-script entities
                                                                  (actions/walk-to entities :ego [154 41])
-
-                                                                 (actions/transition-music entities :love :duration 1.0)
-                                                                 (actions/play-animation entities :ego :love)
-                                                                 (actions/transition-music entities nil :duration 1.0)
                                                                  (actions/talk entities :ego "Wow! That's a long way down."))
                                      :scripts {:shovel (actions/get-script entities
                                                                           (actions/walk-to entities :ego [154 41])
@@ -336,7 +333,8 @@
                                                                                      (actions/do-dialogue entities
                                                                                                           :ego "Man! What a dream!"
                                                                                                           :ego "If I only really could be a knight."
-                                                                                                          :ego "Then I'd be able to win Georgia McGorgeous' heart."))
+                                                                                                          :ego "Then I'd be able to win Georgia McGorgeous' heart.")
+                                                                                     (actions/in-love entities))
                                                                                  (do (actions/walk-to entities :ego [148 76] :face :right)
                                                                                      (actions/do-dialogue entities
                                                                                                           :fairy-godfather "What are you doing?" :ego "Erm... Nothing."))))

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

@@ -206,7 +206,7 @@
         idea (utils/make-anim "ego/idea.png" [18 70] 0.3 [2 0 0 0 0 0 0  2])
         throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)]  (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3  3] (repeat 15 6)]))
         swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9))
-        love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 30 7) (repeat 3 8) (repeat 10 7) (repeat 3 8) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0]))
+        love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22  21  21 21 21 21  6 6 5 5 4 4 3 3 2 2 1 1 0]))
 
         ego {:right {:walk walk-right
                      :stand stand-anim