Merge branch 'wavedash-lock-conveyance' into 'master'

Wavedash lock conveyance

See merge request KartKrew/Kart!2149
This commit is contained in:
Gunla 2024-03-23 01:43:18 +00:00
commit 7a2cda0ef9

View file

@ -4521,6 +4521,9 @@ void K_UpdateWavedashIndicator(player_t *player)
mobj->renderflags &= ~RF_TRANSMASK;
mobj->renderflags |= RF_PAPERSPRITE;
if (player->wavedash < MIN_WAVEDASH_CHARGE)
mobj->renderflags |= RF_TRANS50;
if (K_IsLosingWavedash(player))
{
// Decay timer's ticking
@ -10802,7 +10805,13 @@ static void K_KartDrift(player_t *player, boolean onground)
if (!extendedSliptide && K_IsLosingWavedash(player) && player->wavedash > 0)
{
if (player->wavedash > HIDEWAVEDASHCHARGE && !S_SoundPlaying(player->mo, sfx_waved2))
S_StartSoundAtVolume(player->mo, sfx_waved2, 255); // Losing combo time, going to boost
S_StartSoundAtVolume(player->mo, sfx_waved2,
Easing_InSine(
min(FRACUNIT, FRACUNIT * player->wavedash / MIN_WAVEDASH_CHARGE),
120,
255
)
); // Losing combo time, going to boost
S_StopSoundByID(player->mo, sfx_waved1);
S_StopSoundByID(player->mo, sfx_waved4);
player->wavedashdelay++;