diff --git a/desktop/settings.edn b/desktop/settings.edn index 6642556d..7dd74b65 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 60.0, :music-volume 100.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/scene.clj b/desktop/src-common/advent/screens/scene.clj index 1de2ef50..fceee444 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -196,7 +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 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ]) + 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 @@ -264,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 @@ -332,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