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

Merge branch 'bawhaw' into 'master'

Browse source 
Ballhog buffs

Closes #1460

See merge request kart-krew-dev/ring-racers-internal!2559
This commit is contained in:
Oni VelocitOni 2025-05-20 22:25:38 +00:00
commit 7727d70e31
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/info.c
View file

@ -15257,13 +15257,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
16*FRACUNIT, // radius
32*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
100, // mass
1, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_DONTENCOREMAP, // flags
MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
S_NULL // raisestate
},

3
src/k_collide.cpp
View file

@ -72,6 +72,9 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2)
if (t1->type == MT_BALLHOG && t2->type == MT_BALLHOG)
return true; // Ballhogs don't collide with eachother
if (t1->type == MT_BALLHOGBOOM && t2->type == MT_BALLHOGBOOM)
return true; // Ballhogs don't collide with eachother
if (K_TryPickMeUp(t1, t2))
return true;

1
src/k_kart.c
View file

@ -15591,6 +15591,7 @@ static boolean K_PickUp(player_t *player, mobj_t *picked)
type = KITEM_JAWZ;
break;
case MT_BALLHOG:
case MT_BALLHOGBOOM:
type = KITEM_BALLHOG;
break;
case MT_LANDMINE:

1
src/p_enemy.c
View file

@ -12203,6 +12203,7 @@ void A_BallhogExplode(mobj_t *actor)
mo2 = P_SpawnMobj(actor->x, actor->y, actor->z, MT_BALLHOGBOOM);
P_SetScale(mo2, actor->scale*2);
mo2->destscale = mo2->scale;
P_SetTarget(&mo2->target, actor->target);
S_StartSound(mo2, actor->info->deathsound);
return;
}

4
src/p_map.c
View file

@ -1084,7 +1084,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
return Obj_OrbinautJawzCollide(thing, g_tm.thing) ? BMIT_CONTINUE : BMIT_ABORT;
}
if (g_tm.thing->type == MT_BANANA || g_tm.thing->type == MT_BANANA_SHIELD || g_tm.thing->type == MT_BALLHOG)
if (g_tm.thing->type == MT_BANANA || g_tm.thing->type == MT_BANANA_SHIELD || g_tm.thing->type == MT_BALLHOG || g_tm.thing->type == MT_BALLHOGBOOM)
{
// see if it went over / under
if (g_tm.thing->z > thing->z + thing->height)
@ -1094,7 +1094,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
return K_BananaBallhogCollide(g_tm.thing, thing) ? BMIT_CONTINUE : BMIT_ABORT;
}
else if (thing->type == MT_BANANA || thing->type == MT_BANANA_SHIELD || thing->type == MT_BALLHOG)
else if (thing->type == MT_BANANA || thing->type == MT_BANANA_SHIELD || thing->type == MT_BALLHOG || thing->type == MT_BALLHOGBOOM)
{
// see if it went over / under
if (g_tm.thing->z > thing->z + thing->height)