From 0306e2bbeaff443f313807a5d3064e2cd7c87d6f Mon Sep 17 00:00:00 2001 From: Steve Date: Sun, 5 Jun 2016 11:22:19 +0100 Subject: [PATCH] Added new sound effects. --- README.md | 5 +++ data/credits/credits.json | 16 +++++++++ sound/107786__leviclaassen__beepbeep.ogg | Bin 0 -> 5305 bytes sound/154934__klawykogut__empty-gun-shot.ogg | Bin 0 -> 5637 bytes sound/33785__jobro__4-beep-b.ogg | Bin 0 -> 6174 bytes sound/62491__benboncan__dslr-click.ogg | Bin 0 -> 7988 bytes src/battle/objectives.c | 10 ++++++ src/battle/objectives.h | 1 + src/battle/player.c | 33 +++++++++++++++++-- src/defs.h | 4 +++ src/system/sound.c | 4 +++ 11 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 sound/107786__leviclaassen__beepbeep.ogg create mode 100644 sound/154934__klawykogut__empty-gun-shot.ogg create mode 100644 sound/33785__jobro__4-beep-b.ogg create mode 100644 sound/62491__benboncan__dslr-click.ogg diff --git a/README.md b/README.md index f0c8d91..1d0b1d4 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,11 @@ All other data files are CC BY-NC-SA 3.0, with the following attribution: Copyri * 254174__kwahmah-02__s.ogg - s.wav, by kwahmah_02 (CC-0) - https://freesound.org/people/kwahmah_02/sounds/254174/ * 172870__escortmarius__carbidexplosion.ogg - carbidexplosion.wav, by escortmarius (CC-BY) - https://freesound.org/people/escortmarius/sounds/172870/ * 320181__dland__hint.ogg - hint.wav, by dland (CC-0) - https://freesound.org/people/dland/sounds/320181/ +* 62491__benboncan__dslr-click.ogg - DSLR Click.wav, by Benboncan (CC-BY) - https://freesound.org/people/Benboncan/sounds/62491/ +* 154934__klawykogut__empty-gun-shot.ogg - Empty Gun Shot, by KlawyKogut (CC-0) - https://freesound.org/people/KlawyKogut/sounds/154934/ +* 107786__leviclaassen__beepbeep.ogg - beepbeep.wav, by leviclaassen (CC-BY) - https://freesound.org/people/leviclaassen/sounds/107786/ +* 33785__jobro__4-beep-b.ogg - 4 beep b.wav, by jobro (CC-BY) - https://freesound.org/people/jobro/sounds/33785/ + ### MUSIC diff --git a/data/credits/credits.json b/data/credits/credits.json index ad5a588..0835658 100644 --- a/data/credits/credits.json +++ b/data/credits/credits.json @@ -207,6 +207,22 @@ "0 24 hint.wav, by dland (CC-0)", "0 24 https://freesound.org/people/dland/sounds/320181/", + "30 24 62491__benboncan__dslr-click.ogg", + "0 24 DSLR Click.wav, by Benboncan (CC-BY)", + "0 24 https://freesound.org/people/Benboncan/sounds/62491/", + + "30 24 154934__klawykogut__empty-gun-shot.ogg", + "0 24 Empty Gun Shot, by KlawyKogut (CC-0)", + "0 24 https://freesound.org/people/KlawyKogut/sounds/154934/", + + "30 24 107786__leviclaassen__beepbeep.ogg", + "0 24 beepbeep.wav, by leviclaassen (CC-BY)", + "0 24 https://freesound.org/people/leviclaassen/sounds/107786/", + + "30 24 33785__jobro__4-beep-b.ogg", + "0 24 4 beep b.wav, by jobro (CC-BY)", + "0 24 https://freesound.org/people/jobro/sounds/33785/", + "75 30 MUSIC", "30 24 Battle in the winter.mp3", diff --git a/sound/107786__leviclaassen__beepbeep.ogg b/sound/107786__leviclaassen__beepbeep.ogg new file mode 100644 index 0000000000000000000000000000000000000000..eabfefdcd4f268e5c8e6a8dcd1f17e9288d496d8 GIT binary patch literal 5305 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 Mzb^YeU~MS>0y9yLzyJUM literal 0 HcmV?d00001 diff --git a/sound/154934__klawykogut__empty-gun-shot.ogg b/sound/154934__klawykogut__empty-gun-shot.ogg new file mode 100644 index 0000000000000000000000000000000000000000..12b7553d4c13b63090a1238be7c807ac490bc415 GIT binary patch literal 5637 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 IOwfS-1EHK&R{#J2 literal 0 HcmV?d00001 diff --git a/sound/33785__jobro__4-beep-b.ogg b/sound/33785__jobro__4-beep-b.ogg new file mode 100644 index 0000000000000000000000000000000000000000..f2b214f7275cbbc1928fa00f68fb73bcea88934e GIT binary patch literal 6174 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 tyS+&lWxF<targetName, o->targetType); } + + activated = 1; } } token = strtok(NULL, ";"); } + + if (activated) + { + playSound(SND_NEW_OBJECTIVE); + } } void loadObjectives(cJSON *node) diff --git a/src/battle/objectives.h b/src/battle/objectives.h index 5d75820..01e3d49 100644 --- a/src/battle/objectives.h +++ b/src/battle/objectives.h @@ -28,6 +28,7 @@ extern void failMission(void); extern char *getTranslatedString(char *string); extern int getJSONValue(cJSON *node, char *name, int defValue); extern long lookup(char *name); +extern void playSound(int id); extern Battle battle; extern Colors colors; diff --git a/src/battle/player.c b/src/battle/player.c index 860f893..7e61100 100644 --- a/src/battle/player.c +++ b/src/battle/player.c @@ -36,6 +36,7 @@ static void preFireMissile(void); static void applyRestrictions(void); static int isPriorityMissionTarget(Entity *e, int dist, int closest); static int targetOutOfRange(void); +static void rechargeBoostECM(void); static void setPilotName(void); static int selectedPlayerIndex; @@ -119,8 +120,7 @@ static void setPilotName(void) void doPlayer(void) { - battle.boostTimer = MIN(battle.boostTimer + 1, BOOST_RECHARGE_TIME); - battle.ecmTimer = MIN(battle.ecmTimer + 1, ECM_RECHARGE_TIME); + rechargeBoostECM(); self = player; @@ -196,6 +196,25 @@ void doPlayer(void) } } +static void rechargeBoostECM(void) +{ + int boostTimer, ecmTimer; + + boostTimer = battle.boostTimer; + battle.boostTimer = MIN(battle.boostTimer + 1, BOOST_RECHARGE_TIME); + if (boostTimer < BOOST_RECHARGE_TIME && battle.boostTimer == BOOST_RECHARGE_TIME) + { + playSound(SND_RECHARGED); + } + + ecmTimer = battle.ecmTimer; + battle.ecmTimer = MIN(battle.ecmTimer + 1, ECM_RECHARGE_TIME); + if (ecmTimer < ECM_RECHARGE_TIME && battle.ecmTimer == ECM_RECHARGE_TIME) + { + playSound(SND_RECHARGED); + } +} + static int targetOutOfRange(void) { return (app.gameplay.autoSwitchPlayerTarget && getDistance(player->x, player->y, player->target->x, player->target->y) > SCREEN_WIDTH * 2); @@ -384,9 +403,17 @@ static void preFireMissile(void) } else { + playSound(SND_GUI_DENIED); + addHudMessage(colors.white, _("Target not in range")); } } + else if (!player->missiles) + { + addHudMessage(colors.white, _("Out of missiles")); + + playSound(SND_NO_MISSILES); + } } void initPlayerSelect(void) @@ -650,6 +677,8 @@ static int isPriorityMissionTarget(Entity *e, int dist, int closest) static void cycleRadarZoom(void) { battle.radarRange = (battle.radarRange + 1) % 3; + + playSound(SND_ZOOM); } int playerHasGun(int type) diff --git a/src/defs.h b/src/defs.h index 6d5aecb..e817196 100644 --- a/src/defs.h +++ b/src/defs.h @@ -279,6 +279,10 @@ enum SND_GUI_SELECT, SND_GUI_CLOSE, SND_GUI_DENIED, + SND_ZOOM, + SND_NEW_OBJECTIVE, + SND_NO_MISSILES, + SND_RECHARGED, SND_MAX }; diff --git a/src/system/sound.c b/src/system/sound.c index 1b3f568..d680c11 100644 --- a/src/system/sound.c +++ b/src/system/sound.c @@ -122,6 +122,10 @@ static void loadSounds(void) sounds[SND_MINE_WARNING] = loadSound("sound/254174__kwahmah-02__s.ogg"); sounds[SND_TIME_WARNING] = loadSound("sound/320181__dland__hint.ogg"); sounds[SND_CAP_DEATH] = loadSound("sound/000000_large_explosion.ogg"); + sounds[SND_ZOOM] = loadSound("sound/62491__benboncan__dslr-click.ogg"); + sounds[SND_NO_MISSILES] = loadSound("sound/154934__klawykogut__empty-gun-shot.ogg"); + sounds[SND_NEW_OBJECTIVE] = loadSound("sound/107786__leviclaassen__beepbeep.ogg"); + sounds[SND_RECHARGED] = loadSound("sound/33785__jobro__4-beep-b.ogg"); sounds[SND_GUI_CLICK] = loadSound("sound/257786__xtrgamr__mouse-click.ogg"); sounds[SND_GUI_SELECT] = loadSound("sound/321104__nsstudios__blip2.ogg");