From 13fb905190642d4c5c972d53382b7aa0fab132e8 Mon Sep 17 00:00:00 2001 From: SinnamonLat Date: Sun, 23 Jan 2022 17:58:08 +0100 Subject: [PATCH] Let ThunderShield combo players --- src/p_user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_user.c b/src/p_user.c index 70fb23a08..e8e36f2ae 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2464,8 +2464,10 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius) indirectitemcooldown = 0; } - if (mo->flags & MF_BOSS || mo->type == MT_PLAYER) //don't OHKO bosses nor players! + if (mo->flags & MF_BOSS) //don't OHKO bosses nor players! P_DamageMobj(mo, inflictor, source, 1, DMG_NORMAL|DMG_CANTHURTSELF); + else if (mo->type == MT_PLAYER) // Thunder shield: Combo players. + P_DamageMobj(mo, inflictor, source, 1, DMG_NORMAL|DMG_CANTHURTSELF|DMG_WOMBO); else P_DamageMobj(mo, inflictor, source, 1000, DMG_NORMAL|DMG_CANTHURTSELF); }