thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'panel-trip-nerf-sneaker-buff' into 'master'

Browse source 
Hitting a sneaker panel will now grant an item sneaker boost (instead of panel...

See merge request kart-krew-dev/ring-racers-internal!2519
This commit is contained in:
Oni VelocitOni 2025-05-02 02:38:01 +00:00
commit 7fa79fa64a
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/k_kart.c
View file

@ -3034,8 +3034,7 @@ tripwirepass_t K_TripwirePassConditions(const player_t *player)
{ {
if ( if (
player->invincibilitytimer || player->invincibilitytimer ||
player->sneakertimer || player->sneakertimer
player->panelsneakertimer
) )
return TRIPWIRE_BLASTER; return TRIPWIRE_BLASTER;
@ -7059,14 +7058,21 @@ void K_DoSneaker(player_t *player, INT32 type)
{ {
fixed_t intendedboost = FRACUNIT/2; fixed_t intendedboost = FRACUNIT/2;
// If you've already got an item sneaker type boost, panel sneakers will instead turn into item sneaker boosts
if (player->numsneakers && type == 0)
{
type = 1;
}
switch (type) switch (type)
{ {
case 0: // Panel sneaker case 0: // Panel sneaker
intendedboost = FRACUNIT/2; intendedboost = FRACUNIT/2;
break; break;
case 1: // Single item sneaker case 1: // Single item sneaker
case 2: // ROcket sneaker case 2: // Rocket sneaker
intendedboost = FRACUNIT; intendedboost = 85*FRACUNIT/100;
break; break;
} }
@ -7140,22 +7146,19 @@ void K_DoSneaker(player_t *player, INT32 type)
} }
} }
switch (type) switch (type)
{ {
case 0: case 0:
player->panelsneakertimer = sneakertime; player->panelsneakertimer = sneakertime;
player->overshield += 1; // TEMP prototype player->overshield += 1;
break; break;
case 1: case 1:
player->sneakertimer = sneakertime; player->sneakertimer = sneakertime;
player->overshield += TICRATE/2; // TEMP prototype player->overshield += TICRATE/2;
break; break;
case 2: case 2:
player->sneakertimer = 3*sneakertime/4; player->sneakertimer = 3*sneakertime/4;
player->overshield += TICRATE/2; // TEMP prototype player->overshield += TICRATE/2;
break; break;
} }