From d9a5bee6a213cae531ee6cf5111e71bd94a8d873 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Wed, 27 Aug 2025 00:18:49 -0400 Subject: [PATCH] Don't get HyuGrow squish people The other power items (invin and flame) have a visual so you can try avoding the damage, grow does not making it unfair --- src/k_collide.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index 946d441bb..b61c8b395 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -679,6 +679,8 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) { const boolean flameT1 = ((t1->player->flamestore > 0) && (t1->player->flametimer > 0)); const boolean flameT2 = ((t2->player->flamestore > 0) && (t2->player->flametimer > 0)); + const boolean hyudoroT1 = (t1->player->hyudorotimer > 0); + const boolean hyudoroT2 = (t2->player->hyudorotimer > 0); boolean t1Condition = false; boolean t2Condition = false; @@ -719,12 +721,14 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) } else if (t1Condition == true && t2Condition == false) { - P_DamageMobj(t2, t1, t1, 1, DMG_SQUISH); + if (!hyudoroT1) + P_DamageMobj(t2, t1, t1, 1, DMG_SQUISH); return true; } else if (t1Condition == false && t2Condition == true) { - P_DamageMobj(t1, t2, t2, 1, DMG_SQUISH); + if (!hyudoroT2) + P_DamageMobj(t1, t2, t2, 1, DMG_SQUISH); return true; }