return this.bot_strategytime < time;
}
+#define MAX_CHASE_DISTANCE 700
bool navigation_goalrating_timeout_can_be_anticipated(entity this)
{
if(time > this.bot_strategytime - (IS_MOVABLE(this.goalentity) ? 3 : 2))
vector dest = '0 0 0';
if ((ent.classname != "waypoint") || ent.wpisbox)
{
- vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1);
- vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1);
+ vector wm1 = ent.origin + ent.mins;
+ vector wm2 = ent.origin + ent.maxs;
dest.x = bound(wm1.x, org.x, wm2.x);
dest.y = bound(wm1.y, org.y, wm2.y);
dest.z = bound(wm1.z, org.z, wm2.z);
{
if ((ent.classname != "waypoint") || ent.wpisbox)
{
- vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1);
- vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1);
+ vector wm1 = ent.origin + ent.mins;
+ vector wm2 = ent.origin + ent.maxs;
if (IS_PLAYER(ent) || IS_MONSTER(ent))
{
// move destination point out of player bbox otherwise tracebox always fails
vector closer_dest = '0 0 0';
if ((ent.classname != "waypoint") || ent.wpisbox)
{
- vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1);
- vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1);
+ vector wm1 = ent.origin + ent.mins;
+ vector wm2 = ent.origin + ent.maxs;
closer_dest.x = bound(wm1.x, org.x, wm2.x);
closer_dest.y = bound(wm1.y, org.y, wm2.y);
closer_dest.z = bound(wm1.z, org.z, wm2.z);
if(walkfromwp && (it.wpflags & WAYPOINTFLAG_NORELINK))
continue;
v = it.origin;
- if(walkfromwp)
- set_tracewalk_dest(ent, v, false);
+
+ if (walkfromwp)
+ {
+ set_tracewalk_dest(ent, v, true);
+ if (trace_ent == ent)
+ {
+ bestdist = 0;
+ best = it;
+ break;
+ }
+ }
else
set_tracewalk_dest(it, org, false);
+
if (navigation_waypoint_will_link(v, org, ent,
tracewalk_dest, tracewalk_dest_height,
tracewalk_dest, tracewalk_dest_height, walkfromwp, bestdist))
{
- bestdist = vlen(v - org);
+ if (walkfromwp)
+ bestdist = vlen(tracewalk_dest - v);
+ else
+ bestdist = vlen(v - org);
best = it;
}
});
//print("routerating ", etos(e), " = ", ftos(f), " - ", ftos(rangebias), "\n");
// Evaluate path using jetpack
- if(g_jetpack)
if(this.items & IT_JETPACK)
if(autocvar_bot_ai_navigation_jetpack)
if(vdist(this.origin - goal_org, >, autocvar_bot_ai_navigation_jetpack_mindistance))
LOG_DEBUG("jetpack ai: required fuel ", ftos(fuel), " this.ammo_fuel ", ftos(this.ammo_fuel));
// enough fuel ?
- if(this.ammo_fuel>fuel)
+ if(this.ammo_fuel>fuel || (this.items & IT_UNLIMITED_WEAPON_AMMO))
{
// Estimate cost
// (as onground costs calculation is mostly based on distances, here we do the same establishing some relationship
// if it can reach the goal there is nothing more to do
set_tracewalk_dest(e, startposition, true);
- if (trace_ent == this || tracewalk(this, startposition, STAT(PL_MIN, this), STAT(PL_MAX, this),
- tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode))
+ if ((!IS_MOVABLE(this.goalcurrent) || vdist(tracewalk_dest - this.origin, <, MAX_CHASE_DISTANCE))
+ && (trace_ent == this || tracewalk(this, startposition, STAT(PL_MIN, this), STAT(PL_MAX, this),
+ tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode)))
{
return true;
}
// often path can be optimized by not adding the nearest waypoint
if (this.goalentity.navigation_dynamicgoal || autocvar_g_waypointeditor)
{
- set_tracewalk_dest(this.goalentity, nearest_wp.enemy.origin, true);
- if (trace_ent == this || (vdist(tracewalk_dest - nearest_wp.enemy.origin, <, 1050)
- && tracewalk(this, nearest_wp.enemy.origin, STAT(PL_MIN, this), STAT(PL_MAX, this),
- tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode)))
+ if (nearest_wp.enemy.wpcost < autocvar_bot_ai_strategyinterval_movingtarget)
{
- e = nearest_wp.enemy;
+ if (vdist(vec2(this.goalentity.origin - nearest_wp.origin), <, 32))
+ e = nearest_wp.enemy;
+ else
+ {
+ set_tracewalk_dest(this.goalentity, nearest_wp.enemy.origin, true);
+ if (trace_ent == this || (vdist(tracewalk_dest - nearest_wp.enemy.origin, <, 1050)
+ && vlen2(tracewalk_dest - nearest_wp.enemy.origin) < vlen2(nearest_wp.origin - nearest_wp.enemy.origin)
+ && tracewalk(this, nearest_wp.enemy.origin, STAT(PL_MIN, this), STAT(PL_MAX, this),
+ tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode)))
+ {
+ e = nearest_wp.enemy;
+ }
+ }
}
}
else if(navigation_item_islinked(nearest_wp.enemy, this.goalentity))
return false;
}
+// shorten path by removing intermediate goals
+void navigation_shortenpath(entity this)
+{
+ if (!this.goalstack01 || wasfreed(this.goalstack01))
+ return;
+ if (this.bot_tracewalk_time > time)
+ return;
+ this.bot_tracewalk_time = max(time, this.bot_tracewalk_time) + 0.25;
+
+ bool cut_allowed = false;
+ entity next = this.goalentity;
+ // evaluate whether bot can discard current route and chase directly a player, trying to
+ // keep waypoint route as long as possible, as it is safer and faster (bot can bunnyhop)
+ if (IS_MOVABLE(next))
+ {
+ set_tracewalk_dest(next, this.origin, true);
+ if (vdist(this.origin - tracewalk_dest, <, 200))
+ cut_allowed = true;
+ else if (vdist(tracewalk_dest - this.origin, <, MAX_CHASE_DISTANCE)
+ && vdist(tracewalk_dest - this.goalcurrent.origin, >, 200)
+ && vdist(this.origin - this.goalcurrent.origin, >, 100)
+ && checkpvs(this.origin + this.view_ofs, next))
+ {
+ if (vlen2(next.origin - this.origin) < vlen2(this.goalcurrent.origin - this.origin))
+ cut_allowed = true;
+ else
+ {
+ vector deviation = vectoangles(this.goalcurrent.origin - this.origin) - vectoangles(next.origin - this.origin);
+ while (deviation.y < -180) deviation.y += 360;
+ while (deviation.y > 180) deviation.y -= 360;
+ if (fabs(deviation.y) > 25)
+ cut_allowed = true;
+ }
+ }
+ if (cut_allowed)
+ {
+ if (trace_ent == this || tracewalk(this, this.origin, this.mins, this.maxs,
+ tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode))
+ {
+ LOG_DEBUG("path optimized for ", this.netname, ", route cleared");
+ do
+ {
+ navigation_poproute(this);
+ }
+ while (this.goalcurrent != next);
+ }
+ return;
+ }
+ }
+
+ next = this.goalstack01;
+ // if for some reason the bot is closer to the next goal, pop the current one
+ if (!IS_MOVABLE(next) // already checked in the previous case
+ && vlen2(this.goalcurrent.origin - next.origin) > vlen2(next.origin - this.origin)
+ && checkpvs(this.origin + this.view_ofs, next))
+ {
+ set_tracewalk_dest(next, this.origin, true);
+ cut_allowed = true;
+ }
+
+ if (cut_allowed)
+ {
+ if (trace_ent == this || tracewalk(this, this.origin, this.mins, this.maxs,
+ tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode))
+ {
+ LOG_DEBUG("path optimized for ", this.netname, ", removed a goal from the queue");
+ navigation_poproute(this);
+ }
+ }
+}
+
// removes any currently touching waypoints from the goal stack
// (this is how bots detect if they reached a goal)
int navigation_poptouchedgoals(entity this)
{
int removed_goals = 0;
- if(IS_PLAYER(this.goalcurrent) && IS_DEAD(this.goalcurrent) && checkpvs(this.origin + this.view_ofs, this.goalcurrent))
- {
- navigation_poproute(this);
- ++removed_goals;
- }
+ if(!this.goalcurrent)
+ return removed_goals;
if(this.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT)
{
// make sure jumppad is really hit, don't rely on distance based checks
// as they may report a touch even if it didn't really happen
- if(this.lastteleporttime > 0
- && time - this.lastteleporttime < ((this.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL) ? 2 : 0.15))
+ if(this.lastteleporttime > 0 && TELEPORT_USED(this, this.goalcurrent))
{
if(this.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
if(this.goalcurrent.wpflags & WAYPOINTFLAG_PERSONAL && this.goalcurrent.owner==this)
else
return removed_goals;
}
-
- // If for some reason the bot is closer to the next goal, pop the current one
- if(this.goalstack01 && !wasfreed(this.goalstack01))
- if(random() < 0.7) // randomness should help on certain hard paths with climbs and tight corners
- if(vlen2(this.goalcurrent.origin - this.goalstack01.origin) > vlen2(this.goalstack01.origin - this.origin))
- if(checkpvs(this.origin + this.view_ofs, this.goalstack01))
+ else if (this.lastteleporttime > 0)
{
- set_tracewalk_dest(this.goalstack01, this.origin, false);
- if(tracewalk(this, this.origin, this.mins, this.maxs,
- tracewalk_dest, tracewalk_dest_height, bot_navigation_movemode))
+ // sometimes bot is pushed so hard (by a jumppad or a shot) that ends up touching the next
+ // teleport / jumppad / warpzone present in its path skipping check of one or more goals
+ // if so immediately fix bot path by removing skipped goals
+ entity tele_ent = NULL;
+ if (this.goalstack01 && (this.goalstack01.wpflags & WAYPOINTFLAG_TELEPORT))
+ tele_ent = this.goalstack01;
+ else if (this.goalstack02 && (this.goalstack02.wpflags & WAYPOINTFLAG_TELEPORT))
+ tele_ent = this.goalstack02;
+ else if (this.goalstack03 && (this.goalstack03.wpflags & WAYPOINTFLAG_TELEPORT))
+ tele_ent = this.goalstack03;
+ if (tele_ent && TELEPORT_USED(this, tele_ent))
{
- LOG_DEBUG("path optimized for ", this.netname, ", removed a goal from the queue");
+ if (this.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
+ if (tele_ent.wpflags & WAYPOINTFLAG_PERSONAL && tele_ent.owner == this)
+ {
+ this.aistatus &= ~AI_STATUS_WAYPOINT_PERSONAL_GOING;
+ this.aistatus |= AI_STATUS_WAYPOINT_PERSONAL_REACHED;
+ }
+ while (this.goalcurrent != tele_ent)
+ {
+ navigation_poproute(this);
+ ++removed_goals;
+ }
navigation_poproute(this);
+ this.lastteleporttime = 0;
++removed_goals;
- if(this.goalcurrent && this.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT)
- return removed_goals;
- // TODO this may also be a nice idea to do "early" (e.g. by
- // manipulating the vlen() comparisons) to shorten paths in
- // general - this would make bots walk more "on rails" than
- // "zigzagging" which they currently do with sufficiently
- // random-like waypoints, and thus can make a nice bot
- // personality property
+ return removed_goals;
}
}
entity navigation_get_really_close_waypoint(entity this)
{
entity wp = this.goalcurrent;
- if(!wp || vdist(wp.origin - this.origin, >, 50))
+ if(!wp)
wp = this.goalcurrent_prev;
if(!wp)
return NULL;
+ if(wp != this.goalcurrent_prev && vdist(wp.origin - this.origin, >, 50))
+ {
+ wp = this.goalcurrent_prev;
+ if(!wp)
+ return NULL;
+ }
if(wp.classname != "waypoint")
{
wp = wp.nearestwaypoint;
}
if(vdist(wp.origin - this.origin, >, 50))
{
+ wp = NULL;
IL_EACH(g_waypoints, !(it.wpflags & WAYPOINTFLAG_TELEPORT),
{
if(vdist(it.origin - this.origin, <, 50))
break;
}
});
+ if(!wp)
+ return NULL;
}
if(wp.wpflags & WAYPOINTFLAG_TELEPORT)
return NULL;
void navigation_unstuck(entity this)
{
- float search_radius = 1000;
-
if (!autocvar_bot_wander_enable)
return;
+ bool has_user_waypoints = false;
+ IL_EACH(g_waypoints, !(it.wpflags & WAYPOINTFLAG_GENERATED),
+ {
+ has_user_waypoints = true;
+ break;
+ });
+ if (!has_user_waypoints)
+ return;
+
+ float search_radius = 1000;
+
if (!bot_waypoint_queue_owner)
{
LOG_DEBUG(this.netname, " stuck, taking over the waypoints queue");
projects / xonotic / xonotic-data.pk3dir.git / blobdiff