diff --git a/desktop/resources/space/jump.ogg b/desktop/resources/space/jump.ogg new file mode 100644 index 00000000..5b938c1a Binary files /dev/null and b/desktop/resources/space/jump.ogg differ diff --git a/desktop/resources/space/jump.wav b/desktop/resources/space/jump.wav new file mode 100644 index 00000000..140610e4 Binary files /dev/null and b/desktop/resources/space/jump.wav differ diff --git a/desktop/resources/space/shock.ogg b/desktop/resources/space/shock.ogg new file mode 100644 index 00000000..c10167fb Binary files /dev/null and b/desktop/resources/space/shock.ogg differ diff --git a/desktop/resources/space/shock.wav b/desktop/resources/space/shock.wav new file mode 100644 index 00000000..070fe3f7 Binary files /dev/null and b/desktop/resources/space/shock.wav differ diff --git a/desktop/resources/space/swingsword.ogg b/desktop/resources/space/swingsword.ogg new file mode 100644 index 00000000..ba767efc Binary files /dev/null and b/desktop/resources/space/swingsword.ogg differ diff --git a/desktop/resources/space/swingsword.wav b/desktop/resources/space/swingsword.wav new file mode 100644 index 00000000..f0bed007 Binary files /dev/null and b/desktop/resources/space/swingsword.wav differ diff --git a/desktop/resources/space/swingsword_1.wav b/desktop/resources/space/swingsword_1.wav new file mode 100644 index 00000000..f41da165 Binary files /dev/null and b/desktop/resources/space/swingsword_1.wav differ diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 28294432..cf48b04c 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -46,6 +46,8 @@ swing-duration (/ swing-dist (* speed 1.5))] (actions/run-action entities (begin [this screen entities] + + (sound! (sound "space/jump.ogg") :play) (-> entities (assoc-in [:room :entities :cloud] (assoc (texture "space/cloud.png") :x (- (get-in entities [:room :entities :ego :x]) 10) @@ -92,6 +94,7 @@ (actions/run-action entities (begin [this screen entities] + (sound! (sound "space/swingsword.ogg") :play) (-> entities (update-in [:room :entities :ego] #(actions/start-animation screen % :swing)) @@ -143,7 +146,7 @@ blergh-appear (utils/make-anim "space/blergh-appear.png" [106 165] 0.05 (flatten [(range 13) 12 12 12 12 12 12 12 12 12 12 12 12 12 ])) blergh-grow (utils/make-anim "space/blergh-grow.png" [106 165] 0.10 [0 1 0 1 0 1 0 1 1 1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 3 3 3 3 3 3 3 3 3 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11]) bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7])] - (rooms/make :music :town-1 + (rooms/make :music :fight :interactions {} :layers [(assoc (texture "space/background.png") :x 0 :y 0 :baseline 0)] @@ -171,6 +174,8 @@ (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?" :bloodclot-head "Take this!") + + (sound! (sound "space/shock.ogg") :play) (actions/play-animation entities :bloodclot-head :shoot :stop? false) (actions/begin-animation entities :bloodclot-head :keep-shoot) (actions/play-animation entities :ego :shock :stop? false)