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

Instawhip: Damage sourcing and consistency fixes

Browse source
This commit is contained in:
AJ Martinez 2023-05-18 16:17:52 -07:00
parent 57e03e8a80
commit 1b16b3f777
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_collide.cpp
View file

@ -796,9 +796,12 @@ boolean K_InstaWhipCollide(mobj_t *t1, mobj_t *t2)
{
if (t2 != t1->target && !P_PlayerInPain(t2->player) && t2->player->flashing == 0)
{
// Damage is a bit hacky, we want only a small loss-of-control
// while still behaving as if it's a "real" hit.
P_PlayRinglossSound(t2);
P_PlayerRingBurst(t2->player, 5);
P_DamageMobj(t2, t1, t1, 1, DMG_STUMBLE);
P_DamageMobj(t2, t1, t1->target, 1, DMG_STUMBLE);
K_AddHitLag(t2, defenderHitlag, true);
K_AddHitLag(t1->target, attackerHitlag, false);
t1->hitlag = t1->target->hitlag;
@ -818,12 +821,12 @@ boolean K_InstaWhipCollide(mobj_t *t1, mobj_t *t2)
// Damage values in Obj_MonitorGetDamage.
if (t2->type == MT_MONITOR)
{
if (t1->extravalue1 != 1)
if (t1->extravalue1 == 1)
return false;
t1->extravalue1 = 1;
}
P_DamageMobj(t2, t1, t1, 1, DMG_NORMAL);
P_DamageMobj(t2, t1, t1->target, 1, DMG_NORMAL);
K_AddHitLag(t1->target, attackerHitlag, false);
t1->hitlag = t1->target->hitlag;
}

4
src/p_inter.c
View file

@ -2306,7 +2306,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
damage = 0;
}
if (type == DMG_STING || type == DMG_STUMBLE)
// Instawhip breaks the rules and does "damaging stumble",
// but sting and stumble shouldn't be rewarding Battle hits otherwise.
if ((type == DMG_STING || type == DMG_STUMBLE) && inflictor->type != MT_INSTAWHIP )
{
damage = 0;
}