# HG changeset patch # User Neil Muller # Date 1282926602 -7200 # Node ID 59dba2dcb28010295f75e37545637ad765129b24 # Parent 5213ee33ec1bb2ed2a9cc60159d7b5525fcdd66d Make computer beep diff -r 5213ee33ec1b -r 59dba2dcb280 Resources/sounds/beep550.ogg Binary file Resources/sounds/beep550.ogg has changed diff -r 5213ee33ec1b -r 59dba2dcb280 Resources/sounds/sources.txt --- a/Resources/sounds/sources.txt Fri Aug 27 18:24:35 2010 +0200 +++ b/Resources/sounds/sources.txt Fri Aug 27 18:30:02 2010 +0200 @@ -29,7 +29,8 @@ creaking.ogg wavfile: creaking.wav [silent.ogg] -generated 2 secs of silence - dd if=/dev/zero of=silence.pcm bs=176400 count=2 ; oggenc -r silence.pcm +Generated 2 secs of silence - dd if=/dev/zero of=silence.pcm bs=176400 count=2 ; oggenc -r silence.pcm +Generated by Neil Muller, Aug 2010 Not copyrightable. [can_hit.ogg] @@ -68,9 +69,11 @@ [beep330.ogg] [beep440.ogg] +[beep550.ogg] [beep660.ogg] [beep880.ogg] -Created with the gen_sound.py script in trunk/tools (330, 440, 660, 880 Hz). +Created with the gen_sound.py script in trunk/tools (330, 440, 550, 660, 880 Hz). +Generated by Neil Muller, Aug 2010 Not copyrightable. [beep1.ogg] @@ -79,3 +82,6 @@ /gen_sound.py 660 0.25 ; /gen_sound.py 550 0.25 ; cat beep770.pcm beep660.pcm beep550.pcm beep440.pcm > beep2.pcm [beep3.ogg] cat beep440.pcm beep550.pcm beep660.pcm beep550.pcm > beep3.pcm + +Generated by Neil Muller, Aug 2010 +License: http://creativecommons.org/licenses/by/3.0/ diff -r 5213ee33ec1b -r 59dba2dcb280 gamelib/scenes/bridge.py --- a/gamelib/scenes/bridge.py Fri Aug 27 18:24:35 2010 +0200 +++ b/gamelib/scenes/bridge.py Fri Aug 27 18:30:02 2010 +0200 @@ -231,6 +231,7 @@ if not self.is_interactive(): return self.state.detail_views[self.COMPUTER].set_data('tab', 'log') + return Result(soundfile='beep550.ogg') class AlertTab(Thing): @@ -251,6 +252,7 @@ if not self.is_interactive(): return self.state.detail_views[self.COMPUTER].set_data('tab', 'alert') + return Result(soundfile='beep550.ogg') class CompUpButton(Thing): @@ -274,6 +276,7 @@ return page = self.state.detail_views[self.COMPUTER].get_data('log page') self.state.detail_views[self.COMPUTER].set_data('log page', page-1) + return Result(soundfile='beep550.ogg') class CompDownButton(Thing): @@ -298,6 +301,7 @@ return page = self.state.detail_views[self.COMPUTER].get_data('log page') self.state.detail_views[self.COMPUTER].set_data('log page', page+1) + return Result(soundfile='beep550.ogg') class BridgeCompDetail(Scene):