From 8b5cb72b18d33a5cc6f86eff5fa41ac13f430a81 Mon Sep 17 00:00:00 2001 From: VelocitOni Date: Mon, 1 Sep 2025 03:47:54 -0400 Subject: [PATCH 1/2] Bubble Shield Trap gives amps Bubble Shield trap should give amps now! --- src/p_inter.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/p_inter.c b/src/p_inter.c index 8151a2c2d..da693ce11 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -697,6 +697,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (K_TryPickMeUp(special, toucher, false)) return; + if (special->target && !P_MobjWasRemoved(special->target) && toucher->player) + { + K_SpawnAmps(special->target->player, K_PvPAmpReward(20, special->target->player, toucher->player), toucher); + } + // attach to player! P_SetTarget(&special->tracer, toucher); toucher->flags |= MF_NOGRAVITY; From edf98ba7fcb44a95c550c1786a5bda24800de17f Mon Sep 17 00:00:00 2001 From: VelocitOni Date: Mon, 1 Sep 2025 21:33:58 -0400 Subject: [PATCH 2/2] Condition gaurd for trapping yourself No longer able to amp up yourself --- src/p_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index da693ce11..802ccb6c6 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -697,7 +697,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) if (K_TryPickMeUp(special, toucher, false)) return; - if (special->target && !P_MobjWasRemoved(special->target) && toucher->player) + if (special->target && !P_MobjWasRemoved(special->target) && toucher->player && (toucher->player != (special->target->player))) // Last condition here is so you can't get your own amps { K_SpawnAmps(special->target->player, K_PvPAmpReward(20, special->target->player, toucher->player), toucher); }