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

Merge branch 'aura-proration' into 'master'

Browse source 
Tripwire blaster knows about proration (resolves #1610)

Closes #1610

See merge request kart-krew-dev/ring-racers-internal!2704
This commit is contained in:
Oni VelocitOni 2025-07-25 00:18:46 +00:00
commit 5085cfece1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_mobj.c
View file

@ -8049,7 +8049,9 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
}
{
fixed_t convSpeed = (mobj->target->player->speed * 100) / K_GetKartSpeed(mobj->target->player, false, true);
fixed_t basespeed = K_GetKartSpeed(mobj->target->player, false, true);
fixed_t tripspeed = K_PlayerTripwireSpeedThreshold(mobj->target->player);
fixed_t myspeed = mobj->target->player->speed;
UINT8 trans = ((mobj->target->player->tripwireLeniency + 1) * (NUMTRANSMAPS+1)) / TRIPWIRETIME;
if (trans > NUMTRANSMAPS)
@ -8058,7 +8060,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
trans = NUMTRANSMAPS - trans;
if ((trans >= NUMTRANSMAPS) // not a valid visibility
|| (convSpeed < 150 && (leveltime & 1)) // < 150% flickering
|| (myspeed < (tripspeed - basespeed/2) && (leveltime & 1)) // < 150% flickering
|| (mobj->target->player->tripwirePass < TRIPWIRE_BOOST) // Not strong enough to make an aura
|| mobj->target->player->flamedash) // Flameshield dash
{
@ -8066,7 +8068,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
}
else
{
boolean blastermode = (convSpeed >= 200) && (mobj->target->player->tripwirePass >= TRIPWIRE_BLASTER);
boolean blastermode = (myspeed >= tripspeed) && (mobj->target->player->tripwirePass >= TRIPWIRE_BLASTER);
mobj->renderflags &= ~(RF_TRANSMASK|RF_DONTDRAW);
if (trans != 0)