From 57e03e8a80c950b2c010132fa875cb988ef3abd3 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 17 May 2023 14:28:46 -0700 Subject: [PATCH] Instawhip monitor hack: one contact per whip --- src/k_collide.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index fa0a8ce14..60a4d02b5 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -814,6 +814,15 @@ boolean K_InstaWhipCollide(mobj_t *t1, mobj_t *t2) || t2->type == MT_GARDENTOP || t2->type == MT_DROPTARGET || t2->type == MT_BATTLECAPSULE || t2->type == MT_MONITOR) { + // Monitor hack. We can hit monitors once per instawhip, no multihit shredding! + // Damage values in Obj_MonitorGetDamage. + if (t2->type == MT_MONITOR) + { + if (t1->extravalue1 != 1) + return false; + t1->extravalue1 = 1; + } + P_DamageMobj(t2, t1, t1, 1, DMG_NORMAL); K_AddHitLag(t1->target, attackerHitlag, false); t1->hitlag = t1->target->hitlag;