thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'egg-roulette-transfer' into 'master'

Browse source 
Start egg roulette when transferring to player with egg roulette

Closes #1437

See merge request kart-krew-dev/ring-racers-internal!2570
This commit is contained in:
Oni VelocitOni 2025-05-24 19:10:35 +00:00
commit c961d2a497
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/k_kart.c
View file

@ -15265,8 +15265,17 @@ void K_EggmanTransfer(player_t *source, player_t *victim)
if (victim->eggmanexplode) if (victim->eggmanexplode)
return; return;
boolean prank = false;
if (victim->itemRoulette.eggman)
{
K_StopRoulette(&source->itemRoulette);
prank = true; // Give the transferring player the victim's eggbox roulette?!
}
K_AddHitLag(victim->mo, 5, false); 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);
K_StopRoulette(&victim->itemRoulette); K_StopRoulette(&victim->itemRoulette);
@ -15275,9 +15284,20 @@ void K_EggmanTransfer(player_t *source, player_t *victim)
S_StartSound(NULL, sfx_itrole); S_StartSound(NULL, sfx_itrole);
K_AddHitLag(source->mo, 5, false); K_AddHitLag(source->mo, 5, false);
if (prank)
{
source->eggmanexplode = 0;
source->eggmanblame = (victim - players);
K_StartEggmanRoulette(source);
S_StartSound(source->mo, sfx_s223);
}
else
{
source->eggmanexplode = 0; source->eggmanexplode = 0;
source->eggmanblame = -1; source->eggmanblame = -1;
K_StopRoulette(&source->itemRoulette); K_StopRoulette(&source->itemRoulette);
}
source->eggmanTransferDelay = 25; source->eggmanTransferDelay = 25;
victim->eggmanTransferDelay = 15; victim->eggmanTransferDelay = 15;