From e1b35eeb32249fe2ffd7080f46ba01d7a6d80db6 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 27 Mar 2024 14:50:05 -0700 Subject: [PATCH 1/3] Eggbox transfer fixups --- src/k_kart.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 845a309bc..dea0eb78e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9484,6 +9484,20 @@ void K_KartResetPlayerColor(player_t *player) } } + if (player->eggmanTransferDelay) + { + player->mo->colorized = true; + if (player->eggmanTransferDelay % 2) + { + player->mo->color = SKINCOLOR_BLACK; + } + else + { + player->mo->color = SKINCOLOR_CRIMSON; + } + goto finalise; + } + if (player->ringboost && (leveltime & 1)) // ring boosting { player->mo->colorized = true; @@ -13801,10 +13815,12 @@ void K_EggmanTransfer(player_t *source, player_t *victim) { if (victim->eggmanTransferDelay) return; + if (source->eggmanTransferDelay) + return; if (victim->eggmanexplode) return; - K_AddHitLag(victim->mo, 2, true); + K_AddHitLag(victim->mo, 5, false); K_DropItems(victim); victim->eggmanexplode = 6*TICRATE; victim->eggmanblame = (source - players); @@ -13813,11 +13829,13 @@ void K_EggmanTransfer(player_t *source, player_t *victim) if (P_IsDisplayPlayer(victim)) S_StartSound(NULL, sfx_itrole); - K_AddHitLag(source->mo, 2, true); + K_AddHitLag(source->mo, 5, false); source->eggmanexplode = 0; source->eggmanblame = -1; K_StopRoulette(&source->itemRoulette); + source->eggmanTransferDelay = 10; + victim->eggmanTransferDelay = 10; S_StopSoundByID(source->mo, sfx_s3k53); S_StopSoundByID(source->mo, sfx_kc51); From 6b79084a1405ba360f3601fc7bcfe5e89a739cf8 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 27 Mar 2024 14:54:07 -0700 Subject: [PATCH 2/3] Increase source transfer delay --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index dea0eb78e..bf3f23f7f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -13834,7 +13834,7 @@ void K_EggmanTransfer(player_t *source, player_t *victim) source->eggmanblame = -1; K_StopRoulette(&source->itemRoulette); - source->eggmanTransferDelay = 10; + source->eggmanTransferDelay = 20; victim->eggmanTransferDelay = 10; S_StopSoundByID(source->mo, sfx_s3k53); From 9fe34b3ef5d06e51dc1a1e3559c82118c496de35 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 27 Mar 2024 14:59:37 -0700 Subject: [PATCH 3/3] Increase eggbox transfer delay again --- src/k_kart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index bf3f23f7f..cbe734a48 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -13834,8 +13834,8 @@ void K_EggmanTransfer(player_t *source, player_t *victim) source->eggmanblame = -1; K_StopRoulette(&source->itemRoulette); - source->eggmanTransferDelay = 20; - victim->eggmanTransferDelay = 10; + source->eggmanTransferDelay = 25; + victim->eggmanTransferDelay = 15; S_StopSoundByID(source->mo, sfx_s3k53); S_StopSoundByID(source->mo, sfx_kc51);