notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more sounds.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-27 20:13:17 -08:00
parent 0fdb137502
commit b50b0b928e
7 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/space/shock-short.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/space/shock-short.wav Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/space/shock.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/space/shock.wav
View File

Binary file not shown.

BIN
desktop/resources/space/shock-short.ogg Normal file
View File

Binary file not shown.

BIN
desktop/resources/space/shock.ogg
View File

Binary file not shown.

5
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -35,7 +35,7 @@
(not (get-in entities [:state :blergh-dead?])) (not (get-in entities [:state :blergh-dead?]))
(actions/has-item? entities :magic-slingshot)) (actions/has-item? entities :magic-slingshot))
((actions/get-script entities ((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/play-animation entities :bloodclot-head :shoot :stop? false)
(actions/update-entity entities :lightning #(assoc % :opacity 1.0)) (actions/update-entity entities :lightning #(assoc % :opacity 1.0))
(actions/begin-animation entities :bloodclot-head :keep-shoot) (actions/begin-animation entities :bloodclot-head :keep-shoot)
@@ -197,6 +197,7 @@
(rooms/make :music :fight (rooms/make :music :fight
:name "Duel" :name "Duel"
:sounds {:shock (utils/load-sound "space/shock.ogg") :sounds {:shock (utils/load-sound "space/shock.ogg")
:shock-short (utils/load-sound "space/shock-short.ogg")
:jump (utils/load-sound "space/jump.ogg") :jump (utils/load-sound "space/jump.ogg")
:swing-sword (utils/load-sound "space/swingsword.ogg")} :swing-sword (utils/load-sound "space/swingsword.ogg")}
:interactions :interactions
@@ -270,7 +271,7 @@
(actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?" (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?"
:bloodclot-head "Take this!") :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/play-animation entities :bloodclot-head :shoot :stop? false)
(actions/begin-animation entities :bloodclot-head :keep-shoot) (actions/begin-animation entities :bloodclot-head :keep-shoot)