thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-15 01:56:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'catcher-crack' into 'master'

Browse source 
Visible damage to Sealed Star catcher capsule

See merge request KartKrew/Kart!2446
This commit is contained in:
AJ Martinez 2024-09-03 13:30:16 +00:00
commit da2e23c6eb
1 changed files with 67 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/objects/ufo.c
View file

@ -45,6 +45,8 @@
#define UFO_NUMARMS (3)
#define UFO_ARMDELTA (ANGLE_MAX / UFO_NUMARMS)
#define UFO_START_GLASSFRAMES (1)
#define UFO_NUM_GLASSFRAMES (10)
#define ufo_emeraldnum(o) ((o)->cvmem)
#define ufo_waypoint(o) ((o)->extravalue1)
@ -56,6 +58,8 @@
#define ufo_piece_type(o) ((o)->extravalue1)
#define ufo_piece_glass_flickerframe(o) ((o)->cusval)
#define ufo_piece_owner(o) ((o)->target)
#define ufo_piece_next(o) ((o)->hnext)
#define ufo_piece_prev(o) ((o)->hprev)
@ -676,6 +680,40 @@ spawn_shard
}
}
static void
set_flickerframe (mobj_t *ufo, mobj_t *piece)
{
INT32 healthcalc = (UFO_NUM_GLASSFRAMES - 1);
if (ufo && !P_MobjWasRemoved(ufo))
{
INT32 maxhealth = mobjinfo[MT_SPECIAL_UFO].spawnhealth;
healthcalc = (maxhealth - ufo->health);
if (healthcalc > 0)
{
maxhealth /= UFO_NUM_GLASSFRAMES;
if (maxhealth <= 0)
maxhealth = 1;
healthcalc /= maxhealth;
if (healthcalc >= UFO_NUM_GLASSFRAMES)
healthcalc = (UFO_NUM_GLASSFRAMES - 1);
if (healthcalc < 0)
healthcalc = 0;
}
else
{
healthcalc = 0;
}
}
healthcalc = (healthcalc|FF_FULLBRIGHT) + UFO_START_GLASSFRAMES;
ufo_piece_glass_flickerframe(piece) = healthcalc;
piece->frame = healthcalc;
}
static void
spawn_debris (mobj_t *part)
{
@ -704,6 +742,7 @@ static void UFOCopyHitlagToPieces(mobj_t *ufo)
if (ufo_piece_type(piece) == UFO_PIECE_TYPE_GLASS)
{
set_flickerframe (ufo, piece);
spawn_debris (piece);
}
@ -728,6 +767,11 @@ static void UFOKillPiece(mobj_t *piece)
switch (ufo_piece_type(piece))
{
case UFO_PIECE_TYPE_GLASS:
{
set_flickerframe(NULL, piece);
piece->tics = 1;
return;
}
case UFO_PIECE_TYPE_GLASS_UNDER:
case UFO_PIECE_TYPE_STEM:
{
@ -1115,6 +1159,21 @@ void Obj_UFOPieceThink(mobj_t *piece)
break;
}
case UFO_PIECE_TYPE_GLASS:
{
// Flicker glass cracks for visibility
if (piece->frame == FF_SEMIBRIGHT)
{
piece->frame = ufo_piece_glass_flickerframe(piece);
}
else
{
piece->frame = FF_SEMIBRIGHT;
}
piece->destscale = 5 * ufo->destscale / 3;
UFOMoveTo(piece, ufo->x, ufo->y, ufo->z);
break;
}
case UFO_PIECE_TYPE_GLASS_UNDER:
{
piece->destscale = 5 * ufo->destscale / 3;
@ -1222,6 +1281,12 @@ static mobj_t *InitSpecialUFO(waypoint_t *start)
specialstageinfo.maxDist = ufo_distancetofinish(ufo);
}
// Set specialDamage as early as possible, for glass ball's sake
if (grandprixinfo.gp && grandprixinfo.specialDamage)
{
ufo->health -= min(4*(UINT32)mobjinfo[MT_SPECIAL_UFO].spawnhealth/10, grandprixinfo.specialDamage/6);
}
ufo_speed(ufo) = FixedMul(UFO_START_SPEED, K_GetKartGameSpeedScalar(gamespeed));
// Adjustable Special Stage emerald color/shape
@ -1295,6 +1360,8 @@ static mobj_t *InitSpecialUFO(waypoint_t *start)
P_SetMobjState(piece, S_SPECIAL_UFO_GLASS);
ufo_piece_type(piece) = UFO_PIECE_TYPE_GLASS;
set_flickerframe(ufo, piece);
/*overlay = P_SpawnMobjFromMobj(piece, 0, 0, 0, MT_OVERLAY);
P_SetTarget(&overlay->target, piece);
P_SetMobjState(overlay, S_SPECIAL_UFO_GLASS_UNDER);
@ -1347,11 +1414,6 @@ static mobj_t *InitSpecialUFO(waypoint_t *start)
P_SetTarget(&ufo_piece_prev(piece), prevPiece);
prevPiece = piece;
if (grandprixinfo.gp && grandprixinfo.specialDamage)
{
ufo->health -= min(4*(UINT32)mobjinfo[MT_SPECIAL_UFO].spawnhealth/10, grandprixinfo.specialDamage/6);
}
return ufo;
}