From 6023f794ac7a12aa31062b07928828ff31434cc7 Mon Sep 17 00:00:00 2001 From: Sryder Date: Thu, 7 Jun 2018 19:34:13 +0100 Subject: [PATCH 1/9] Restore the removed voices --- src/k_kart.c | 6 +++--- src/p_user.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 9461cd46..1be69abc 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2739,17 +2739,17 @@ void K_MoveKartPlayer(player_t *player, boolean onground) K_KartUpdatePosition(player); - /*if (!player->kartstuff[k_positiondelay] && !player->exiting) + if (!player->kartstuff[k_positiondelay] && !player->exiting) { if (player->kartstuff[k_oldposition] <= player->kartstuff[k_position]) // But first, if you lost a place, player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // then the other player taunts. else if (player->kartstuff[k_oldposition] > player->kartstuff[k_position]) // Otherwise, { - //S_StartSound(player->mo, sfx_slow); // Say "YOU'RE TOO SLOW!" + S_StartSound(player->mo, sfx_slow); // Say "YOU'RE TOO SLOW!" player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // Restore the old position, player->kartstuff[k_positiondelay] = 5*TICRATE; // and set up a timer. } - }*/ + } if (player->kartstuff[k_positiondelay]) player->kartstuff[k_positiondelay]--; diff --git a/src/p_user.c b/src/p_user.c index 691ecee7..38e0307b 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1674,14 +1674,14 @@ void P_DoPlayerExit(player_t *player) else if (!countdown) countdown = cv_countdowntime.value*TICRATE + 1; // Use cv_countdowntime -/* + if (circuitmap) { if (player->kartstuff[k_position] <= 3) S_StartSound(player->mo, sfx_kwin); else S_StartSound(player->mo, sfx_klose); - }*/ + } if (P_IsLocalPlayer(player) && cv_inttime.value > 0) { From 213749b1152e95eef1d3f06593dd629161c60ae2 Mon Sep 17 00:00:00 2001 From: Sryder Date: Thu, 7 Jun 2018 19:56:26 +0100 Subject: [PATCH 2/9] Big voices change When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices When using other voices, there's at least a 2 second delay on all other voices --- src/d_player.h | 3 ++- src/dehacked.c | 3 ++- src/k_kart.c | 73 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index 80e633dc..bd5004de 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -246,7 +246,8 @@ typedef enum k_throwdir, // Held dir of controls; 1 = forward, 0 = none, -1 = backward (was "player->heldDir") k_lapanimation, // Used to make a swoopy lap lakitu, maybe other effects in the future k_cardanimation, // Used to determine the position of some full-screen Battle Mode graphics - k_sounds, // Used this to stop and then force music restores as it hits zero + k_voices, // Used to stop the player saying more voices than it should + k_tauntvoices, // Used to specifically stop taunt voice spam k_boosting, // Determines if you're currently shroom-boosting k_floorboost, // Prevents Mushroom sounds for a breif duration when triggered by a floor panel diff --git a/src/dehacked.c b/src/dehacked.c index 71d1d8f4..70b6965e 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7550,7 +7550,8 @@ static const char *const KARTSTUFF_LIST[] = { "THROWDIR", "LAPANIMATION", "CARDANIMATION", - "SOUNDS", + "VOICES", + "TAUNTVOICES", "BOOSTING", "FLOORBOOST", diff --git a/src/k_kart.c b/src/k_kart.c index 1be69abc..14436041 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1111,8 +1111,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) else player->kartstuff[k_cardanimation] = 0; - if (player->kartstuff[k_sounds]) - player->kartstuff[k_sounds]--; + if (player->kartstuff[k_voices]) + player->kartstuff[k_voices]--; + + if (player->kartstuff[k_tauntvoices]) + player->kartstuff[k_tauntvoices]--; // ??? /* @@ -1190,7 +1193,48 @@ void K_KartPlayerAfterThink(player_t *player) static void K_PlayTauntSound(mobj_t *source) { + if (source->player && source->player->kartstuff[k_tauntvoices]) // Prevents taunt sounds from playing every time the button is pressed + return; + S_StartSound(source, sfx_taunt1+P_RandomKey(4)); + + if (source->player) + { + source->player->kartstuff[k_tauntvoices] = 175; + source->player->kartstuff[k_voices] = 70; + } +} + +static void K_PlayVoiceSound(mobj_t *source) +{ + if (source->player && source->player->kartstuff[k_voices]) // Prevents taunt sounds from playing every time the button is pressed + return; + + S_StartSound(source, sfx_slow); + + if (source->player) + { + source->player->kartstuff[k_voices] = 70; + + if (source->player->kartstuff[k_tauntvoices] < 70) + source->player->kartstuff[k_tauntvoices] = 70; + } +} + +static void K_PlayHitEmSound(mobj_t *source) +{ + if (source->player && source->player->kartstuff[k_voices]) // Prevents taunt sounds from playing every time the button is pressed + return; + + S_StartSound(source, sfx_hitem); + + if (source->player) + { + source->player->kartstuff[k_voices] = 70; + + if (source->player->kartstuff[k_tauntvoices] < 70) + source->player->kartstuff[k_tauntvoices] = 70; + } } void K_MomentumToFacing(player_t *player) @@ -1379,11 +1423,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source) || (G_BattleGametype() && ((player->kartstuff[k_balloon] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1))) return; - if (source && source != player->mo && source->player && !source->player->kartstuff[k_sounds]) - { - S_StartSound(source, sfx_hitem); - source->player->kartstuff[k_sounds] = 50; - } + K_PlayHitEmSound(source); player->kartstuff[k_mushroomtimer] = 0; player->kartstuff[k_driftboost] = 0; @@ -2241,11 +2281,7 @@ void K_DoMushroom(player_t *player, boolean doPFlag) if (doPFlag) player->pflags |= PF_ATTACKDOWN; - if (player->kartstuff[k_sounds]) // Prevents taunt sounds from playing every time the button is pressed - return; - K_PlayTauntSound(player->mo); - player->kartstuff[k_sounds] = 50; } static void K_DoLightning(player_t *player, boolean bluelightning) @@ -2276,11 +2312,7 @@ static void K_DoLightning(player_t *player, boolean bluelightning) continue; } - if (player->kartstuff[k_sounds]) // Prevents taunt sounds from playing every time the button is pressed - return; - K_PlayTauntSound(player->mo); - player->kartstuff[k_sounds] = 50; } void K_DoBouncePad(mobj_t *mo, fixed_t vertispeed) @@ -2739,15 +2771,14 @@ void K_MoveKartPlayer(player_t *player, boolean onground) K_KartUpdatePosition(player); - if (!player->kartstuff[k_positiondelay] && !player->exiting) + if (!player->exiting) { if (player->kartstuff[k_oldposition] <= player->kartstuff[k_position]) // But first, if you lost a place, player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // then the other player taunts. else if (player->kartstuff[k_oldposition] > player->kartstuff[k_position]) // Otherwise, { - S_StartSound(player->mo, sfx_slow); // Say "YOU'RE TOO SLOW!" + K_PlayOvertakeSound(player->mo); // Say "YOU'RE TOO SLOW!" player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // Restore the old position, - player->kartstuff[k_positiondelay] = 5*TICRATE; // and set up a timer. } } @@ -3382,12 +3413,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground) S_StartSound(player->mo, sfx_sboost); player->kartstuff[k_mushroomtimer] = -((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_sounds]) // Prevents taunt sounds from playing every time the button is pressed - { - K_PlayTauntSound(player->mo); - player->kartstuff[k_sounds] = 50; - } } // You overcharged your engine? Those things are expensive!!! else if (player->kartstuff[k_boostcharge] > 50) From 97caf79f16fb4e748fce9b6c9800b9372e43e995 Mon Sep 17 00:00:00 2001 From: Sryder Date: Thu, 7 Jun 2018 20:03:47 +0100 Subject: [PATCH 3/9] Whoops, accidental rename --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 14436041..70c8d08f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1205,7 +1205,7 @@ static void K_PlayTauntSound(mobj_t *source) } } -static void K_PlayVoiceSound(mobj_t *source) +static void K_PlayOvertakeSound(mobj_t *source) { if (source->player && source->player->kartstuff[k_voices]) // Prevents taunt sounds from playing every time the button is pressed return; From f00e3dfd5a96c0874ca9ac3e9e569c91779888e1 Mon Sep 17 00:00:00 2001 From: Sryder Date: Fri, 8 Jun 2018 21:05:45 +0100 Subject: [PATCH 4/9] New Drift dust Applies all the time as long as the object is turning tight enough New Sound Works on Red Shells too! --- src/dehacked.c | 11 ++++---- src/info.c | 21 +++++++-------- src/info.h | 13 +++++---- src/k_kart.c | 68 +++++++++++++++++++++++++++++++++++++++++++---- src/k_kart.h | 3 ++- src/lua_baselib.c | 15 +++++++++-- src/p_mobj.c | 7 +++++ src/p_user.c | 6 +++-- src/sounds.c | 1 + src/sounds.h | 1 + 10 files changed, 112 insertions(+), 34 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 71d1d8f4..50fef47f 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6235,11 +6235,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_DRIFTSPARK6", // Drift Smoke - "S_DRIFTSMOKE1", - "S_DRIFTSMOKE2", - "S_DRIFTSMOKE3", - "S_DRIFTSMOKE4", - "S_DRIFTSMOKE5", + "S_DRIFTDUST1", + "S_DRIFTDUST2", + "S_DRIFTDUST3", + "S_DRIFTDUST4", // Magnet Burst @@ -7109,7 +7108,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_MUSHROOMTRAIL", "MT_DRIFT", - "MT_DRIFTSMOKE", + "MT_DRIFTDUST", "MT_FAKESHIELD", "MT_FAKEITEM", diff --git a/src/info.c b/src/info.c index 3c7e2894..8a1dd5a3 100644 --- a/src/info.c +++ b/src/info.c @@ -55,7 +55,7 @@ char sprnames[NUMSPRITES + 1][5] = "GWLR","SRBA","SRBB","SRBC","SRBD","SRBE","SRBF","SRBG","SRBH","SRBI", "SRBJ","SRBK","SRBL","SRBM","SRBN","SRBO", //SRB2kart Sprites - "SPRG","BSPR","RNDM","RPOP","KFRE","DRIF","DSMO","FITM","DFAK","BANA", + "SPRG","BSPR","RNDM","RPOP","KFRE","DRIF","DUST","FITM","DFAK","BANA", "DBAN","GSHE","DGSH","RSHE","DRSH","BOMB","KRBM","BLIG","LIGH","SINK", "SITR","KBLN","LAKI","POKE","AUDI","DECO","DOOD","SNES","GBAS","SPRS", "BUZB","CHOM","SACO","CRAB","SHAD","BUMP","FLEN","CLAS","PSHW","ARRO", @@ -2578,11 +2578,10 @@ state_t states[NUMSTATES] = {SPR_DRIF, 4, 2, {NULL}, 0, 0, S_DRIFTSPARK6}, // S_DRIFTSPARK5 {SPR_DRIF, 5, 2, {NULL}, 0, 0, S_DRIFTSPARK4}, // S_DRIFTSPARK6 - {SPR_DSMO, FF_TRANS50|0, 2, {NULL}, 0, 0, S_DRIFTSMOKE2}, // S_DRIFTSMOKE1 - {SPR_DSMO, FF_TRANS50|1, 2, {NULL}, 0, 0, S_DRIFTSMOKE3}, // S_DRIFTSMOKE2 - {SPR_DSMO, FF_TRANS50|2, 2, {NULL}, 0, 0, S_DRIFTSMOKE4}, // S_DRIFTSMOKE3 - {SPR_DSMO, FF_TRANS50|3, 2, {NULL}, 0, 0, S_DRIFTSMOKE5}, // S_DRIFTSMOKE4 - {SPR_DSMO, FF_TRANS50|4, 2, {NULL}, 0, 0, S_NULL}, // S_DRIFTSMOKE5 + {SPR_DUST, 0, 3, {NULL}, 0, 0, S_DRIFTDUST2}, // S_DRIFTDUST1 + {SPR_DUST, 1, 3, {NULL}, 0, 0, S_DRIFTDUST3}, // S_DRIFTDUST2 + {SPR_DUST, FF_TRANS20|2, 3, {NULL}, 0, 0, S_DRIFTDUST4}, // S_DRIFTDUST3 + {SPR_DUST, FF_TRANS20|3, 3, {NULL}, 0, 0, S_NULL}, // S_DRIFTDUST4 {SPR_NULL, 0, 10, {NULL}, 0, 0, S_KARTFIRE2}, // S_KARTFIRE1 {SPR_KFRE, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_KARTFIRE3}, // S_KARTFIRE2 @@ -14355,9 +14354,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_DRIFTSMOKE + { // MT_DRIFTDUST -1, // doomednum - S_DRIFTSMOKE1, // spawnstate + S_DRIFTDUST1, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -14372,13 +14371,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 8, // speed - 20*FRACUNIT, // radius - 16*FRACUNIT, // height + 8*FRACUNIT, // radius + 15*FRACUNIT, // height 0, // display offset 100, // mass 0, // damage sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags + MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_FLOAT|MF_SCENERY, // flags S_NULL // raisestate }, diff --git a/src/info.h b/src/info.h index f619b598..a223beca 100644 --- a/src/info.h +++ b/src/info.h @@ -582,7 +582,7 @@ typedef enum sprite SPR_RPOP, // Random Item Box Pop SPR_KFRE, // Mushroom fire trail SPR_DRIF, // Drift Sparks - SPR_DSMO, // Drift Smoke + SPR_DUST, // Drift Dust // Kart Items SPR_FITM, // Fake Item box @@ -3078,11 +3078,10 @@ typedef enum state S_DRIFTSPARK6, // Drift Smoke - S_DRIFTSMOKE1, - S_DRIFTSMOKE2, - S_DRIFTSMOKE3, - S_DRIFTSMOKE4, - S_DRIFTSMOKE5, + S_DRIFTDUST1, + S_DRIFTDUST2, + S_DRIFTDUST3, + S_DRIFTDUST4, // Magnet Burst @@ -3969,7 +3968,7 @@ typedef enum mobj_type MT_MUSHROOMTRAIL, MT_DRIFT, - MT_DRIFTSMOKE, + MT_DRIFTDUST, MT_FAKESHIELD, MT_FAKEITEM, diff --git a/src/k_kart.c b/src/k_kart.c index 9461cd46..627710dc 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1834,7 +1834,7 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t angle return NULL; } -void K_SpawnDriftTrail(player_t *player) +void K_SpawnBoostTrail(player_t *player) { fixed_t newx; fixed_t newy; @@ -1874,10 +1874,7 @@ void K_SpawnDriftTrail(player_t *player) ground -= FixedMul(mobjinfo[MT_MUSHROOMTRAIL].height, player->mo->scale); } #endif - if (player->kartstuff[k_drift] != 0 && player->kartstuff[k_mushroomtimer] == 0) - flame = P_SpawnMobj(newx, newy, ground, MT_DRIFTSMOKE); - else - flame = P_SpawnMobj(newx, newy, ground, MT_MUSHROOMTRAIL); + flame = P_SpawnMobj(newx, newy, ground, MT_MUSHROOMTRAIL); P_SetTarget(&flame->target, player->mo); flame->angle = travelangle; @@ -1901,6 +1898,67 @@ void K_SpawnDriftTrail(player_t *player) } } +// K_DriftDustHandling +// Parameters: +// spawner: The map object that is spawning the drift dust +// Description: Spawns the drift dust for objects, players use rmomx/y, other objects use regular momx/y. +// Also plays the drift sound. +// Other objects should be angled towards where they're trying to go so they don't randomly spawn dust +// Do note that most of the function won't run in odd intervals of frames +void K_DriftDustHandling(mobj_t *spawner) +{ + angle_t anglediff; + const INT16 spawnrange = spawner->radius>>FRACBITS; + + if (!P_IsObjectOnGround(spawner) || leveltime % 2 != 0) + return; + + if (spawner->player) + { + angle_t playerangle; + + if (spawner->player->speed < 5<player->cmd.forwardmove < 0) + { + playerangle = spawner->angle+ANGLE_180; + } + else + { + playerangle = spawner->angle; + } + anglediff = abs(playerangle - R_PointToAngle2(0, 0, spawner->player->rmomx, spawner->player->rmomy)); + } + else + { + if (P_AproxDistance(spawner->momx, spawner->momy) < 5<angle - R_PointToAngle2(0, 0, spawner->momx, spawner->momy)); + } + + if (anglediff > ANGLE_180) + anglediff = InvAngle(anglediff); + + if (anglediff > ANG10*4) // Trying to turn further than 40 degrees + { + fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST); + dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<momz = P_MobjFlip(spawner) * P_RandomRange(1, 4)<scale = spawner->scale/2; + dust->destscale = spawner->scale * 3; + if (leveltime % 6 == 0) + { + S_StartSound(spawner, sfx_screec); + } + } +} + static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, boolean bobombthrow) { mobj_t *mo; diff --git a/src/k_kart.h b/src/k_kart.h index f615e247..694450d8 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -29,7 +29,8 @@ void K_ExplodePlayer(player_t *player, mobj_t *source); void K_StealBalloon(player_t *player, player_t *victim, boolean force); void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle, boolean spawncenter, boolean ghostit, mobj_t *source); void K_SpawnBobombExplosion(mobj_t *source, UINT8 color); -void K_SpawnDriftTrail(player_t *player); +void K_SpawnBoostTrail(player_t *player); +void K_DriftDustHandling(mobj_t *spawner); void K_DoMushroom(player_t *player, boolean doPFlag); void K_DoBouncePad(mobj_t *mo, fixed_t vertispeed); boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y); diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 3aaf3b1d..b49cdd72 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -2086,7 +2086,17 @@ static int lib_kSpawnDriftTrail(lua_State *L) NOHUD if (!player) return LUA_ErrInvalid(L, "player_t"); - K_SpawnDriftTrail(player); + K_SpawnBoostTrail(player); + return 0; +} + +static int lib_kDriftDustHandling(lua_State *L) +{ + mobj_t *spawner = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); + NOHUD + if (!spawner) + return LUA_ErrInvalid(L, "mobj_t"); + K_DriftDustHandling(spawner); return 0; } @@ -2334,7 +2344,8 @@ static luaL_Reg lib[] = { {"K_ExplodePlayer",lib_kExplodePlayer}, {"K_StealBalloon",lib_kStealBalloon}, {"K_SpawnKartExplosion",lib_kSpawnKartExplosion}, - {"K_SpawnDriftTrail",lib_kSpawnDriftTrail}, + {"K_SpawnBoostTrail",lib_kSpawnDriftTrail}, + {"K_DriftDustHandling",lib_kDriftDustHandling}, {"K_DoMushroom",lib_kDoMushroom}, {"K_DoBouncePad",lib_kDoBouncePad}, {"K_MomentumToFacing",lib_kMomentumToFacing}, diff --git a/src/p_mobj.c b/src/p_mobj.c index a77b97b7..b363edc2 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7902,6 +7902,13 @@ void P_MobjThinker(mobj_t *mobj) P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), topspeed); + if (mobj->tracer) + mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->tracer->x, mobj->tracer->y); + else + mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy); + + K_DriftDustHandling(mobj); + sec2 = P_ThingOnSpecial3DFloor(mobj); if ((sec2 && GETSECSPECIAL(sec2->special, 3) == 1) || (P_IsObjectOnRealGround(mobj, mobj->subsector->sector) diff --git a/src/p_user.c b/src/p_user.c index 691ecee7..6d09bd5b 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -7093,8 +7093,10 @@ static void P_MovePlayer(player_t *player) //////////////////////////// // SRB2kart - Drifting smoke and fire - if ((player->kartstuff[k_drift] != 0 || player->kartstuff[k_mushroomtimer] > 0) && onground && (leveltime & 1)) - K_SpawnDriftTrail(player); + if (player->kartstuff[k_mushroomtimer] > 0 && onground && (leveltime & 1)) + K_SpawnBoostTrail(player); + + K_DriftDustHandling(player->mo); /* // SRB2kart - nadah // If the player isn't on the ground, make sure they aren't in a "starting dash" position. diff --git a/src/sounds.c b/src/sounds.c index 57d8852e..f5a7ee9b 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -805,6 +805,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"vroom", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"boing", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"smkinv", false, 140, 16, -1, NULL, 0, -1, -1, LUMPERROR}, + {"screec", false, 52, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // SRB2kart - Skin sounds {"kwin", false, 64, 0, -1, NULL, 0, SKSWIN, -1, LUMPERROR}, diff --git a/src/sounds.h b/src/sounds.h index 28a288da..7954a5ef 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -877,6 +877,7 @@ typedef enum sfx_vroom, sfx_boing, sfx_smkinv, + sfx_screec, sfx_kwin, sfx_klose, From 3daf6fbfd7eaf704d95abcff9a3a070352005ff7 Mon Sep 17 00:00:00 2001 From: Sryder Date: Sat, 9 Jun 2018 00:04:20 +0100 Subject: [PATCH 5/9] Slightly longer delay between voices Fix win/lose quotes to work based on actual win/lose criteria Don't play overtake sound until at least 10 seconds into the race --- src/k_kart.c | 20 ++++++++++++-------- src/p_user.c | 6 +++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 70c8d08f..5333dbf0 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1200,8 +1200,8 @@ static void K_PlayTauntSound(mobj_t *source) if (source->player) { - source->player->kartstuff[k_tauntvoices] = 175; - source->player->kartstuff[k_voices] = 70; + source->player->kartstuff[k_tauntvoices] = 6*TICRATE; + source->player->kartstuff[k_voices] = 3*TICRATE; } } @@ -1210,14 +1210,18 @@ static void K_PlayOvertakeSound(mobj_t *source) if (source->player && source->player->kartstuff[k_voices]) // Prevents taunt sounds from playing every time the button is pressed return; + // 4 seconds from before race begins, 10 seconds afterwards + if (leveltime < 14*TICRATE) + return; + S_StartSound(source, sfx_slow); if (source->player) { - source->player->kartstuff[k_voices] = 70; + source->player->kartstuff[k_voices] = 3*TICRATE; - if (source->player->kartstuff[k_tauntvoices] < 70) - source->player->kartstuff[k_tauntvoices] = 70; + if (source->player->kartstuff[k_tauntvoices] < 3*TICRATE) + source->player->kartstuff[k_tauntvoices] = 3*TICRATE; } } @@ -1230,10 +1234,10 @@ static void K_PlayHitEmSound(mobj_t *source) if (source->player) { - source->player->kartstuff[k_voices] = 70; + source->player->kartstuff[k_voices] = 3*TICRATE; - if (source->player->kartstuff[k_tauntvoices] < 70) - source->player->kartstuff[k_tauntvoices] = 70; + if (source->player->kartstuff[k_tauntvoices] < 3*TICRATE) + source->player->kartstuff[k_tauntvoices] = 3*TICRATE; } } diff --git a/src/p_user.c b/src/p_user.c index 38e0307b..4666141c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1677,10 +1677,10 @@ void P_DoPlayerExit(player_t *player) if (circuitmap) { - if (player->kartstuff[k_position] <= 3) - S_StartSound(player->mo, sfx_kwin); - else + if (K_IsPlayerLosing(player)) S_StartSound(player->mo, sfx_klose); + else + S_StartSound(player->mo, sfx_kwin); } if (P_IsLocalPlayer(player) && cv_inttime.value > 0) From 10270d20dd046650d6ec21b809771cdca15ddd41 Mon Sep 17 00:00:00 2001 From: Sryder Date: Sat, 9 Jun 2018 00:18:49 +0100 Subject: [PATCH 6/9] HitEm voice line can always play Still starts the timer to at least 3 seconds on other voices though --- src/k_kart.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 5333dbf0..5c75f2bd 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1227,9 +1227,6 @@ static void K_PlayOvertakeSound(mobj_t *source) static void K_PlayHitEmSound(mobj_t *source) { - if (source->player && source->player->kartstuff[k_voices]) // Prevents taunt sounds from playing every time the button is pressed - return; - S_StartSound(source, sfx_hitem); if (source->player) From 0a85e75eb8445cda7ebb448beaf4332f301c5907 Mon Sep 17 00:00:00 2001 From: Sryder Date: Sat, 9 Jun 2018 16:42:03 +0100 Subject: [PATCH 7/9] Accidentally made HitEm sounds always play, even when hitting your own items --- src/k_kart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index a8993b6a..27080423 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1269,7 +1269,8 @@ void K_SpinPlayer(player_t *player, mobj_t *source) || (G_BattleGametype() && ((player->kartstuff[k_balloon] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1))) return; - K_PlayHitEmSound(source); + if (source && source != player->mo && source->player) + K_PlayHitEmSound(source); player->kartstuff[k_mushroomtimer] = 0; player->kartstuff[k_driftboost] = 0; From 82b92d1881b13ef5f966f176993f7d8293b236c2 Mon Sep 17 00:00:00 2001 From: Sryder Date: Sat, 9 Jun 2018 22:25:00 +0100 Subject: [PATCH 8/9] Fix the issue from the merge --- src/hardware/hw_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index ca9c56b1..38f39643 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5329,10 +5329,6 @@ static void HWR_ProjectSprite(mobj_t *thing) z1 = tr_y + x1 * rightsin; z2 = tr_y - x2 * rightsin; - - if (papersprite && max(z1, z2) < ZCLIP_PLANE) - return; - x1 = tr_x + x1 * rightcos; x2 = tr_x - x2 * rightcos; From ea915e5778702dbb86cb88a42c165f45489199a2 Mon Sep 17 00:00:00 2001 From: Sryder Date: Sat, 9 Jun 2018 22:58:03 +0100 Subject: [PATCH 9/9] Fix papersprites more for real this time (Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey) --- src/hardware/hw_main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 72c48756..2f49ed7d 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5248,8 +5248,7 @@ static void HWR_ProjectSprite(mobj_t *thing) I_Error("sprframes NULL for sprite %d\n", thing->sprite); #endif - if (sprframe->rotate != SRF_SINGLE) - ang = R_PointToAngle (thing->x, thing->y) - thing->angle; + ang = R_PointToAngle (thing->x, thing->y) - thing->angle; if (sprframe->rotate == SRF_SINGLE) { @@ -5258,7 +5257,7 @@ static void HWR_ProjectSprite(mobj_t *thing) lumpoff = sprframe->lumpid[0]; //Fab: see note above flip = sprframe->flip; // Will only be 0x00 or 0xFF - if (papersprite && (R_PointToAngle (thing->x, thing->y) - thing->angle < ANGLE_180)) + if (papersprite && ang < ANGLE_180) { if (flip) flip = 0; @@ -5279,6 +5278,14 @@ static void HWR_ProjectSprite(mobj_t *thing) //Fab: lumpid is the index for spritewidth,spriteoffset... tables lumpoff = sprframe->lumpid[rot]; flip = sprframe->flip & (1<skin && ((skin_t *)thing->skin)->flags & SF_HIRES) @@ -5286,16 +5293,8 @@ static void HWR_ProjectSprite(mobj_t *thing) if (papersprite) { - if (flip && sprframe->rotate != SRF_SINGLE) - { - rightsin = FIXED_TO_FLOAT(FINESINE((thing->angle+ANGLE_180)>>ANGLETOFINESHIFT)); - rightcos = FIXED_TO_FLOAT(FINECOSINE((thing->angle+ANGLE_180)>>ANGLETOFINESHIFT)); - } - else - { - rightsin = FIXED_TO_FLOAT(FINESINE((thing->angle)>>ANGLETOFINESHIFT)); - rightcos = FIXED_TO_FLOAT(FINECOSINE((thing->angle)>>ANGLETOFINESHIFT)); - } + rightsin = FIXED_TO_FLOAT(FINESINE((thing->angle)>>ANGLETOFINESHIFT)); + rightcos = FIXED_TO_FLOAT(FINECOSINE((thing->angle)>>ANGLETOFINESHIFT)); } else {