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

* Instead of checking for a player moving up, check for a player moving up that's only JUST been tumbled.

Browse source 
* Remove the DMG_WOMBO flag from PVP touch damage tumbles as that was restricting tumble combos in this branch, not allowing it.
This commit is contained in:
toaster 2022-02-08 21:38:24 +00:00
parent ef7655d2e8
commit c3e9eceda2
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_collide.c
View file

@ -492,12 +492,12 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
if (t1Condition == true && t2Condition == false) if (t1Condition == true && t2Condition == false)
{ {
P_DamageMobj(t2, t1, t1, 1, DMG_TUMBLE|DMG_WOMBO); P_DamageMobj(t2, t1, t1, 1, DMG_TUMBLE);
return true; return true;
} }
else if (t1Condition == false && t2Condition == true) else if (t1Condition == false && t2Condition == true)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE|DMG_WOMBO); P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE);
return true; return true;
} }
@ -507,12 +507,12 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
if (t1Condition == true && t2Condition == false) if (t1Condition == true && t2Condition == false)
{ {
P_DamageMobj(t2, t1, t1, 1, DMG_TUMBLE|DMG_WOMBO); P_DamageMobj(t2, t1, t1, 1, DMG_TUMBLE);
return true; return true;
} }
else if (t1Condition == false && t2Condition == true) else if (t1Condition == false && t2Condition == true)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE|DMG_WOMBO); P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE);
return true; return true;
} }

10
src/p_inter.c
View file

@ -1931,9 +1931,13 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
// Check if we should allow wombo combos (hard hits by default, inverted by the presence of DMG_WOMBO). // Check if we should allow wombo combos (hard hits by default, inverted by the presence of DMG_WOMBO).
boolean allowcombo = (hardhit == !(damagetype & DMG_WOMBO)); boolean allowcombo = (hardhit == !(damagetype & DMG_WOMBO));
// NEVER allow DMG_TUMBLE stacking if you're moving upwards (relative to gravity). // Tumble is a special case.
if ((type == DMG_TUMBLE) && (P_MobjFlip(target)*target->momz > 0)) if ((type == DMG_TUMBLE)
allowcombo = false; {
// don't allow constant combo
if (player->tumbleBounces == 1 && (P_MobjFlip(target)*target->momz > 0)
allowcombo = false;
}
if ((target->hitlag == 0 || allowcombo == false) && player->flashing > 0) if ((target->hitlag == 0 || allowcombo == false) && player->flashing > 0)
{ {