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

WIP EXP visuals

Browse source
This commit is contained in:
Antonio Martinez 2025-06-12 00:07:25 -04:00
parent a0cc5dc69a
commit 46d6e4d852
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/objects/exp.c
View file

@ -23,8 +23,7 @@
#include "../sounds.h"
#define EXP_ARCTIME (8)
#define EXP_ORBIT (240)
#define EXP_COLLECT (100)
#define EXP_ORBIT (100)
void Obj_ExpThink (mobj_t *exp)
{
@ -45,29 +44,51 @@ void Obj_ExpThink (mobj_t *exp)
dist = P_AproxDistance(P_AproxDistance(exp->x - mo->x, exp->y - mo->y), exp->z - mo->z);
exp->angle += ANGLE_45/4;
K_MatchGenericExtraFlags(exp, mo);
exp->cusval++;
if (exp->cusval%2)
{
mobj_t *ghost = P_SpawnGhostMobj(exp);
ghost->colorized = true;
ghost->color = player->skincolor;
ghost->renderflags |= RF_ADD;
ghost->fuse = 2;
}
// bullshit copypaste orbit behavior
if (exp->threshold)
{
A_AttractChase(exp);
fixed_t orbit = (4*mo->scale) * (16 - exp->extravalue1);
exp->threshold = min(exp->threshold, 1);
P_SetScale(exp, (exp->destscale = mapobjectscale - ((mapobjectscale/28) * exp->extravalue1)));
exp->z = exp->target->z;
P_MoveOrigin(exp,
mo->x + FixedMul(orbit, FINECOSINE(exp->angle >> ANGLETOFINESHIFT)),
mo->y + FixedMul(orbit, FINESINE(exp->angle >> ANGLETOFINESHIFT)),
exp->z + mo->scale * 24 * P_MobjFlip(exp));
dist = P_AproxDistance(P_AproxDistance(exp->x - mo->x, exp->y - mo->y), exp->z - mo->z);
exp->momx = 0;
exp->momy = 0;
exp->momz = 0;
if (dist < (EXP_COLLECT * exp->scale))
exp->angle += ANG30;
exp->extravalue1++;
if (exp->extravalue1 >= 16)
P_RemoveMobj(exp);
return;
}
exp->angle += ANGLE_45/4;
UINT8 damper = 3;
fixed_t vert = dist/3;
fixed_t speed = 45*exp->scale;
exp->cusval++;
if (exp->extravalue2) // Mode: going down, aim at the player and speed up / dampen stray movement
{
if (exp->extravalue1)
@ -102,18 +123,8 @@ void Obj_ExpThink (mobj_t *exp)
exp->momy += FixedMul(FINESINE(vang>>ANGLETOFINESHIFT), FixedMul(FINESINE(hang>>ANGLETOFINESHIFT), speed));
exp->momz += FixedMul(FINECOSINE(vang>>ANGLETOFINESHIFT), speed);
if (exp->cusval%2)
{
mobj_t *ghost = P_SpawnGhostMobj(exp);
ghost->colorized = true;
ghost->color = player->skincolor;
ghost->renderflags |= RF_ADD;
ghost->fuse = 1;
}
if (dist < (EXP_ORBIT * exp->scale) && exp->extravalue2)
{
P_SetTarget(&exp->tracer, exp->target);
exp->threshold = TICRATE;
exp->extravalue1 = 0;
exp->extravalue2 = 0;

2
src/p_enemy.c
View file

@ -3501,7 +3501,7 @@ void A_AttractChase(mobj_t *actor)
if (actor->flags2 & MF2_NIGHTSPULL || !actor->health)
return;
if (actor->extravalue1 && actor->type != MT_EMERALD && actor->type != MT_EXP) // SRB2Kart
if (actor->extravalue1 && actor->type != MT_EMERALD) // SRB2Kart
{
if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player)
{