thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-05 15:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Battle UFO: extend hitbox down by 1/4

Browse source
This commit is contained in:
James R 2024-01-05 21:00:42 -08:00
parent 2bdb7d4349
commit 967cb65124
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -30946,7 +30946,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_cdfm19, // deathsound sfx_cdfm19, // deathsound
0, // speed 0, // speed
60*FRACUNIT, // radius 60*FRACUNIT, // radius
104*FRACUNIT, // height 156*FRACUNIT, // height
0, // display offset 0, // display offset
0, // mass 0, // mass
0, // damage 0, // damage

9
src/objects/battle-ufo.cpp
View file

@ -45,7 +45,7 @@ struct UFO : Mobj
void spawn_beam() void spawn_beam()
{ {
Mobj *x = spawn_from<Mobj>({0, 0, height / 4}, MT_BATTLEUFO_BEAM); Mobj *x = spawn_from<Mobj>({0, 0, sprzoff() + 26}, MT_BATTLEUFO_BEAM);
x->renderflags |= RF_FLOORSPRITE|RF_NOSPLATBILLBOARD|RF_SLOPESPLAT|RF_NOSPLATROLLANGLE; x->renderflags |= RF_FLOORSPRITE|RF_NOSPLATBILLBOARD|RF_SLOPESPLAT|RF_NOSPLATROLLANGLE;
x->colorized = true; x->colorized = true;
@ -107,8 +107,12 @@ public:
return; return;
} }
Fixed ofs = mobjinfo[MT_BATTLEUFO].height / 4;
Spawner* spawner = next(g_battleufo.previousId); Spawner* spawner = next(g_battleufo.previousId);
UFO* ufo = static_cast<UFO*>(P_SpawnMobjFromMobj(spawner, 0, 0, 250*FRACUNIT, MT_BATTLEUFO)); UFO* ufo = static_cast<UFO*>(P_SpawnMobjFromMobj(spawner, 0, 0, 250*FRACUNIT - ofs, MT_BATTLEUFO));
ufo->sprzoff(ofs * spawner->scale());
ufo->spawner(spawner); ufo->spawner(spawner);
} }
@ -204,6 +208,7 @@ void Obj_BattleUFOLegThink(mobj_t *leg)
// TODO: Take gravflip into account // TODO: Take gravflip into account
P_MoveOrigin(leg, x, y, leg->z); P_MoveOrigin(leg, x, y, leg->z);
leg->sprzoff = leg->target->sprzoff;
} }
leg->momz = leg->target->momz; leg->momz = leg->target->momz;