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

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

@@ -0,0 +1,42 @@
+<?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>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>

desktop/settings.edn

@@ -1 +1 @@
-{:sound-volume 60.0, :music-volume 74.0}
+{:sound-volume 59.0, :music-volume 32.0}

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

@@ -337,7 +337,10 @@
                                                                                    (actions/play-animation entities :ego :reach)
                                                                                    (actions/give entities :wool)
                                                                                    (actions/talk entities :ego "I guess her wool is shedding."))
-                                                                               (actions/talk entities :ego "She's too far away for me to pet her."))))
+                                                                               (do
+                                                                                 (actions/talk entities :ego "Come here mama sheep!")
+                                                                                 (actions/play-animation entities :ego :sigh)
+                                                                                 (actions/talk entities :ego "She's too far away for me to pet her.")))))
                                                                   :scripts #(condp = %
                                                                               :wool (actions/get-script entities
                                                                                                         (actions/talk entities :ego "She doesn't need it back."))

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

@@ -196,6 +196,7 @@
         scared (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1])
         scared-talk (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1 0 1 0 1 0 1 2 3 2 3 2 3 2 3])
         scared-walk (utils/make-anim "ego/scared-walk.png" [16 36] 0.05 (range 6))
+        sigh (utils/make-anim "ego/sigh.png" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ])
 
         ego {:right {:walk walk-right
                      :stand stand-anim
@@ -229,7 +230,8 @@
                      :passed-out passed-out
                      :scared scared
                      :scared-talk scared-talk
-                     :scared-walk scared-walk}
+                     :scared-walk scared-walk
+                     :sigh sigh}
              :left {:walk  (utils/flip walk-right)
                     :stand (utils/flip stand-anim)
                     :talk (utils/flip talk-anim)
@@ -253,7 +255,8 @@
                     [:fire 2] (utils/flip fire-2-anim)
                     [:fire 3] (utils/flip fire-3-anim)
                     :spear (utils/flip spear)
-                    :pant (utils/flip pant)} 
+                    :pant (utils/flip pant)
+                    :sigh (utils/flip sigh)} 
              :baseline (- 240 (last start-pos))
              :facing :right
              :origin-x 9
@@ -261,6 +264,7 @@
              :scaled true
              :step-sound-1 (sound "ego/step-1.ogg")
              :step-sound-2 (sound "ego/step-2.ogg")
+             :sigh-sound (sound "ego/sigh.ogg")
              :blink (sound "blink.ogg")
              :scale-x start-scale
              :scale-y start-scale
@@ -329,7 +333,9 @@
                                                                         77 [:blink 0.15] 
                                                                         110 [:blink 0.15] 
                                                                         143 [:blink 0.15] 
-                                                                        176 [:blink 0.15]}}
+                                                                        176 [:blink 0.15]}
+                                           (get-in ego [:left :sigh]) {1 [:sigh-sound 0.4]}
+                                           (get-in ego [:right :sigh]) {1 [:sigh-sound 0.4]}}
                    :anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
                                  :default {:origin-x 9}})]
     (actions/start-animation screen