diff --git a/desktop/asset-work/space/shock-short.ogg b/desktop/asset-work/space/shock-short.ogg new file mode 100644 index 00000000..d71c8744 Binary files /dev/null and b/desktop/asset-work/space/shock-short.ogg differ diff --git a/desktop/asset-work/space/shock-short.wav b/desktop/asset-work/space/shock-short.wav new file mode 100644 index 00000000..5e794c66 Binary files /dev/null and b/desktop/asset-work/space/shock-short.wav differ diff --git a/desktop/asset-work/space/shock.ogg b/desktop/asset-work/space/shock.ogg new file mode 100644 index 00000000..2de91d5d Binary files /dev/null and b/desktop/asset-work/space/shock.ogg differ diff --git a/desktop/asset-work/space/shock.wav b/desktop/asset-work/space/shock.wav index 070fe3f7..19c44226 100644 Binary files a/desktop/asset-work/space/shock.wav and b/desktop/asset-work/space/shock.wav differ diff --git a/desktop/resources/space/shock-short.ogg b/desktop/resources/space/shock-short.ogg new file mode 100644 index 00000000..d71c8744 Binary files /dev/null and b/desktop/resources/space/shock-short.ogg differ diff --git a/desktop/resources/space/shock.ogg b/desktop/resources/space/shock.ogg index c10167fb..2de91d5d 100644 Binary files a/desktop/resources/space/shock.ogg and b/desktop/resources/space/shock.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 36b989c9..6d4aa1a8 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -35,7 +35,7 @@ (not (get-in entities [:state :blergh-dead?])) (actions/has-item? entities :magic-slingshot)) ((actions/get-script entities - (actions/play-sound entities :shock 0.25 :wait? false) + (actions/play-sound entities :shock-short 0.25 :wait? false) (actions/play-animation entities :bloodclot-head :shoot :stop? false) (actions/update-entity entities :lightning #(assoc % :opacity 1.0)) (actions/begin-animation entities :bloodclot-head :keep-shoot) @@ -197,6 +197,7 @@ (rooms/make :music :fight :name "Duel" :sounds {:shock (utils/load-sound "space/shock.ogg") + :shock-short (utils/load-sound "space/shock-short.ogg") :jump (utils/load-sound "space/jump.ogg") :swing-sword (utils/load-sound "space/swingsword.ogg")} :interactions @@ -270,7 +271,7 @@ (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?" :bloodclot-head "Take this!") - (actions/play-sound entities :shock 0.25 :wait? false) + (actions/play-sound entities :shock 0.7 :wait? false) (actions/play-animation entities :bloodclot-head :shoot :stop? false) (actions/begin-animation entities :bloodclot-head :keep-shoot)