Skip to content

Commit 7a40d3b

Browse files
committed
Merge branch 'jawz-adjustments' into 'master'
Jawz backthrow is viable See merge request kart-krew-dev/ring-racers-internal!2939
2 parents c24588a + a9fdc85 commit 7a40d3b

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/objects/jawz.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,16 @@ void Obj_JawzThrown(mobj_t *th, fixed_t finalSpeed, fixed_t dir)
279279
th->momx = 0;
280280
th->momy = 0;
281281

282-
// Slow down the top speed.
283-
finalSpeed = FixedMul(finalSpeed, 4*FRACUNIT/5);
282+
// Return at absolutely 120% of the owner's speed if it's any less than that.
283+
fixed_t min_backthrowspeed = 6*(K_GetKartSpeed(owner, false, false))/5;
284+
if (owner->speed >= min_backthrowspeed)
285+
{
286+
finalSpeed = 6*(owner->speed)/5;
287+
}
288+
else
289+
{
290+
finalSpeed = min_backthrowspeed;
291+
}
284292

285293
// Set a fuse.
286294
th->fuse = RR_PROJECTILE_FUSE;

0 commit comments

Comments
 (0)