mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'jawz-adjustments' into 'master'
Jawz Target Speed Adjustments See merge request kart-krew-dev/ring-racers-internal!2938
This commit is contained in:
commit
73ff24ff1b
1 changed files with 11 additions and 3 deletions
|
|
@ -75,7 +75,7 @@ static void JawzChase(mobj_t *th, boolean grounded)
|
||||||
fixed_t speeddifference = abs(
|
fixed_t speeddifference = abs(
|
||||||
topspeed - min(
|
topspeed - min(
|
||||||
jawz_chase(th)->player->speed,
|
jawz_chase(th)->player->speed,
|
||||||
K_GetKartSpeed(jawz_chase(th)->player, false, false)
|
(K_GetKartSpeed(jawz_chase(th)->player, false, false))/2
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -279,8 +279,16 @@ void Obj_JawzThrown(mobj_t *th, fixed_t finalSpeed, fixed_t dir)
|
||||||
th->momx = 0;
|
th->momx = 0;
|
||||||
th->momy = 0;
|
th->momy = 0;
|
||||||
|
|
||||||
// Slow down the top speed.
|
// Return at absolutely 120% of the owner's speed if it's any less than that.
|
||||||
finalSpeed = FixedMul(finalSpeed, 4*FRACUNIT/5);
|
fixed_t min_backthrowspeed = 6*(K_GetKartSpeed(owner, false, false))/5;
|
||||||
|
if (owner->speed >= min_backthrowspeed)
|
||||||
|
{
|
||||||
|
finalSpeed = 6*(owner->speed)/5;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
finalSpeed = min_backthrowspeed;
|
||||||
|
}
|
||||||
|
|
||||||
// Set a fuse.
|
// Set a fuse.
|
||||||
th->fuse = RR_PROJECTILE_FUSE;
|
th->fuse = RR_PROJECTILE_FUSE;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue