thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-09 12:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'last-sealed-tweak' into 'master'

Browse source 
UFO Catcher Tripwire Boost damage, and slow down the player less after hitting it with a boost while waterskiing

Closes #619

See merge request KartKrew/Kart!2074
This commit is contained in:
Gunla 2024-03-10 18:14:13 +00:00
commit 30685b650f
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/objects/ufo.c
View file

@ -996,7 +996,7 @@ void Obj_PlayerUFOCollide(mobj_t *ufo, mobj_t *other)
return; // We were just hit!
}
if ((other->player->sneakertimer > 0)
if (other->player->tripwirePass >= TRIPWIRE_BOOST
&& !P_PlayerInPain(other->player)
&& (other->player->flashing == 0))
{
@ -1004,6 +1004,30 @@ void Obj_PlayerUFOCollide(mobj_t *ufo, mobj_t *other)
Obj_SpecialUFODamage(ufo, other, other, DMG_STEAL);
other->player->sneakertimer = 0;
other->player->numsneakers = 0;
// Copied from Obj_OrbinautThrown
const ffloor_t *rover = P_IsObjectFlipped(other) ? other->ceilingrover : other->floorrover;
if (rover && (rover->fofflags & FOF_SWIMMABLE))
{
// Player is waterskiing so use different math to
// reduce their speed some but keep them skiing
// at high speeds.
fixed_t linear = K_GetKartSpeed(other->player, false, false) / 2;
if ((other->player->speed - linear) < other->player->speed / 4)
{
other->momx /= 4;
other->momy /= 4;
}
else
{
angle_t mom = R_PointToAngle2(0, 0, other->momx, other->momy);
P_Thrust(other, mom, -linear);
}
}
else
{
K_KartBouncing(other, ufo);
}
}
else
{
@ -1015,9 +1039,9 @@ void Obj_PlayerUFOCollide(mobj_t *ufo, mobj_t *other)
// in front
K_StumblePlayer(other->player);
}
}
K_KartBouncing(other, ufo);
K_KartBouncing(other, ufo);
}
}
boolean Obj_UFOEmeraldCollect(mobj_t *ufo, mobj_t *toucher)