X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fnavigation.qc;h=8fe72ff6377d6690480eb61c7f6121e44a5cd32d;hp=d69da71a521ae04832f8780ba6ff9f9905994fd4;hb=10388420368e98086971ae421c68f44f44ba74bb;hpb=c25939493b53d6dd8e010f2aa75f81e80ee83347

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index d69da71a52..8fe72ff637 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -13,6 +13,7 @@
 
 #include <common/constants.qh>
 #include <common/net_linked.qh>
+#include <common/mapobjects/func/ladder.qh>
 #include <common/mapobjects/trigger/jumppads.qh>
 
 .float speed;
@@ -78,9 +79,11 @@ void navigation_dynamicgoal_init(entity this, bool initially_static)
 		this.nearestwaypointtimeout = time;
 }
 
-void navigation_dynamicgoal_set(entity this)
+void navigation_dynamicgoal_set(entity this, entity dropper)
 {
 	this.nearestwaypointtimeout = time;
+	if (dropper && dropper.nearestwaypointtimeout && dropper.nearestwaypointtimeout < time + 2)
+		this.nearestwaypoint = dropper.nearestwaypoint;
 	if (this.nearestwaypoint)
 		this.nearestwaypointtimeout += 2;
 }
@@ -126,8 +129,18 @@ void set_tracewalk_dest(entity ent, vector org, bool fix_player_dest)
 		// z coord is set to ent's min height
 		tracewalk_dest.x = bound(wm1.x, org.x, wm2.x);
 		tracewalk_dest.y = bound(wm1.y, org.y, wm2.y);
-		tracewalk_dest.z = wm1.z;
-		tracewalk_dest_height = wm2.z - wm1.z; // destination height
+		if ((IS_PLAYER(ent) || IS_MONSTER(ent))
+			&& org.x == tracewalk_dest.x && org.y == tracewalk_dest.y && org.z > tracewalk_dest.z)
+		{
+			tracewalk_dest.z = wm2.z - PL_MIN_CONST.z;
+			tracewalk_dest_height = 0;
+			fix_player_dest = false;
+		}
+		else
+		{
+			tracewalk_dest.z = wm1.z;
+			tracewalk_dest_height = wm2.z - wm1.z;
+		}
 	}
 	else
 	{
@@ -903,7 +916,7 @@ entity navigation_findnearestwaypoint_withdist_except(entity ent, float walkfrom
 	vector pm2 = ent.origin + ent.maxs;
 
 	// do two scans, because box test is cheaper
-	IL_EACH(g_waypoints, it != ent && it != except,
+	IL_EACH(g_waypoints, it != ent && it != except && !(it.wpflags & WAYPOINTFLAG_TELEPORT),
 	{
 		if(boxesoverlap(pm1, pm2, it.absmin, it.absmax))
 		{
@@ -1205,11 +1218,7 @@ void navigation_markroutes_inverted(entity fixed_source_waypoint)
 // updates the best goal according to a weighted calculation of travel cost and item value of a new proposed item
 void navigation_routerating(entity this, entity e, float f, float rangebias)
 {
-	if (!e)
-		return;
-
-	if(e.blacklisted)
-		return;
+	if (!e || e.blacklisted) { return; }
 
 	rangebias = waypoint_getlinearcost(rangebias);
 	f = waypoint_getlinearcost(f);
@@ -1599,6 +1608,16 @@ int navigation_poptouchedgoals(entity this)
 
 	if(this.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT)
 	{
+		if (!this.goalcurrent.wpisbox // warpzone
+			&& vlen2(this.origin - this.goalstack01.origin) < vlen2(this.origin - this.goalcurrent.origin))
+		{
+			navigation_poproute(this);
+			++removed_goals;
+			navigation_poproute(this);
+			++removed_goals;
+			return removed_goals;
+		}
+
 		// 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 && TELEPORT_USED(this, this.goalcurrent))
@@ -1693,8 +1712,16 @@ int navigation_poptouchedgoals(entity this)
 			gc_min = this.goalcurrent.origin - '1 1 1' * 12;
 			gc_max = this.goalcurrent.origin + '1 1 1' * 12;
 		}
-		if(!boxesoverlap(this.absmin, this.absmax, gc_min, gc_max))
-			break;
+		if (time < this.ladder_time)
+		{
+			if (!boxesoverlap(this.absmin, this.absmax - eZ * STAT(PL_MAX, this).z, gc_min, gc_max))
+				break;
+		}
+		else
+		{
+			if (!boxesoverlap(this.absmin, this.absmax, gc_min, gc_max))
+				break;
+		}
 
 		// Detect personal waypoints
 		if(this.aistatus & AI_STATUS_WAYPOINT_PERSONAL_GOING)
@@ -1868,6 +1895,17 @@ void navigation_unstuck(entity this)
 				bot_waypoint_queue_bestgoal = bot_waypoint_queue_goal;
 			}
 		}
+
+		// move to a random waypoint while bot is searching for a walkable path;
+		// this is usually sufficient to unstuck bots from bad spots or when other
+		// bots of the same team block all their ways
+		if (!bot_waypoint_queue_bestgoal && (!this.goalentity || random() < 0.1))
+		{
+			navigation_clearroute(this);
+			navigation_routetogoal(this, bot_waypoint_queue_goal, this.origin);
+			navigation_goalrating_timeout_expire(this, 1 + random() * 2);
+		}
+
 		bot_waypoint_queue_goal = bot_waypoint_queue_goal.bot_waypoint_queue_nextgoal;
 
 		if (!bot_waypoint_queue_goal)
@@ -1875,6 +1913,7 @@ void navigation_unstuck(entity this)
 			if (bot_waypoint_queue_bestgoal)
 			{
 				LOG_DEBUG(this.netname, " stuck, reachable waypoint found, heading to it");
+				navigation_clearroute(this);
 				navigation_routetogoal(this, bot_waypoint_queue_bestgoal, this.origin);
 				navigation_goalrating_timeout_set(this);
 				this.aistatus &= ~AI_STATUS_STUCK;