From a9993e49b217209ca1c15ea1575d786f48c8d798 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 24 Aug 2024 00:49:22 -0700 Subject: [PATCH 1/3] Don't defang dropped banana chains --- src/p_inter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index 94df7bdf2..05492041b 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3300,7 +3300,8 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da type = DMG_STUMBLE; } - if (inflictor && !P_MobjWasRemoved(inflictor) && P_IsKartItem(inflictor->type) && inflictor->cvmem) + if (inflictor && !P_MobjWasRemoved(inflictor) && P_IsKartItem(inflictor->type) && inflictor->cvmem + && inflictor->type != MT_BANANA) // Are there other designed trap items that can be deployed and dropped? If you add one, list it here! { type = DMG_STUMBLE; player->ringburst += 5; // IT'S THE DAMAGE STUMBLE HACK AGAIN AAAAAAAAHHHHHHHHHHH From 0185c4fd108ab151b89079b966f883d8d2409d5f Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 24 Aug 2024 04:11:10 -0700 Subject: [PATCH 2/3] Stsrip shields on backshot stumble demotion --- src/p_inter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_inter.c b/src/p_inter.c index 05492041b..598487390 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3305,6 +3305,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da { type = DMG_STUMBLE; player->ringburst += 5; // IT'S THE DAMAGE STUMBLE HACK AGAIN AAAAAAAAHHHHHHHHHHH + K_PopPlayerShield(player); } switch (type) From 1a4cb0c2df38617961ce4ebda474f0e7d2d92eae Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 24 Aug 2024 16:31:47 -0700 Subject: [PATCH 3/3] Fix droptarget amps --- 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 c5cef9e7f..423a7d2d1 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -695,9 +695,9 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2) S_StartSound(t2, sfx_kdtrg1); } - if (t1->tracer && t1->tracer->player && t1->player && t1->player != t1->tracer->player) + if (t1->tracer && t1->tracer->player && t2->player && t2->player != t1->tracer->player) { - K_SpawnAmps(t1->tracer->player, K_PvPAmpReward(20, t1->tracer->player, t1->player), t1); + K_SpawnAmps(t1->tracer->player, K_PvPAmpReward(20, t1->tracer->player, t2->player), t1); } if (draggeddroptarget && !P_MobjWasRemoved(draggeddroptarget) && draggeddroptarget->player)