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

Shift drift electricity scales with input direction

Browse source
This commit is contained in:
lachablock 2021-04-18 00:25:31 +10:00
parent ed91279391
commit 9552dd4f80
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/k_kart.c
View file

@ -3623,21 +3623,38 @@ static void K_SpawnDriftElectricity(player_t *player)
mobj_t *mo = player->mo; mobj_t *mo = player->mo;
fixed_t verticalradius = FixedDiv(mo->radius/3, mo->scale); // P_SpawnMobjFromMobj will rescale fixed_t verticalradius = FixedDiv(mo->radius/3, mo->scale); // P_SpawnMobjFromMobj will rescale
fixed_t horizontalradius = FixedDiv(5*mo->radius/3, mo->scale); fixed_t horizontalradius = FixedDiv(5*mo->radius/3, mo->scale);
angle_t verticalangle = K_MomentumAngle(mo) + ANGLE_180; angle_t verticalangle = K_MomentumAngle(mo) + ANGLE_180; // points away from the momentum angle
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
// i == 0 is right, i == 1 is left
mobj_t *spark; mobj_t *spark;
angle_t horizonatalangle = verticalangle + (2*i - 1) * ANGLE_90; angle_t horizonatalangle = verticalangle + (2*i - 1) * ANGLE_90;
fixed_t x = P_ReturnThrustX(mo, verticalangle, verticalradius) angle_t sparkangle = verticalangle + ANGLE_180;
+ P_ReturnThrustX(mo, horizonatalangle, horizontalradius); fixed_t verticalradius = verticalradius; // local version of the above so we can modify it
fixed_t y = P_ReturnThrustY(mo, verticalangle, verticalradius) fixed_t scalefactor = 0; // positive values enlarge sparks, negative values shrink them
+ P_ReturnThrustY(mo, horizonatalangle, horizontalradius); fixed_t x, y;
if (player->kartstuff[k_drift] == 0)
; // idk what you're doing spawning drift sparks when you're not drifting but you do you
else
{
scalefactor = -(2*i - 1) * min(max(player->cmd.turning, -1), 1) * FRACUNIT;
if (player->kartstuff[k_drift] > 0 == !(i)) // inwards spark should be closer to the player
verticalradius = 0;
}
x = P_ReturnThrustX(mo, verticalangle, verticalradius)
+ P_ReturnThrustX(mo, horizonatalangle, horizontalradius);
y = P_ReturnThrustY(mo, verticalangle, verticalradius)
+ P_ReturnThrustY(mo, horizonatalangle, horizontalradius);
spark = P_SpawnMobjFromMobj(mo, x, y, 0, MT_DRIFTELECTRICITY); spark = P_SpawnMobjFromMobj(mo, x, y, 0, MT_DRIFTELECTRICITY);
spark->angle = verticalangle + ANGLE_180;// + (2*i - 1) * ANGLE_22h; spark->angle = sparkangle;
spark->color = K_DriftSparkColor(player, player->kartstuff[k_driftcharge]); spark->color = K_DriftSparkColor(player, player->kartstuff[k_driftcharge]);
K_GenericExtraFlagsNoZAdjust(spark, mo); K_GenericExtraFlagsNoZAdjust(spark, mo);
spark->spritexscale += scalefactor/3;
spark->spriteyscale += scalefactor/8;
} }
} }