thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More UFO FX

Browse source
This commit is contained in:
AJ Martinez 2023-02-22 01:09:34 -07:00
parent 0fe70c373b
commit fa73500787
2 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/objects/ufo.c
View file

@ -59,6 +59,49 @@ enum
static sfxenum_t hums[16] = {sfx_claw01, sfx_claw02, sfx_claw03, sfx_claw04, sfx_claw05, sfx_claw06, sfx_claw07, sfx_claw08, sfx_claw09, sfx_claw10, sfx_claw11, sfx_claw12, sfx_claw13, sfx_claw14, sfx_claw15, sfx_claw16}; static sfxenum_t hums[16] = {sfx_claw01, sfx_claw02, sfx_claw03, sfx_claw04, sfx_claw05, sfx_claw06, sfx_claw07, sfx_claw08, sfx_claw09, sfx_claw10, sfx_claw11, sfx_claw12, sfx_claw13, sfx_claw14, sfx_claw15, sfx_claw16};
static int maxhum = sizeof(hums) / sizeof(hums[0]) - 1; static int maxhum = sizeof(hums) / sizeof(hums[0]) - 1;
static void SpawnUFOSpeedLines(mobj_t *ufo)
{
mobj_t *fast = P_SpawnMobjFromMobj(ufo,
P_RandomRange(PR_DECORATION, -120, 120) * FRACUNIT,
P_RandomRange(PR_DECORATION, -120, 120) * FRACUNIT,
(ufo->info->height / 2) + (P_RandomRange(PR_DECORATION, -24, 24) * FRACUNIT),
MT_FASTLINE
);
fast->scale *= 3;
P_SetTarget(&fast->target, ufo);
fast->angle = K_MomentumAngle(ufo);
fast->color = SKINCOLOR_WHITE;
fast->colorized = true;
K_MatchGenericExtraFlags(fast, ufo);
}
static void SpawnEmeraldSpeedLines(mobj_t *mo)
{
mobj_t *fast = P_SpawnMobjFromMobj(mo,
P_RandomRange(PR_DECORATION, -48, 48) * FRACUNIT,
P_RandomRange(PR_DECORATION, -48, 48) * FRACUNIT,
P_RandomRange(PR_DECORATION, 0, 64) * FRACUNIT,
MT_FASTLINE);
P_SetMobjState(fast, S_KARTINVLINES1);
P_SetTarget(&fast->target, mo);
fast->angle = K_MomentumAngle(mo);
fast->momx = 3*mo->momx/4;
fast->momy = 3*mo->momy/4;
fast->momz = 3*P_GetMobjZMovement(mo)/4;
K_MatchGenericExtraFlags(fast, mo);
K_ReduceVFX(fast, mo->player);
fast->color = mo->color;
fast->colorized = true;
}
static void UFOMoveTo(mobj_t *ufo, fixed_t destx, fixed_t desty, fixed_t destz) static void UFOMoveTo(mobj_t *ufo, fixed_t destx, fixed_t desty, fixed_t destz)
{ {
ufo->momx = destx - ufo->x; ufo->momx = destx - ufo->x;
@ -219,6 +262,17 @@ static void UFOUpdateSpeed(mobj_t *ufo)
{ {
ufo_speed(ufo) += UFO_SPEEDUP; ufo_speed(ufo) += UFO_SPEEDUP;
} }
// these number are primarily vibes based and not empirically derived
if (UFOEmeraldChase(ufo))
{
if (ufo_speed(ufo) > 50*FRACUNIT)
SpawnEmeraldSpeedLines(ufo);
}
else if (ufo_speed(ufo) > 70*FRACUNIT && !S_SoundPlaying(ufo, sfx_clawzm))
{
S_StartSound(ufo, sfx_clawzm);
}
} }
else if (speedDelta < 0) else if (speedDelta < 0)
{ {
@ -643,6 +697,7 @@ boolean Obj_SpecialUFODamage(mobj_t *ufo, mobj_t *inflictor, mobj_t *source, UIN
} }
S_StartSound(ufo, sfx_clawht); S_StartSound(ufo, sfx_clawht);
S_StopSoundByID(ufo, sfx_clawzm);
P_StartQuake(64<<FRACBITS, 10); P_StartQuake(64<<FRACBITS, 10);
ufo->health -= damage; ufo->health -= damage;
return true; return true;
@ -684,6 +739,8 @@ void Obj_UFOPieceThink(mobj_t *piece)
case UFO_PIECE_TYPE_POD: case UFO_PIECE_TYPE_POD:
{ {
UFOMoveTo(piece, ufo->x, ufo->y, ufo->z + (132 * piece->scale)); UFOMoveTo(piece, ufo->x, ufo->y, ufo->z + (132 * piece->scale));
if (S_SoundPlaying(ufo, sfx_clawzm) && ufo_speed(ufo) > 70*FRACUNIT)
SpawnUFOSpeedLines(piece);
break; break;
} }
case UFO_PIECE_TYPE_ARM: case UFO_PIECE_TYPE_ARM:

2
src/sounds.c
View file

@ -1170,7 +1170,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"claw15", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X2AWAYSOUND {"claw15", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X2AWAYSOUND
{"claw16", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X2AWAYSOUND {"claw16", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X2AWAYSOUND
{"clawht", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X4AWAYSOUND {"clawht", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X4AWAYSOUND
{"clawzm", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X4AWAYSOUND {"clawzm", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X8AWAYSOUND
{"clawk1", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X8AWAYSOUND {"clawk1", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X8AWAYSOUND
{"clawk2", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X8AWAYSOUND {"clawk2", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // SF_X8AWAYSOUND