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

Better bot spindash behaviors

Browse source 
For Chrome Gadget
This commit is contained in:
Sally Coolatta 2022-05-30 08:26:13 -04:00
parent 286f1c34a5
commit 52f82b4c64
2 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/k_bot.c
View file

@ -804,9 +804,11 @@ static UINT8 K_TrySpindash(player_t *player)
const fixed_t baseAccel = K_GetNewSpeed(player) - oldSpeed; const fixed_t baseAccel = K_GetNewSpeed(player) - oldSpeed;
const fixed_t speedDiff = player->speed - player->lastspeed; const fixed_t speedDiff = player->speed - player->lastspeed;
if (player->spindashboost || player->tiregrease) const INT32 angleDiff = AngleDelta(player->mo->angle, K_MomentumAngle(player->mo));
if (player->spindashboost || player->tiregrease // You just released a spindash, you don't need to try again yet, jeez.
|| P_PlayerInPain(player) || !P_IsObjectOnGround(player->mo)) // Not in a state where we want 'em to spindash.
{ {
// You just released a spindash, you don't need to try again yet, jeez.
player->botvars.spindashconfirm = 0; player->botvars.spindashconfirm = 0;
return 0; return 0;
} }
@ -837,36 +839,13 @@ static UINT8 K_TrySpindash(player_t *player)
} }
} }
// Logic for normal racing.
if (player->flashing > 0)
{
// Don't bother trying to spindash.
// Trying to spindash while flashing is fine during POSITION, but not during the actual race.
return 0;
}
if (speedDiff < (baseAccel / 4))
{
if (player->botvars.spindashconfirm < BOTSPINDASHCONFIRM)
{
player->botvars.spindashconfirm++;
}
}
else
{
if (player->botvars.spindashconfirm > 0)
{
player->botvars.spindashconfirm--;
}
}
if (player->botvars.spindashconfirm >= BOTSPINDASHCONFIRM) if (player->botvars.spindashconfirm >= BOTSPINDASHCONFIRM)
{ {
INT32 chargingPoint = (K_GetSpindashChargeTime(player) + difficultyModifier); INT32 chargingPoint = (K_GetSpindashChargeTime(player) + difficultyModifier);
// Release quicker the higher the difficulty is. // Release quicker the higher the difficulty is.
// Sounds counter-productive, but that's actually the best strategy after the race has started. // Sounds counter-productive, but that's actually the best strategy after the race has started.
chargingPoint -= player->botvars.difficulty * difficultyModifier; chargingPoint -= min(DIFFICULTBOT, player->botvars.difficulty) * difficultyModifier;
if (player->spindash > chargingPoint) if (player->spindash > chargingPoint)
{ {
@ -876,6 +855,25 @@ static UINT8 K_TrySpindash(player_t *player)
return 2; return 2;
} }
else
{
// Logic for normal racing.
if (speedDiff < (baseAccel / 4) // Moving too slowly
|| angleDiff > ANG60) // Being pushed backwards
{
if (player->botvars.spindashconfirm < BOTSPINDASHCONFIRM)
{
player->botvars.spindashconfirm++;
}
}
else if (player->botvars.spindashconfirm >= BOTSPINDASHCONFIRM)
{
if (player->botvars.spindashconfirm > 0)
{
player->botvars.spindashconfirm--;
}
}
}
// We're doing just fine, we don't need to spindash, thanks. // We're doing just fine, we don't need to spindash, thanks.
return 0; return 0;

2
src/k_bot.h
View file

@ -28,7 +28,7 @@
#define BOTTURNCONFIRM 4 #define BOTTURNCONFIRM 4
// How many tics without being able to accelerate before we'll let you spindash. // How many tics without being able to accelerate before we'll let you spindash.
#define BOTSPINDASHCONFIRM (TICRATE/4) #define BOTSPINDASHCONFIRM (TICRATE)
// Point for bots to aim for // Point for bots to aim for
typedef struct botprediction_s { typedef struct botprediction_s {