Mercurial > nagslang
changeset 612:d9e7009bec9f
Bullet sounds.
| author | Simon Cross <hodgestar@gmail.com> |
|---|---|
| date | Sun, 08 Sep 2013 00:43:59 +0200 |
| parents | c7411c70fe0e |
| children | 0b46e8524ec5 |
| files | data/sounds/SOURCES.txt data/sounds/mouth_pop_2a.ogg data/sounds/vocoder2_short.ogg nagslang/enemies.py nagslang/game_object.py nagslang/protagonist.py |
| diffstat | 6 files changed, 33 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/data/sounds/SOURCES.txt Sun Sep 08 00:39:34 2013 +0200 +++ b/data/sounds/SOURCES.txt Sun Sep 08 00:43:59 2013 +0200 @@ -21,3 +21,29 @@ http://creativecommons.org/licenses/by/3.0 Notes: Ogg generated using 'oggenc robotstep2.wav' + + +mouth_pop_2a.ogg +---------------- + +URL: + http://archive.org/download/Berklee44v5/Berklee44v5.zip +Source: + http://archive.org/details/Berklee44v5 +License: + http://creativecommons.org/licenses/by/3.0 +Notes: + Ogg generated using 'oggenc -q -1 mouth_pop_2a.wav' + + +vocoder2_short.ogg +------------------ + +URL: + http://archive.org/download/Berklee44v5/Berklee44v5.zip +Source: + http://archive.org/details/Berklee44v5 +License: + http://creativecommons.org/licenses/by/3.0 +Notes: + Ogg generated using 'oggenc -q -1 vocoder2_short.ogg'
--- a/nagslang/enemies.py Sun Sep 08 00:39:34 2013 +0200 +++ b/nagslang/enemies.py Sun Sep 08 00:43:59 2013 +0200 @@ -121,7 +121,8 @@ vec.length = speed result.add += (Bullet( self.get_space(), self.physicser.position, vec, damage, - type_, COLLISION_TYPE_ENEMY),) + type_, COLLISION_TYPE_ENEMY, + "mouth_pop_2a.ogg"),) def greedy_move(self, target): """Simple greedy path finder"""
--- a/nagslang/game_object.py Sun Sep 08 00:39:34 2013 +0200 +++ b/nagslang/game_object.py Sun Sep 08 00:43:59 2013 +0200 @@ -637,7 +637,7 @@ class Bullet(GameObject): def __init__(self, space, position, impulse, damage, bullet_type, - source_collision_type): + source_collision_type, bullet_sound=None): body = make_body(1, pymunk.inf, position) body.angle = impulse.angle self.last_position = position @@ -653,6 +653,8 @@ 'objects', '%s.png' % self.type)), ) self.physicser.apply_impulse(impulse) + if bullet_sound is not None: + sound.play_sound(bullet_sound, 0.3) def update(self, dt): super(Bullet, self).update(dt)
--- a/nagslang/protagonist.py Sun Sep 08 00:39:34 2013 +0200 +++ b/nagslang/protagonist.py Sun Sep 08 00:43:59 2013 +0200 @@ -311,7 +311,8 @@ vec = vec_from_angle(self.angle, BULLET_SPEED) return Result(add=(Bullet(self.get_space(), self.physicser.position, vec, BULLET_DAMAGE, 'bullet', - COLLISION_TYPE_PLAYER),)) + COLLISION_TYPE_PLAYER, + "vocoder2_short.ogg"),)) def claw(self): claw_range = (math.sqrt(math.pow(self.physicser.get_velocity()[0], 2) +