stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-18 07:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some fun sound changes

Browse source 
- Peelout sound for sneaker boosts
- Flicky grab sound for stealing balloons
- Adaptive sounds for start boosts (drift boost for sub-optimal boosts, sneaker boost for good boosts, super transform sound for the frame perfect boost)
- Orbinaut rollling sound
This commit is contained in:
SeventhSentinel 2018-06-26 12:02:14 -04:00
parent 1305befcde
commit 920ce3807f
4 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -14603,7 +14603,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // display offset 0, // display offset
100, // mass 100, // mass
1, // damage 1, // damage
sfx_grnshl, // activesound sfx_s3k96, // activesound
MF_SHOOTABLE|MF_BOUNCE, // flags MF_SHOOTABLE|MF_BOUNCE, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

18
src/k_kart.c
View file

@ -731,7 +731,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
// This makes the roulette produce the random noises. // This makes the roulette produce the random noises.
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player)) if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsLocalPlayer(player))
S_StartSound(NULL,sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8)); S_StartSound(NULL, sfx_mkitm1 + ((player->kartstuff[k_itemroulette] / 3) % 8));
roulettestop = (TICRATE*1) + (3*(pingame - player->kartstuff[k_position])); roulettestop = (TICRATE*1) + (3*(pingame - player->kartstuff[k_position]));
@ -1666,6 +1666,8 @@ void K_StealBalloon(player_t *player, player_t *victim, boolean force)
else else
P_SetMobjState(newmo, S_BATTLEBALLOON1); P_SetMobjState(newmo, S_BATTLEBALLOON1);
S_StartSound(player->mo, sfx_3db06);
player->kartstuff[k_balloon]++; player->kartstuff[k_balloon]++;
player->kartstuff[k_comebackpoints] = 0; player->kartstuff[k_comebackpoints] = 0;
player->powers[pw_flashing] = K_GetKartFlashing(); player->powers[pw_flashing] = K_GetKartFlashing();
@ -2353,7 +2355,7 @@ static void K_DoHyudoroSteal(player_t *player)
void K_DoSneaker(player_t *player, boolean doPFlag) void K_DoSneaker(player_t *player, boolean doPFlag)
{ {
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3) if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
S_StartSound(player->mo, sfx_s23c); S_StartSound(player->mo, sfx_cdfm01);
player->kartstuff[k_sneakertimer] = sneakertime; player->kartstuff[k_sneakertimer] = sneakertime;
@ -3563,10 +3565,16 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
// Get an instant boost! // Get an instant boost!
if (player->kartstuff[k_boostcharge] >= 35 && player->kartstuff[k_boostcharge] <= 50) if (player->kartstuff[k_boostcharge] >= 35 && player->kartstuff[k_boostcharge] <= 50)
{ {
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
S_StartSound(player->mo, sfx_s23c);
player->kartstuff[k_sneakertimer] = -((21*(player->kartstuff[k_boostcharge]*player->kartstuff[k_boostcharge]))/425)+131; // max time is 70, min time is 7; yay parabooolas player->kartstuff[k_sneakertimer] = -((21*(player->kartstuff[k_boostcharge]*player->kartstuff[k_boostcharge]))/425)+131; // max time is 70, min time is 7; yay parabooolas
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
{
if (player->kartstuff[k_sneakertimer] >= 70)
S_StartSound(player->mo, sfx_s25f); // Special sound for the perfect start boost!
else if (player->kartstuff[k_sneakertimer] >= sneakertime)
S_StartSound(player->mo, sfx_cdfm01); // Sneaker boost sound for big boost
else
S_StartSound(player->mo, sfx_s23c); // Drift boost sound for small boost
}
} }
// You overcharged your engine? Those things are expensive!!! // You overcharged your engine? Those things are expensive!!!
else if (player->kartstuff[k_boostcharge] > 50) else if (player->kartstuff[k_boostcharge] > 50)

16
src/sounds.c
View file

@ -343,7 +343,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s239", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s239", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s23a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s23a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s23b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s23b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s23c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s23c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Drift boost
{"s23d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s23d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s23e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s23e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s23f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s23f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -378,7 +378,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s25c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s25c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s25d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s25d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s25e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s25e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s25f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s25f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Perfect start boost
{"s260", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s260", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s261", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s261", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s262", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s262", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -497,7 +497,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Orbinaut
{"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k99", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k99", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -514,13 +514,13 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka4", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka5", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka6", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka7", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart 3,2,1
{"s3ka8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka8", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3ka9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3ka9", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kaa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kaa", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kab", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kac", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kad", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart GO!
{"s3kae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kae", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kaf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kaf", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kb0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kb0", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -563,7 +563,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3kc8l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kc8l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kc9s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kc9s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kc9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kc9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kcas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kcas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart respawn
{"s3kcal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kcal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kcbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kcbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3kcbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kcbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
@ -601,14 +601,14 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3kdbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3kdbl", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever) // 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever)
{"3db06", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"3db06", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Bumper stolen
{"3db09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"3db09", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"3db14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"3db14", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"3db16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"3db16", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
// Sonic CD sounds // Sonic CD sounds
{"cdfm00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm00", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm01", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Sneaker boost
{"cdfm02", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm02", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm03", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm03", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"cdfm04", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"cdfm04", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},

2
src/st_stuff.c
View file

@ -812,6 +812,7 @@ static void ST_drawLevelTitle(void)
V_DrawCenteredString(subttlxpos, lvlttly+48, V_ALLOWLOWERCASE, subttl); V_DrawCenteredString(subttlxpos, lvlttly+48, V_ALLOWLOWERCASE, subttl);
} }
/*
static void ST_drawFirstPersonHUD(void) static void ST_drawFirstPersonHUD(void)
{ {
player_t *player = stplyr; player_t *player = stplyr;
@ -913,6 +914,7 @@ static void ST_drawFirstPersonHUD(void)
V_DrawScaledPatch(SCX((BASEVIDWIDTH/2) - (SHORT(p->width)/2) + SHORT(p->leftoffset)), SCY(60 - SHORT(p->topoffset)), V_DrawScaledPatch(SCX((BASEVIDWIDTH/2) - (SHORT(p->width)/2) + SHORT(p->leftoffset)), SCY(60 - SHORT(p->topoffset)),
V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, p); V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, p);
} }
*/
/* /*
// [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold // [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold