From 5b39142661dec1346595ebc54f07e28857e1aca7 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Tue, 6 Jun 2023 20:18:01 -0700 Subject: [PATCH] Instawhip start of race cooldown --- src/k_kart.c | 11 +++++++++-- src/k_kart.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 58e437b4d..491096f63 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7936,9 +7936,16 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->gateBoost) player->gateBoost--; - if (player->rings > 0) + if (leveltime < starttime) { - player->instaShieldCooldown = INSTAWHIP_COOLDOWN; + player->instaShieldCooldown = INSTAWHIP_STARTOFRACE; + } + else if (player->rings > 0) + { + if (player->instaShieldCooldown > INSTAWHIP_COOLDOWN) + player->instaShieldCooldown--; + else + player->instaShieldCooldown = INSTAWHIP_COOLDOWN; } else { diff --git a/src/k_kart.h b/src/k_kart.h index f8f264409..98e97899d 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -33,6 +33,7 @@ Make sure this matches the actual number of states #define SHRINK_PHYSICS_SCALE (3*FRACUNIT/4) #define INSTAWHIP_COOLDOWN (TICRATE*2) +#define INSTAWHIP_STARTOFRACE (255) #define INSTAWHIP_DROPGUARD (12) #define GUARDBREAK_COOLDOWN (TICRATE*4)