thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve bot friction rubberbanding

Browse source
This commit is contained in:
Sally Coolatta 2022-04-01 16:39:24 -04:00
parent 1a25fcee4e
commit 56875c59e9
1 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/k_bot.c
View file

@ -311,9 +311,6 @@ static fixed_t K_BotSpeedScaled(player_t *player, fixed_t speed)
{ {
fixed_t result = speed; fixed_t result = speed;
// I still think this is a good idea, but it makes them move way slower on ice / slopes.
// Needs investigating.
#if 0
if (player->mo->movefactor != FRACUNIT) if (player->mo->movefactor != FRACUNIT)
{ {
fixed_t moveFactor = player->mo->movefactor; fixed_t moveFactor = player->mo->movefactor;
@ -354,7 +351,6 @@ static fixed_t K_BotSpeedScaled(player_t *player, fixed_t speed)
result = FixedMul(result, (FRACUNIT*9/10) + (slopeMul/10)); result = FixedMul(result, (FRACUNIT*9/10) + (slopeMul/10));
} }
} }
#endif
return result; return result;
} }
@ -648,8 +644,9 @@ fixed_t K_BotTopSpeedRubberband(player_t *player)
--------------------------------------------------*/ --------------------------------------------------*/
fixed_t K_BotFrictionRubberband(player_t *player, fixed_t frict) fixed_t K_BotFrictionRubberband(player_t *player, fixed_t frict)
{ {
const fixed_t value = 1024;
fixed_t rubberband = K_BotRubberband(player) - FRACUNIT; fixed_t rubberband = K_BotRubberband(player) - FRACUNIT;
fixed_t origFrict, newFrict; fixed_t newFrict = frict;
if (rubberband <= 0) if (rubberband <= 0)
{ {
@ -657,32 +654,7 @@ fixed_t K_BotFrictionRubberband(player_t *player, fixed_t frict)
return frict; return frict;
} }
if (player->tiregrease > 0) newFrict = frict - FixedMul(value, rubberband);
{
// This isn't great -- it means rubberbanding will slow down when they hit a spring
// But it's better than the opposite where they accelerate into hyperspace :V
// (would appreciate an actual fix though ... could try being additive instead of multiplicative)
return frict;
}
origFrict = FixedDiv(ORIG_FRICTION, FRACUNIT + (rubberband / 2));
if (frict == ORIG_FRICTION)
{
newFrict = origFrict;
}
else
{
// Do some mumbo jumbo to make our friction value
// relative to what it WOULD be for ORIG_FRICTION.
// (I hate multiplicative friction :/)
fixed_t offset = ORIG_FRICTION - frict;
fixed_t ratio = FixedDiv(frict, ORIG_FRICTION);
offset = FixedDiv(offset, ratio);
newFrict = frict + offset;
}
if (newFrict < 0) if (newFrict < 0)
newFrict = 0; newFrict = 0;