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

Further Trick Indicator refinement

Browse source 
- Abstract K_TrickCatholocismBlast into its own function
    - Spawn one at an askance angle when you fail a trick for any reason
- Indicator is slightly closer to the player
- Smaller indicator base scale
- Indicator becomes more translucent the larger it is
- Swipe is at 1.5 scale relative to the indicator
This commit is contained in:
toaster 2023-11-06 19:22:21 +00:00
parent e412b6ddd8
commit f8a6449033
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/k_kart.c
View file

@ -4322,6 +4322,20 @@ void K_UpdateSliptideZipIndicator(player_t *player)
} }
} }
static mobj_t *K_TrickCatholocismBlast(mobj_t *trickIndicator, fixed_t destscale, angle_t rollangle)
{
// It's my last minute visual effect and I get to choose the ridiculous function name - toast 061123
mobj_t *catholocismBlast = P_SpawnGhostMobj(trickIndicator); // HOLY?
catholocismBlast->height = 1;
catholocismBlast->destscale = destscale;
catholocismBlast->fuse = 12;
catholocismBlast->rollangle = rollangle;
catholocismBlast->dispoffset = -1;
return catholocismBlast;
}
void K_UpdateTrickIndicator(player_t *player) void K_UpdateTrickIndicator(player_t *player)
{ {
mobj_t *mobj = NULL; mobj_t *mobj = NULL;
@ -4352,7 +4366,7 @@ void K_UpdateTrickIndicator(player_t *player)
if (test >= S_TRICKINDICATOR_UNDERLAY_ARROW) if (test >= S_TRICKINDICATOR_UNDERLAY_ARROW)
return; return;
const fixed_t onidistance = 200*mapobjectscale; const fixed_t onidistance = 150*mapobjectscale;
P_MoveOrigin( P_MoveOrigin(
mobj, mobj,
@ -4364,6 +4378,8 @@ void K_UpdateTrickIndicator(player_t *player)
if (player->trickpanel == 0 if (player->trickpanel == 0
&& test != S_INVISIBLE) && test != S_INVISIBLE)
{ {
K_TrickCatholocismBlast(mobj, 1, ANGLE_22h);
P_SetMobjState(mobj, S_INVISIBLE); P_SetMobjState(mobj, S_INVISIBLE);
P_SetMobjState(mobj->tracer, S_INVISIBLE); P_SetMobjState(mobj->tracer, S_INVISIBLE);
} }
@ -12099,7 +12115,18 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (P_MobjWasRemoved(player->trickIndicator) == false) if (P_MobjWasRemoved(player->trickIndicator) == false)
{ {
player->trickIndicator->destscale = FixedMul(speedmult + FRACUNIT, mapobjectscale); const fixed_t indicatormult = 3*(mapobjectscale/5);
player->trickIndicator->destscale = FixedMul(speedmult + FRACUNIT, indicatormult);
fixed_t trans = ((player->trickIndicator->scale * 9)/indicatormult) - 9;
if (trans < 10) // it's fine if it stays barely visible imo
{
UINT32 renderflags = player->trickIndicator->renderflags & ~RF_TRANSMASK;
if (trans > 0)
renderflags |= (trans << RF_TRANSSHIFT);
player->trickIndicator->renderflags = renderflags;
}
} }
// streaks: // streaks:
@ -12240,16 +12267,17 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (P_MobjWasRemoved(player->trickIndicator) == false) if (P_MobjWasRemoved(player->trickIndicator) == false)
{ {
mobj_t *catholocismBlast = P_SpawnGhostMobj(player->trickIndicator); K_TrickCatholocismBlast(player->trickIndicator, player->trickIndicator->scale*10, 0);
catholocismBlast->height = 1;
catholocismBlast->destscale *= 2; P_InstaScale(player->trickIndicator, 3*mapobjectscale/2);
catholocismBlast->fuse = 12; player->trickIndicator->old_scale = player->trickIndicator->scale;
catholocismBlast->rollangle = 0;
catholocismBlast->dispoffset = -1;
P_SetMobjState(player->trickIndicator, S_TRICKINDICATOR_UNDERLAY_ARROW); P_SetMobjState(player->trickIndicator, S_TRICKINDICATOR_UNDERLAY_ARROW);
if (P_MobjWasRemoved(player->trickIndicator->tracer) == false) if (P_MobjWasRemoved(player->trickIndicator->tracer) == false)
{ {
P_InstaScale(player->trickIndicator->tracer, player->trickIndicator->scale);
player->trickIndicator->tracer->old_scale = player->trickIndicator->tracer->scale;
P_SetMobjState(player->trickIndicator->tracer, S_TRICKINDICATOR_OVERLAY_ARROW); P_SetMobjState(player->trickIndicator->tracer, S_TRICKINDICATOR_OVERLAY_ARROW);
} }
} }