diff --git a/desktop/asset-work/ego/scared-step-old1.wav b/desktop/asset-work/ego/scared-step-old1.wav new file mode 100644 index 00000000..e1171525 Binary files /dev/null and b/desktop/asset-work/ego/scared-step-old1.wav differ diff --git a/desktop/asset-work/ego/scared-step.ogg b/desktop/asset-work/ego/scared-step.ogg new file mode 100644 index 00000000..7c51a1c1 Binary files /dev/null and b/desktop/asset-work/ego/scared-step.ogg differ diff --git a/desktop/asset-work/ego/scared-step.wav b/desktop/asset-work/ego/scared-step.wav index e1171525..1285df5e 100644 Binary files a/desktop/asset-work/ego/scared-step.wav and b/desktop/asset-work/ego/scared-step.wav differ diff --git a/desktop/resources/ego/scared-step.ogg b/desktop/resources/ego/scared-step.ogg new file mode 100644 index 00000000..7c51a1c1 Binary files /dev/null and b/desktop/resources/ego/scared-step.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 8dd3f39b..a6579019 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -278,7 +278,6 @@ - (actions/add-entity entities :blergh (get-in @entities [:room :blergh])) (actions/talk entities :ego "Who are you?!" :anim :scared-talk) (actions/begin-animation entities :ego :scared) (actions/do-dialogue entities diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index f9a90aec..5a55af65 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -225,6 +225,7 @@ candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4)) candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1])] (rooms/make :music :inside-antique + :name "In jail" :sounds { :squeek (utils/load-sound "inside-jail/squeak.ogg") :crowbar-sound (utils/load-sound "ego/crowbar.ogg") diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index ec46a306..4b5f3452 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -664,6 +664,7 @@ void main () :get-sick-sound (utils/load-sound "ego/get-sick.ogg") :scratch-sound (utils/load-sound "ego/scratch.ogg") + :scared-step-sound (utils/load-sound "ego/scared-step.ogg") :inside-step-sound-1 (utils/load-sound "ego/inside-step-1.ogg") :inside-step-sound-2 (utils/load-sound "ego/inside-step-2.ogg") @@ -704,6 +705,8 @@ void main () (get-in ego [:left :get-sick] ) {1 [:get-sick-sound 0.55]} (get-in ego [:right :get-sick] ) {1 [:get-sick-sound 0.55]} + (get-in ego [:right :scared-walk] ) {0 [:scared-step-sound 0.15 1.5] + 4 [:scared-step-sound 0.15 1.9]} (get-in ego [:left :stand]) {11 [:blink 0.15] 44 [:blink 0.15] 77 [:blink 0.15]