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

progress for sounds.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-12 18:14:39 -08:00
parent 16537aedd0
commit e1170edee0
7 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/ego/scared-step-old1.wav Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/ego/scared-step.ogg Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/ego/scared-step.wav
View File

Binary file not shown.

BIN
desktop/resources/ego/scared-step.ogg Normal file
View File

Binary file not shown.

1
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -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/talk entities :ego "Who are you?!" :anim :scared-talk)
(actions/begin-animation entities :ego :scared) (actions/begin-animation entities :ego :scared)
(actions/do-dialogue entities (actions/do-dialogue entities

1
desktop/src-common/advent/screens/rooms/inside_jail.clj
View File

@@ -225,6 +225,7 @@
candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4)) 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])] 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 (rooms/make :music :inside-antique
:name "In jail"
:sounds { :sounds {
:squeek (utils/load-sound "inside-jail/squeak.ogg") :squeek (utils/load-sound "inside-jail/squeak.ogg")
:crowbar-sound (utils/load-sound "ego/crowbar.ogg") :crowbar-sound (utils/load-sound "ego/crowbar.ogg")

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

@@ -664,6 +664,7 @@ void main ()
:get-sick-sound (utils/load-sound "ego/get-sick.ogg") :get-sick-sound (utils/load-sound "ego/get-sick.ogg")
:scratch-sound (utils/load-sound "ego/scratch.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-1 (utils/load-sound "ego/inside-step-1.ogg")
:inside-step-sound-2 (utils/load-sound "ego/inside-step-2.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 [: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 :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] (get-in ego [:left :stand]) {11 [:blink 0.15]
44 [:blink 0.15] 44 [:blink 0.15]
77 [:blink 0.15] 77 [:blink 0.15]