thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-04 16:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'eggman-transfer-conveyance' into 'master'

Browse source 
Eggbox transfer fixups

See merge request KartKrew/Kart!2181
This commit is contained in:
Oni 2024-03-28 02:07:37 +00:00
commit 759422a425
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/k_kart.c
View file

@ -9513,6 +9513,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 if (player->ringboost && (leveltime & 1)) // ring boosting
{ {
player->mo->colorized = true; player->mo->colorized = true;
@ -13830,10 +13844,12 @@ void K_EggmanTransfer(player_t *source, player_t *victim)
{ {
if (victim->eggmanTransferDelay) if (victim->eggmanTransferDelay)
return; return;
if (source->eggmanTransferDelay)
return;
if (victim->eggmanexplode) if (victim->eggmanexplode)
return; return;
K_AddHitLag(victim->mo, 2, true); K_AddHitLag(victim->mo, 5, false);
K_DropItems(victim); K_DropItems(victim);
victim->eggmanexplode = 6*TICRATE; victim->eggmanexplode = 6*TICRATE;
victim->eggmanblame = (source - players); victim->eggmanblame = (source - players);
@ -13842,11 +13858,13 @@ void K_EggmanTransfer(player_t *source, player_t *victim)
if (P_IsDisplayPlayer(victim)) if (P_IsDisplayPlayer(victim))
S_StartSound(NULL, sfx_itrole); S_StartSound(NULL, sfx_itrole);
K_AddHitLag(source->mo, 2, true); K_AddHitLag(source->mo, 5, false);
source->eggmanexplode = 0; source->eggmanexplode = 0;
source->eggmanblame = -1; source->eggmanblame = -1;
K_StopRoulette(&source->itemRoulette); K_StopRoulette(&source->itemRoulette);
source->eggmanTransferDelay = 10;
source->eggmanTransferDelay = 25;
victim->eggmanTransferDelay = 15;
S_StopSoundByID(source->mo, sfx_s3k53); S_StopSoundByID(source->mo, sfx_s3k53);
S_StopSoundByID(source->mo, sfx_kc51); S_StopSoundByID(source->mo, sfx_kc51);