From 915f00b286aae45952be99f8657162023a3451b6 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sun, 3 May 2026 16:49:04 -0400 Subject: [PATCH] Let attraction shield steal bumpers --- src/k_collide.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index a02467a19..bc1cd7afc 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -1248,11 +1248,21 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) t2Condition = (t2->player->attractionattack && t2->player->attractionattack_hipower && (K_GetShieldFromPlayer(t1->player) != KSHIELD_BUBBLE)); if (t1Condition == true && t2Condition == false) { - return P_DamageMobj(t2, t1, t1, 1, DMG_FLIPOVER); + UINT8 damage = DMG_FLIPOVER; + + if (gametypes[gametype]->rules & GTR_BUMPERS) + damage |= DMG_STEAL; + + return P_DamageMobj(t2, t1, t1, 1, damage); } else if (t1Condition == false && t2Condition == true) { - return P_DamageMobj(t1, t2, t2, 1, DMG_FLIPOVER); + UINT8 damage = DMG_FLIPOVER; + + if (gametypes[gametype]->rules & GTR_BUMPERS) + damage |= DMG_STEAL; + + return P_DamageMobj(t1, t2, t2, 1, damage); } // Battle Mode Sneaker and Bubble damage