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

Improve spindash conditions

Browse source
This commit is contained in:
Sally Coolatta 2022-04-01 16:05:49 -04:00
parent 3fb1ebbbb0
commit 1a25fcee4e
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/k_bot.c
View file

@ -309,12 +309,15 @@ boolean K_BotCanTakeCut(player_t *player)
--------------------------------------------------*/ --------------------------------------------------*/
static fixed_t K_BotSpeedScaled(player_t *player, fixed_t speed) static fixed_t K_BotSpeedScaled(player_t *player, fixed_t speed)
{ {
fixed_t moveFactor = player->mo->movefactor;
fixed_t result = speed; fixed_t result = speed;
#if 0 // I still think this is a good idea, but it makes them move way slower on ice. Needs investigating. // I still think this is a good idea, but it makes them move way slower on ice / slopes.
if (moveFactor != FRACUNIT) // Needs investigating.
#if 0
if (player->mo->movefactor != FRACUNIT)
{ {
fixed_t moveFactor = player->mo->movefactor;
if (moveFactor == 0) if (moveFactor == 0)
{ {
moveFactor = 1; moveFactor = 1;
@ -330,7 +333,6 @@ static fixed_t K_BotSpeedScaled(player_t *player, fixed_t speed)
result = FixedMul(result, moveFactor); result = FixedMul(result, moveFactor);
} }
#endif
if (player->mo->standingslope != NULL) if (player->mo->standingslope != NULL)
{ {
@ -352,6 +354,7 @@ 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;
} }
@ -1439,7 +1442,7 @@ void K_BuildBotTiccmd(player_t *player, ticcmd_t *cmd)
// We're in about the right place, let's do whatever we want to. // We're in about the right place, let's do whatever we want to.
if (player->kartspeed > 3) if (player->kartspeed >= 5)
{ {
// Faster characters want to spindash. // Faster characters want to spindash.
// Slower characters will use their momentum. // Slower characters will use their momentum.
@ -1473,9 +1476,17 @@ void K_BuildBotTiccmd(player_t *player, ticcmd_t *cmd)
{ {
turnamt = bullyTurn; turnamt = bullyTurn;
trySpindash = false; // If already spindashing, wait until we get a relatively OK charge first.
cmd->buttons |= BT_ACCELERATE; if (player->spindash > 0 && player->spindash <= TICRATE)
cmd->forwardmove = MAXPLMOVE; {
trySpindash = true;
}
else
{
trySpindash = false;
cmd->buttons |= BT_ACCELERATE;
cmd->forwardmove = MAXPLMOVE;
}
} }
} }
else else