diff --git a/TODO.txt b/TODO.txt index e8ff9f9..ecc2e3d 100644 --- a/TODO.txt +++ b/TODO.txt @@ -37,7 +37,7 @@ x Fix crash when clicking menu items with pointer - A different license perhaps? - Credit screen showing music and graphics guys: - Music: http://soundimage.org/ (Eric Matyas) - - SFX (Eric Matyas & https://opengameart.org/users/artisticdude) + - SFX (Eric Matyas & https://opengameart.org/users/artisticdude & ZapSplat.com) - Graphics: (see README) Legend: ( '-' = future) ( 'x' = completed ) ( 'o' = begun ) diff --git a/assets/Sounds/FX/fistpunch_vocal_01.wav b/assets/Sounds/FX/fistpunch_vocal_01.wav new file mode 100644 index 0000000..cbeedfc Binary files /dev/null and b/assets/Sounds/FX/fistpunch_vocal_01.wav differ diff --git a/assets/Sounds/FX/fistpunch_vocal_02.wav b/assets/Sounds/FX/fistpunch_vocal_02.wav new file mode 100644 index 0000000..a8053d9 Binary files /dev/null and b/assets/Sounds/FX/fistpunch_vocal_02.wav differ diff --git a/assets/Sounds/FX/fistpunch_vocal_03.wav b/assets/Sounds/FX/fistpunch_vocal_03.wav new file mode 100644 index 0000000..d7139ed Binary files /dev/null and b/assets/Sounds/FX/fistpunch_vocal_03.wav differ diff --git a/src/mixer.c b/src/mixer.c index e967197..a6c5dc2 100644 --- a/src/mixer.c +++ b/src/mixer.c @@ -52,6 +52,9 @@ load_effects(void) effects[LEVEL_UP] = load_effect("assets/Sounds/FX/level_up.wav"); effects[NEXT_LEVEL] = load_effect("assets/Sounds/FX/next_level.wav"); effects[SPLAT] = load_effect("assets/Sounds/FX/splat.wav"); + effects[PLAYER_HIT0] = load_effect("assets/Sounds/FX/fistpunch_vocal_01.wav"); + effects[PLAYER_HIT1] = load_effect("assets/Sounds/FX/fistpunch_vocal_02.wav"); + effects[PLAYER_HIT2] = load_effect("assets/Sounds/FX/fistpunch_vocal_03.wav"); } void diff --git a/src/mixer.h b/src/mixer.h index f4ee439..624034a 100644 --- a/src/mixer.h +++ b/src/mixer.h @@ -28,6 +28,9 @@ typedef enum Fx_t { LEVEL_UP, NEXT_LEVEL, SPLAT, + PLAYER_HIT0, + PLAYER_HIT1, + PLAYER_HIT2, LAST_EFFECT } Fx; diff --git a/src/player.c b/src/player.c index 31236dd..17882aa 100644 --- a/src/player.c +++ b/src/player.c @@ -331,6 +331,7 @@ player_hit(Player *p, unsigned int dmg) pos.x += 8; pos.y += 8; particle_engine_bloodspray(pos, (Dimension) { 8, 8 }, dmg); + mixer_play_effect(PLAYER_HIT0 + get_random(2)); } else { p->missText->active = true; p->hitText->active = false;