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

Add DMG_WOMBO to all player contact damage

Browse source
This commit is contained in:
SinnamonLat 2022-01-23 17:52:31 +01:00
parent 2bc6a72c56
commit d55e23d767
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
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); P_DamageMobj(t2, t1, t1, 1, DMG_TUMBLE|DMG_WOMBO);
return true; return true;
} }
else if (t1Condition == false && t2Condition == true) else if (t1Condition == false && t2Condition == true)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE); P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE|DMG_WOMBO);
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); P_DamageMobj(t2, t1, t1, 1, DMG_TUMBLE|DMG_WOMBO);
return true; return true;
} }
else if (t1Condition == false && t2Condition == true) else if (t1Condition == false && t2Condition == true)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE); P_DamageMobj(t1, t2, t2, 1, DMG_TUMBLE|DMG_WOMBO);
return true; return true;
} }
@ -522,12 +522,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_WIPEOUT); P_DamageMobj(t2, t1, t1, 1, DMG_WIPEOUT|DMG_WOMBO);
return true; return true;
} }
else if (t1Condition == false && t2Condition == true) else if (t1Condition == false && t2Condition == true)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT); P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT|DMG_WOMBO);
return true; return true;
} }
@ -540,12 +540,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_WIPEOUT|DMG_STEAL); P_DamageMobj(t2, t1, t1, 1, DMG_WIPEOUT|DMG_STEAL|DMG_WOMBO);
return true; return true;
} }
else if (t1Condition == false && t2Condition == true) else if (t1Condition == false && t2Condition == true)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT|DMG_STEAL); P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT|DMG_STEAL|DMG_WOMBO);
return true; return true;
} }
} }
@ -558,7 +558,7 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
{ {
if (t2->player->rings <= 0) if (t2->player->rings <= 0)
{ {
P_DamageMobj(t2, t1, t1, 1, DMG_STING); P_DamageMobj(t2, t1, t1, 1, DMG_STING|DMG_WOMBO);
stungT2 = true; stungT2 = true;
} }
@ -569,7 +569,7 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
{ {
if (t1->player->rings <= 0) if (t1->player->rings <= 0)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_STING); P_DamageMobj(t1, t2, t2, 1, DMG_STING|DMG_WOMBO);
stungT1 = true; stungT1 = true;
} }