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 'bubble-invincibility-clash' into 'refactor-k-collide'

Browse source 
Clash Bubble Shield blowup with Invincibility etc; bounce players away with Bubble blowup

See merge request KartKrew/Kart!1109
This commit is contained in:
Oni 2023-03-27 22:10:03 +00:00
commit 3463f0e5be
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/k_collide.cpp
View file

@ -735,18 +735,13 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2)
thing = oldthing;
P_SetTarget(&tm.thing, oldtm.thing);*/
if (P_PlayerInPain(t2->player)
|| t2->player->flashing || t2->player->hyudorotimer
|| t2->player->justbumped || K_IsBigger(t2, t1))
if (K_KartBouncing(t2, t1->target) == true)
{
return true;
}
if (t2->player && t1->target && t1->target->player)
{
K_PvPTouchDamage(t2, t1->target);
}
// Player Damage
P_DamageMobj(t2, t1->target, t1, 1, DMG_NORMAL|DMG_WOMBO);
if (t2->player->timeshit > t2->player->timeshitprev)
{
// Don't play from t1 else it gets cut out... for some reason.
S_StartSound(t2, sfx_s3k44);
}
@ -857,7 +852,8 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
return (K_IsBigger(t1, t2) == true)
|| (t1->player->invincibilitytimer > 0)
|| (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD)
|| (t1->player->curshield == KSHIELD_TOP && !K_IsHoldingDownTop(t1->player));
|| (t1->player->curshield == KSHIELD_TOP && !K_IsHoldingDownTop(t1->player))
|| (t1->player->bubbleblowup > 0);
};
if (canClash(t1, t2) && canClash(t2, t1))
@ -905,9 +901,11 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
}
// Flame Shield dash damage
// Bubble Shield blowup damage
auto shouldWipeout = [](mobj_t *t1, mobj_t *t2)
{
return (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD);
return (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD)
|| (t1->player->bubbleblowup > 0);
};
if (forEither(shouldWipeout, doDamage(DMG_WIPEOUT | DMG_WOMBO)))