From 4a2e5d368a4aef874a6ca6825949d96d18ac92a0 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 21 Mar 2024 18:19:11 -0700 Subject: [PATCH 1/2] Fully charged wavedash conveyance --- src/k_kart.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index f258fb334..53131bd3e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -4519,6 +4519,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 From e7b71661dbaa98539ada6002122ea664bf703f19 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 21 Mar 2024 18:22:54 -0700 Subject: [PATCH 2/2] Lower volume of non fully charged wavedash drain --- src/k_kart.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 53131bd3e..e97417009 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10803,7 +10803,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++;