From 10cfc739477ca57d395d3684253398cf49556fea Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 5 Jan 2022 03:46:19 -0500 Subject: [PATCH] Less Karma Bomb CBT - Karma delay is 3sec instead of 10sec - Karma delay is only used for initially changing into a bomb --- src/g_game.c | 2 +- src/k_kart.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index ae0c2036b..6d0620701 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -260,7 +260,7 @@ INT32 stealtime = TICRATE/2; INT32 sneakertime = TICRATE + (TICRATE/3); INT32 itemtime = 8*TICRATE; INT32 bubbletime = TICRATE/2; -INT32 comebacktime = 10*TICRATE; +INT32 comebacktime = 3*TICRATE; INT32 bumptime = 6; INT32 greasetics = 3*TICRATE; INT32 wipeoutslowtime = 20; diff --git a/src/k_kart.c b/src/k_kart.c index 8a1f02451..bd6924e12 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3481,13 +3481,14 @@ void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers) karmahitbox->destscale = player->mo->destscale; P_SetScale(karmahitbox, player->mo->scale); + player->karmadelay = comebacktime; + if (netgame) { CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]); } } - player->karmadelay = comebacktime; K_CalculateBattleWanted(); K_CheckBumpers(); }