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 9a6a0c8a6adf6368b57fadaa3df6985b082768e2..63d066b51c12f047196507ba8f75c580fd627e0b 100644 (file)
--- a/qcsrc/server/bot/default/navigation.qh
+++ b/qcsrc/server/bot/default/navigation.qh
@@ -9,6 +9,7 @@ float navigation_testtracewalk;
 
 vector jumpstepheightvec;
 vector stepheightvec;
+vector jumpheight_vec;
 
 entity navigation_bestgoal;
 
@@ -23,8 +24,14 @@ entity navigation_bestgoal;
 .entity goalstack24, goalstack25, goalstack26, goalstack27;
 .entity goalstack28, goalstack29, goalstack30, goalstack31;
 
+.entity goalcurrent_prev;
+.float goalcurrent_distance_z;
+.float goalcurrent_distance_2d;
+.float goalcurrent_distance_time;
+
+.float goalentity_lock_timeout;
+
 .entity nearestwaypoint;
-.float nearestwaypoint_dist;
 .float nearestwaypointtimeout;
 
 /*
@@ -43,6 +50,61 @@ entity navigation_bestgoal;
 #define navigation_item_addlink(from_wp, to_item) \
        waypoint_addlink_customcost(to_item, from_wp, waypoint_getlinkcost(from_wp, to_item))
 
+// 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 - 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); \
+       } else { \
+               v = ent.origin; \
+       } \
+} MACRO_END
+
+// 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 - 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; \
+               v_height = wm2.z - wm1.z; \
+       } else { \
+               v = ent.origin; \
+               v_height = 0; \
+       } \
+} MACRO_END
+
+// if ent is a box waypoint or an item v and v2 are set to coords of ent that are closer to org
+// (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 - 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); \
+               v2.x = v.x; \
+               v2.y = v.y; \
+               v2.z = wm1.z; \
+               v2_height = wm2.z - wm1.z; \
+       } else { \
+               v = ent.origin; \
+               v2 = v; \
+               v2_height = 0; \
+       } \
+} MACRO_END
 
 .entity wp_goal_prev0;
 .entity wp_goal_prev1;
@@ -71,6 +133,12 @@ void navigation_dynamicgoal_init(entity this, bool initially_static);
 void navigation_dynamicgoal_set(entity this);
 void navigation_dynamicgoal_unset(entity this);
 
+.int nav_submerged_state;
+#define SUBMERGED_UNDEFINED 0
+#define SUBMERGED_NO 1
+#define SUBMERGED_YES 2
+bool navigation_check_submerged_state(entity ent, vector pos);
+
 
 /*
  * Functions
@@ -82,7 +150,7 @@ void debugnodestatus(vector position, float status);
 
 void debuggoalstack(entity this);
 
-float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode);
+float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float end_height, float movemode);
 
 float navigation_markroutes_nearestwaypoints(entity this, float maxdist);
 float navigation_routetogoal(entity this, entity e, vector startposition);
@@ -94,12 +162,15 @@ 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);
 
 entity navigation_findnearestwaypoint(entity ent, float walkfromwp);
-float navigation_waypoint_will_link(vector v, vector org, entity ent, float walkfromwp, float bestdist);
+float navigation_waypoint_will_link(vector v, vector org, entity ent, vector v2, float v2_height, vector o2, float o2_height, float walkfromwp, float bestdist);