diff --git a/desktop/resources/ego/sigh.ogg b/desktop/resources/ego/sigh.ogg new file mode 100644 index 00000000..41755a23 Binary files /dev/null and b/desktop/resources/ego/sigh.ogg differ diff --git a/desktop/resources/ego/sigh.png b/desktop/resources/ego/sigh.png new file mode 100644 index 00000000..0e112fc0 Binary files /dev/null and b/desktop/resources/ego/sigh.png differ diff --git a/desktop/resources/ego/sigh.pxa/0.pxi b/desktop/resources/ego/sigh.pxa/0.pxi new file mode 100644 index 00000000..577d08b4 Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/0.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/1.pxi b/desktop/resources/ego/sigh.pxa/1.pxi new file mode 100644 index 00000000..dec7c39a Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/1.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/2.pxi b/desktop/resources/ego/sigh.pxa/2.pxi new file mode 100644 index 00000000..7bf3070b Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/2.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/3.pxi b/desktop/resources/ego/sigh.pxa/3.pxi new file mode 100644 index 00000000..7a6d9c90 Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/3.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/4.pxi b/desktop/resources/ego/sigh.pxa/4.pxi new file mode 100644 index 00000000..8d781a0c Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/4.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/5.pxi b/desktop/resources/ego/sigh.pxa/5.pxi new file mode 100644 index 00000000..bbbd9649 Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/5.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/6.pxi b/desktop/resources/ego/sigh.pxa/6.pxi new file mode 100644 index 00000000..aed20913 Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/6.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/7.pxi b/desktop/resources/ego/sigh.pxa/7.pxi new file mode 100644 index 00000000..f98dbef5 Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/7.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/8.pxi b/desktop/resources/ego/sigh.pxa/8.pxi new file mode 100644 index 00000000..689c084e Binary files /dev/null and b/desktop/resources/ego/sigh.pxa/8.pxi differ diff --git a/desktop/resources/ego/sigh.pxa/CelData.plist b/desktop/resources/ego/sigh.pxa/CelData.plist new file mode 100644 index 00000000..9088485c --- /dev/null +++ b/desktop/resources/ego/sigh.pxa/CelData.plist @@ -0,0 +1,42 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/ego/sigh.wav b/desktop/resources/ego/sigh.wav new file mode 100644 index 00000000..94a78063 Binary files /dev/null and b/desktop/resources/ego/sigh.wav differ diff --git a/desktop/settings.edn b/desktop/settings.edn index 09d1d4be..7dd74b65 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 60.0, :music-volume 74.0} \ No newline at end of file +{:sound-volume 59.0, :music-volume 32.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 0d8dc69c..80842949 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/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.")) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 936562fa..fceee444 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/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