From dad09dc86f1aa17a7bb367e679eda0d2dc2e1415 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 14 Jan 2024 23:07:40 -0700 Subject: [PATCH] Don't attempt to stumble invinc/grow players (someone get a fire extinguisher) --- src/objects/orbinaut.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/objects/orbinaut.c b/src/objects/orbinaut.c index e6dff18f5..4b1792b10 100644 --- a/src/objects/orbinaut.c +++ b/src/objects/orbinaut.c @@ -212,14 +212,15 @@ boolean Obj_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2) else { // Player Damage - if (t1->type == MT_ORBINAUT_SHIELD || t1->type == MT_JAWZ_SHIELD) + if ((t1->type == MT_ORBINAUT_SHIELD || t1->type == MT_JAWZ_SHIELD) + && !t2->player->invincibilitytimer && !K_IsBigger(t1, t2)) // UGH. Stumble ignores invinc. Fix this damage type someday. { // Same hack as Instawhip! // If you do this a third time, please make it a part of the damage system. // ^ remove all of P_DamageMobj and start over P_PlayRinglossSound(t2); P_PlayerRingBurst(t2->player, 5); - P_DamageMobj(t2, t1, t1->target, 1, DMG_WOMBO | DMG_WHUMBLE); + P_DamageMobj(t2, t1, t1->target, 1, DMG_WOMBO | DMG_STUMBLE); } else {