From 628d9cd1271e7e2fd0d5e119782ebda64da2fbbb Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Tue, 27 May 2025 20:46:37 -0400 Subject: [PATCH 1/2] Height check Lightning Shield attack --- src/k_collide.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index 4e1a3451b..0cc1d2cc9 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -777,6 +777,12 @@ static inline BlockItReturn_t PIT_LightningShieldAttack(mobj_t *thing) return BMIT_CONTINUE; } + // see if it went over / under + if (lightningSource->z > thing->z + thing->height) + return BMIT_CONTINUE; // overhead + if (lightningSource->z + lightningSource->height < thing->z) + return BMIT_CONTINUE; // underneath + #if 0 if (P_CheckSight(lightningSource, thing) == false) { From 7ea9945769238ac406839881aa82dcf08b3e4650 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Tue, 27 May 2025 21:39:25 -0400 Subject: [PATCH 2/2] Cubic Lightning --- src/k_collide.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index 0cc1d2cc9..4abe3f269 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -778,9 +778,9 @@ static inline BlockItReturn_t PIT_LightningShieldAttack(mobj_t *thing) } // see if it went over / under - if (lightningSource->z > thing->z + thing->height) + if (lightningSource->z - lightningDist > thing->z + thing->height) return BMIT_CONTINUE; // overhead - if (lightningSource->z + lightningSource->height < thing->z) + if (lightningSource->z + lightningSource->height + lightningDist < thing->z) return BMIT_CONTINUE; // underneath #if 0