From dd71c81b246c05f30cf0919bd9f56f9c6c25df7c Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sat, 6 Jan 2024 01:56:27 -0700 Subject: [PATCH] Battle: reduce damage hitlag + monitor hitlag --- src/objects/monitor.c | 2 +- src/p_inter.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/objects/monitor.c b/src/objects/monitor.c index 2a78dc586..86a4d0d71 100644 --- a/src/objects/monitor.c +++ b/src/objects/monitor.c @@ -664,7 +664,7 @@ Obj_MonitorOnDamage monitor_rammingspeed(monitor) = inflictor ? FixedDiv(FixedHypot(inflictor->momx, inflictor->momy), 4 * inflictor->radius) : 0; monitor->hitlag = - 6 * get_damage_multiplier(monitor) / FRACUNIT; + 3 * get_damage_multiplier(monitor) / FRACUNIT; } void diff --git a/src/p_inter.c b/src/p_inter.c index 48ea0c4e2..dcbbf795b 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3411,6 +3411,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (source && source->player && target) G_GhostAddHit((INT32) (source->player - players), target); + if ((gametyperules & GTR_BUMPERS) && !battleprisons) + laglength /= 2; + K_SetHitLagForObjects(target, inflictor, source, laglength, true); target->flags2 |= MF2_ALREADYHIT;