Bot AI: fix bots using waypoints to reach a player when they could go straight to...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / default / navigation.qh

diff --git a/qcsrc/server/bot/default/navigation.qh b/qcsrc/server/bot/default/navigation.qh
index ea913456d33eac5db852b53c339a80d95b89350f..63d066b51c12f047196507ba8f75c580fd627e0b 100644 (file)
--- a/qcsrc/server/bot/default/navigation.qh
+++ b/qcsrc/server/bot/default/navigation.qh
@@ -25,11 +25,13 @@ entity navigation_bestgoal;
 .entity goalstack28, goalstack29, goalstack30, goalstack31;
 
 .entity goalcurrent_prev;
-.float goalcurrent_distance;
+.float goalcurrent_distance_z;
+.float goalcurrent_distance_2d;
 .float goalcurrent_distance_time;
 
+.float goalentity_lock_timeout;
+
 .entity nearestwaypoint;
-.float nearestwaypoint_dist;
 .float nearestwaypointtimeout;
 
 /*
@@ -51,8 +53,8 @@ entity navigation_bestgoal;
 // if ent is a box waypoint or an item v is set to coords of ent that are closer to org
 #define SET_DESTCOORDS(ent, org, v) MACRO_BEGIN { \
        if ((ent.classname != "waypoint") || ent.wpisbox) { \
-               vector wm1 = ent.origin + ent.mins; \
-               vector wm2 = ent.origin + ent.maxs; \
+               vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
+               vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
                v.x = bound(wm1.x, org.x, wm2.x); \
                v.y = bound(wm1.y, org.y, wm2.y); \
                v.z = bound(wm1.z, org.z, wm2.z); \
@@ -63,10 +65,17 @@ entity navigation_bestgoal;
 
 // if ent is a box waypoint or an item v is set to coords of ent that are closer to org
 // (but v.z is set to the lowest coord of ent), v_height is set to ent's height
+// if destination ent is a player make so that destination point doesn't overlap with
+// player bbox, otherwise tracebox always fails (if bot_navigation_ignoreplayers is false)
 #define SET_TRACEWALK_DESTCOORDS(ent, org, v, v_height) MACRO_BEGIN { \
        if ((ent.classname != "waypoint") || ent.wpisbox) { \
-               vector wm1 = ent.origin + ent.mins; \
-               vector wm2 = ent.origin + ent.maxs; \
+               vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
+               vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
+               if (IS_PLAYER(ent) || IS_MONSTER(ent)) \
+               { \
+                       wm1 += vec2(PL_MIN_CONST) + '-1 -1 0'; \
+                       wm2 += vec2(PL_MAX_CONST) + '1 1 0'; \
+               } \
                v.x = bound(wm1.x, org.x, wm2.x); \
                v.y = bound(wm1.y, org.y, wm2.y); \
                v.z = wm1.z; \
@@ -81,8 +90,8 @@ entity navigation_bestgoal;
 // (but v2.z is set to the lowest coord of ent), v2_height is set to ent's height
 #define SET_TRACEWALK_DESTCOORDS_2(ent, org, v, v2, v2_height) MACRO_BEGIN { \
        if ((ent.classname != "waypoint") || ent.wpisbox) { \
-               vector wm1 = ent.origin + ent.mins; \
-               vector wm2 = ent.origin + ent.maxs; \
+               vector wm1 = ent.origin + ent.mins - eZ * (PL_MAX_CONST.z - 1); \
+               vector wm2 = ent.origin + ent.maxs - eZ * (PL_MIN_CONST.z + 1); \
                v.x = bound(wm1.x, org.x, wm2.x); \
                v.y = bound(wm1.y, org.y, wm2.y); \
                v.z = bound(wm1.z, org.z, wm2.z); \
@@ -153,9 +162,12 @@ void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost2, vecto
 void navigation_markroutes(entity this, entity fixed_source_waypoint);
 void navigation_markroutes_inverted(entity fixed_source_waypoint);
 void navigation_routerating(entity this, entity e, float f, float rangebias);
-void navigation_poptouchedgoals(entity this);
+int navigation_poptouchedgoals(entity this);
 void navigation_goalrating_start(entity this);
 void navigation_goalrating_end(entity this);
+void navigation_goalrating_timeout_set(entity this);
+void navigation_goalrating_timeout_force(entity this);
+bool navigation_goalrating_timeout(entity this);
 void navigation_unstuck(entity this);
 
 void botframe_updatedangerousobjects(float maxupdate);