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

Merge branch 'inert-wumbo' into 'master'

Browse source 
Sakura protection (NEO damage rules)

Closes #1553

See merge request kart-krew-dev/ring-racers-internal!2637
This commit is contained in:
Oni VelocitOni 2025-06-26 23:06:04 +00:00
commit bb3c99cff9
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_inter.c
View file

@ -3191,6 +3191,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
} }
} }
if (inflictor && !P_MobjWasRemoved(inflictor) && inflictor->momx == 0 && inflictor->momy == 0 && inflictor->momz == 0)
{
// Probably a map hazard.
allowcombo = false;
}
if (allowcombo == false && (target->eflags & MFE_PAUSED)) if (allowcombo == false && (target->eflags & MFE_PAUSED))
{ {
return false; return false;
@ -3405,18 +3411,22 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
K_PopPlayerShield(player); K_PopPlayerShield(player);
} }
if (!(gametyperules & GTR_SPHERES) && player->tripwireLeniency) boolean downgraded = false;
if (!(gametyperules & GTR_SPHERES) && player->tripwireLeniency && !P_PlayerInPain(player))
{ {
switch (type) switch (type)
{ {
case DMG_EXPLODE: case DMG_EXPLODE:
type = DMG_TUMBLE; type = DMG_TUMBLE;
downgraded = true;
break; break;
case DMG_TUMBLE: case DMG_TUMBLE:
softenTumble = true; softenTumble = true;
break; break;
case DMG_NORMAL: case DMG_NORMAL:
case DMG_WIPEOUT: case DMG_WIPEOUT:
downgraded = true;
type = DMG_STUMBLE; type = DMG_STUMBLE;
player->ringburst += 5; // THERE IS SIMPLY NO HOPE AT THIS POINT player->ringburst += 5; // THERE IS SIMPLY NO HOPE AT THIS POINT
K_PopPlayerShield(player); K_PopPlayerShield(player);
@ -3463,7 +3473,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
ringburst = 0; ringburst = 0;
} }
if (type != DMG_STUMBLE && type != DMG_WHUMBLE) if ((type != DMG_STUMBLE && type != DMG_WHUMBLE) || (type == DMG_STUMBLE && downgraded))
{ {
if (type != DMG_STING) if (type != DMG_STING)
player->flashing = K_GetKartFlashing(player); player->flashing = K_GetKartFlashing(player);