From 725882ab761bdd51834d23868d001a91bf741265 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 18 Oct 2025 06:12:22 -0400 Subject: [PATCH 1/2] No bailing Eggmark, 30% speed -> 45% --- src/k_kart.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index f36094d72..d8e24c5d7 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3963,7 +3963,7 @@ static void K_GetKartBoostPower(player_t *player) if (player->eggmanexplode) // Ready-to-explode { - ADDBOOST(6*FRACUNIT/20, FRACUNIT, 0); // + 30% top speed, + 100% acceleration, +0% handling + ADDBOOST(9*FRACUNIT/20, FRACUNIT, 0); // + 45% top speed, + 100% acceleration, +0% handling } if (player->vortexBoost) // Holding wavedash vortex (assigned in K_UpdateWavedashIndicator!) @@ -10980,6 +10980,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) P_StartQuakeFromMobj(7, 50 * player->mo->scale, 2048 * player->mo->scale, player->mo); player->bailhitlag = false; + + /* + if (player->markedfordeath) + P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL); + */ } if ((!P_PlayerInPain(player) && player->bailcharge >= 5) || player->bailcharge >= BAIL_MAXCHARGE) @@ -10989,6 +10994,13 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->itemRoulette.active) { + if (player->itemRoulette.eggman) + { + player->markedfordeath = true; + player->eggmanexplode = 1; + player->rings = -20; + } + player->itemRoulette.active = false; } From c224b386855cfbb5e4f9589d361eb26ceee0dc42 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 18 Oct 2025 18:22:52 -0400 Subject: [PATCH 2/2] Instaexplode bail if eggmark is rolling OR counting --- src/k_kart.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index d8e24c5d7..b31c881dc 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10992,15 +10992,15 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) mobj_t *bail = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_BAIL); P_SetTarget(&bail->target, player->mo); + if (player->itemRoulette.eggman || player->eggmanexplode) + { + player->markedfordeath = true; + player->eggmanexplode = 1; + player->rings = -20; + } + if (player->itemRoulette.active) { - if (player->itemRoulette.eggman) - { - player->markedfordeath = true; - player->eggmanexplode = 1; - player->rings = -20; - } - player->itemRoulette.active = false; }