thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Battle: Orbinaut/Jawz Shields award points on contact with a player

Browse source
This commit is contained in:
James R 2024-03-11 05:26:33 -07:00
parent 87bd18b509
commit cdc098c22b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/objects/orbinaut.c
View file

@ -220,7 +220,7 @@ boolean Obj_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2)
// ^ remove all of P_DamageMobj and start over // ^ remove all of P_DamageMobj and start over
P_PlayRinglossSound(t2); P_PlayRinglossSound(t2);
P_PlayerRingBurst(t2->player, 5); P_PlayerRingBurst(t2->player, 5);
P_DamageMobj(t2, t1, t1->target, 1, DMG_WOMBO | DMG_STUMBLE); P_DamageMobj(t2, t1, t1->target, 1, DMG_WOMBO | DMG_WHUMBLE);
} }
else else
{ {

4
src/p_local.h
View file

@ -524,8 +524,8 @@ struct BasicFF_t
#define DMG_STING 0x04 #define DMG_STING 0x04
#define DMG_KARMA 0x05 // Karma Bomb explosion -- works like DMG_EXPLODE, but steals half of their bumpers & deletes the rest #define DMG_KARMA 0x05 // Karma Bomb explosion -- works like DMG_EXPLODE, but steals half of their bumpers & deletes the rest
#define DMG_VOLTAGE 0x06 #define DMG_VOLTAGE 0x06
#define DMG_STUMBLE 0x07 #define DMG_STUMBLE 0x07 // Does not award points in Battle
#define DMG_WHUMBLE 0x08 #define DMG_WHUMBLE 0x08 // <-- But this one DOES!
//// Death types - cannot be combined with damage types //// Death types - cannot be combined with damage types
#define DMG_INSTAKILL 0x80 #define DMG_INSTAKILL 0x80
#define DMG_DEATHPIT 0x81 #define DMG_DEATHPIT 0x81