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

new sounds.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-25 14:05:35 -08:00
parent d9626f8bed
commit 76bf35a46c
5 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/dream/appear.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/dream/appear.wav Executable file → Normal file
View File

Binary file not shown.

BIN
desktop/resources/dream/appear.ogg
View File

Binary file not shown.

2
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -504,7 +504,7 @@
:path-start-time 0 :path-start-time 0
:scaled true :scaled true
:magic-sound (utils/load-sound "dream/appear.ogg") :magic-sound (utils/load-sound "dream/appear.ogg")
:anim-sound-frames {fairy-godfather-magic-anim {1 [:magic-sound 0.8]}} :anim-sound-frames {fairy-godfather-magic-anim {1 [:magic-sound (constantly 0.5)]}}
:left {:walk fairy-godfather-anim :left {:walk fairy-godfather-anim
:talk fairy-godfather-talk-anim :talk fairy-godfather-talk-anim
:stand fairy-godfather-anim :stand fairy-godfather-anim

2
desktop/src-common/advent/screens/scene.clj
View File

@@ -242,7 +242,7 @@ void main ()
(when (and (not (get-in entities [:fg-actions :script-running?])) (when (and (not (get-in entities [:fg-actions :script-running?]))
(= (get-in entities [:cursor :down-target]) (= (get-in entities [:cursor :down-target])
(or (:id interacting-entity) (:id interaction) nil))) (or (:id interacting-entity) (:id interaction) nil)))
((or (when interacting-entity ((or (when (and interacting-entity (not (:cursor interaction)))
(do (screen! hud :on-start-script) (do (screen! hud :on-start-script)
((:get-script interacting-entity) (get-in entities [:cursor :current]) [x y]))) ((:get-script interacting-entity) (get-in entities [:cursor :current]) [x y])))
(when interaction (when interaction