thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust nudging to values that feel nice

Browse source
This commit is contained in:
Sally Coolatta 2021-02-26 03:21:33 -05:00
parent 0fb97a1b16
commit 7eac54a749
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/k_botsearch.c
View file

@ -455,7 +455,7 @@ static boolean K_FindObjectsForNudging(mobj_t *thing)
return true; return true;
} }
fulldist = R_PointToDist2(globalsmuggle.predict->x, globalsmuggle.predict->y, thing->x, thing->y); fulldist = R_PointToDist2(globalsmuggle.botmo->x, globalsmuggle.botmo->y, thing->x, thing->y);
if (fulldist > globalsmuggle.distancetocheck) if (fulldist > globalsmuggle.distancetocheck)
{ {
@ -680,16 +680,17 @@ void K_NudgePredictionTowardsObjects(botprediction_t *predict, player_t *player)
{ {
INT32 xl, xh, yl, yh, bx, by; INT32 xl, xh, yl, yh, bx, by;
const fixed_t baseNudge = 8 * mapobjectscale;
fixed_t avgX = 0, avgY = 0; fixed_t avgX = 0, avgY = 0;
fixed_t avgDist = 0; fixed_t avgDist = 0;
const fixed_t baseNudge = 48 * mapobjectscale;
fixed_t nudgeDist = 0; fixed_t nudgeDist = 0;
angle_t nudgeDir = 0; angle_t nudgeDir = 0;
globalsmuggle.botmo = player->mo; globalsmuggle.botmo = player->mo;
globalsmuggle.predict = predict; globalsmuggle.predict = predict;
globalsmuggle.distancetocheck = (player->mo->radius * 32) + (player->speed * 4); globalsmuggle.distancetocheck = R_PointToDist2(player->mo->x, player->mo->y, predict->x, predict->y);
globalsmuggle.gotoAvgX = globalsmuggle.gotoAvgY = 0; globalsmuggle.gotoAvgX = globalsmuggle.gotoAvgY = 0;
globalsmuggle.gotoObjs = 0; globalsmuggle.gotoObjs = 0;
@ -722,8 +723,15 @@ void K_NudgePredictionTowardsObjects(botprediction_t *predict, player_t *player)
predict->x, predict->y predict->x, predict->y
); );
// Light-weight characters dodge better
nudgeDist = ((9 - globalsmuggle.botmo->player->kartweight) + 1) * baseNudge; nudgeDist = ((9 - globalsmuggle.botmo->player->kartweight) + 1) * baseNudge;
if (nudgeDist > predict->radius)
{
nudgeDist = predict->radius;
}
// Point away
nudgeDir = R_PointToAngle2( nudgeDir = R_PointToAngle2(
avgX, avgY, avgX, avgY,
predict->x, predict->y predict->x, predict->y
@ -743,8 +751,14 @@ void K_NudgePredictionTowardsObjects(botprediction_t *predict, player_t *player)
avgX, avgY avgX, avgY
); );
// Acceleration characters are more aggressive
nudgeDist = ((9 - globalsmuggle.botmo->player->kartspeed) + 1) * baseNudge; nudgeDist = ((9 - globalsmuggle.botmo->player->kartspeed) + 1) * baseNudge;
if (nudgeDist > predict->radius)
{
nudgeDist = predict->radius;
}
if (avgDist <= nudgeDist) if (avgDist <= nudgeDist)
{ {
predict->x = avgX; predict->x = avgX;
@ -752,6 +766,7 @@ void K_NudgePredictionTowardsObjects(botprediction_t *predict, player_t *player)
} }
else else
{ {
// Point towards
nudgeDir = R_PointToAngle2( nudgeDir = R_PointToAngle2(
predict->x, predict->y, predict->x, predict->y,
avgX, avgY avgX, avgY