incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let attraction shield steal bumpers

Browse source
This commit is contained in:
NepDisk 2026-05-03 16:49:04 -04:00
parent a59a4360cb
commit 915f00b286
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/k_collide.c
View file

@ -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