X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fdefault%2Fwaypoints.qc;h=ff376c2ed56ffda2a5c1ad373168c35ee0fceef1;hp=bab99b30479e82bc61d90e4553335eb998e65647;hb=10388420368e98086971ae421c68f44f44ba74bb;hpb=e7e4e095eaeac5b8dbc60723f239547bdee88ef5

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index bab99b3047..ff376c2ed5 100644
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -128,7 +128,7 @@ void waypoint_unreachable(entity pl)
 	if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked to (marked with blue light)\n", j);
 }
 
-vector waypoint_getSymmetricalOrigin(vector org, int ctf_flags)
+vector waypoint_getSymmetricalPoint(vector org, int ctf_flags)
 {
 	vector new_org = org;
 	if (fabs(autocvar_g_waypointeditor_symmetrical) == 1)
@@ -251,6 +251,8 @@ void waypoint_spawn_fromeditor(entity pl)
 	           || (autocvar_g_waypointeditor_symmetrical < 0));
 	if(autocvar_g_waypointeditor_symmetrical_order >= 2)
 		ctf_flags = autocvar_g_waypointeditor_symmetrical_order;
+	if (sym && ctf_flags < 2)
+		ctf_flags = 2;
 	int wp_num = ctf_flags;
 
 	if(!PHYS_INPUT_BUTTON_CROUCH(pl))
@@ -279,7 +281,7 @@ void waypoint_spawn_fromeditor(entity pl)
 	bprint(strcat("Waypoint spawned at ", vtos(e.origin), "\n"));
 	if(sym)
 	{
-		org = waypoint_getSymmetricalOrigin(e.origin, ctf_flags);
+		org = waypoint_getSymmetricalPoint(e.origin, ctf_flags);
 		if (vdist(org - pl.origin, >, 32))
 		{
 			if(wp_num > 2)
@@ -310,6 +312,8 @@ void waypoint_remove_fromeditor(entity pl)
 	           || (autocvar_g_waypointeditor_symmetrical < 0));
 	if(autocvar_g_waypointeditor_symmetrical_order >= 2)
 		ctf_flags = autocvar_g_waypointeditor_symmetrical_order;
+	if (sym && ctf_flags < 2)
+		ctf_flags = 2;
 	int wp_num = ctf_flags;
 
 	LABEL(remove_wp);
@@ -325,7 +329,7 @@ void waypoint_remove_fromeditor(entity pl)
 	entity wp_sym = NULL;
 	if (sym)
 	{
-		vector org = waypoint_getSymmetricalOrigin(e.origin, ctf_flags);
+		vector org = waypoint_getSymmetricalPoint(e.origin, ctf_flags);
 		FOREACH_ENTITY_CLASS("waypoint", !(it.wpflags & WAYPOINTFLAG_GENERATED), {
 			if(vdist(org - it.origin, <, 3))
 			{
@@ -354,52 +358,65 @@ void waypoint_removelink(entity from, entity to)
 	if (from == to || (from.wpflags & WAYPOINTFLAG_NORELINK))
 		return;
 
-	bool found = false;
-	if (!found && from.wp00 == to) found = true; if (found) {from.wp00 = from.wp01; from.wp00mincost = from.wp01mincost;}
-	if (!found && from.wp01 == to) found = true; if (found) {from.wp01 = from.wp02; from.wp01mincost = from.wp02mincost;}
-	if (!found && from.wp02 == to) found = true; if (found) {from.wp02 = from.wp03; from.wp02mincost = from.wp03mincost;}
-	if (!found && from.wp03 == to) found = true; if (found) {from.wp03 = from.wp04; from.wp03mincost = from.wp04mincost;}
-	if (!found && from.wp04 == to) found = true; if (found) {from.wp04 = from.wp05; from.wp04mincost = from.wp05mincost;}
-	if (!found && from.wp05 == to) found = true; if (found) {from.wp05 = from.wp06; from.wp05mincost = from.wp06mincost;}
-	if (!found && from.wp06 == to) found = true; if (found) {from.wp06 = from.wp07; from.wp06mincost = from.wp07mincost;}
-	if (!found && from.wp07 == to) found = true; if (found) {from.wp07 = from.wp08; from.wp07mincost = from.wp08mincost;}
-	if (!found && from.wp08 == to) found = true; if (found) {from.wp08 = from.wp09; from.wp08mincost = from.wp09mincost;}
-	if (!found && from.wp09 == to) found = true; if (found) {from.wp09 = from.wp10; from.wp09mincost = from.wp10mincost;}
-	if (!found && from.wp10 == to) found = true; if (found) {from.wp10 = from.wp11; from.wp10mincost = from.wp11mincost;}
-	if (!found && from.wp11 == to) found = true; if (found) {from.wp11 = from.wp12; from.wp11mincost = from.wp12mincost;}
-	if (!found && from.wp12 == to) found = true; if (found) {from.wp12 = from.wp13; from.wp12mincost = from.wp13mincost;}
-	if (!found && from.wp13 == to) found = true; if (found) {from.wp13 = from.wp14; from.wp13mincost = from.wp14mincost;}
-	if (!found && from.wp14 == to) found = true; if (found) {from.wp14 = from.wp15; from.wp14mincost = from.wp15mincost;}
-	if (!found && from.wp15 == to) found = true; if (found) {from.wp15 = from.wp16; from.wp15mincost = from.wp16mincost;}
-	if (!found && from.wp16 == to) found = true; if (found) {from.wp16 = from.wp17; from.wp16mincost = from.wp17mincost;}
-	if (!found && from.wp17 == to) found = true; if (found) {from.wp17 = from.wp18; from.wp17mincost = from.wp18mincost;}
-	if (!found && from.wp18 == to) found = true; if (found) {from.wp18 = from.wp19; from.wp18mincost = from.wp19mincost;}
-	if (!found && from.wp19 == to) found = true; if (found) {from.wp19 = from.wp20; from.wp19mincost = from.wp20mincost;}
-	if (!found && from.wp20 == to) found = true; if (found) {from.wp20 = from.wp21; from.wp20mincost = from.wp21mincost;}
-	if (!found && from.wp21 == to) found = true; if (found) {from.wp21 = from.wp22; from.wp21mincost = from.wp22mincost;}
-	if (!found && from.wp22 == to) found = true; if (found) {from.wp22 = from.wp23; from.wp22mincost = from.wp23mincost;}
-	if (!found && from.wp23 == to) found = true; if (found) {from.wp23 = from.wp24; from.wp23mincost = from.wp24mincost;}
-	if (!found && from.wp24 == to) found = true; if (found) {from.wp24 = from.wp25; from.wp24mincost = from.wp25mincost;}
-	if (!found && from.wp25 == to) found = true; if (found) {from.wp25 = from.wp26; from.wp25mincost = from.wp26mincost;}
-	if (!found && from.wp26 == to) found = true; if (found) {from.wp26 = from.wp27; from.wp26mincost = from.wp27mincost;}
-	if (!found && from.wp27 == to) found = true; if (found) {from.wp27 = from.wp28; from.wp27mincost = from.wp28mincost;}
-	if (!found && from.wp28 == to) found = true; if (found) {from.wp28 = from.wp29; from.wp28mincost = from.wp29mincost;}
-	if (!found && from.wp29 == to) found = true; if (found) {from.wp29 = from.wp30; from.wp29mincost = from.wp30mincost;}
-	if (!found && from.wp30 == to) found = true; if (found) {from.wp30 = from.wp31; from.wp30mincost = from.wp31mincost;}
-	if (found) {from.wp31 = NULL; from.wp31mincost = 10000000;}
+	entity fromwp31_prev = from.wp31;
+
+	switch (waypoint_getlinknum(from, to))
+	{
+		// fallthrough all the way
+		case 00: from.wp00 = from.wp01; from.wp00mincost = from.wp01mincost;
+		case 01: from.wp01 = from.wp02; from.wp01mincost = from.wp02mincost;
+		case 02: from.wp02 = from.wp03; from.wp02mincost = from.wp03mincost;
+		case 03: from.wp03 = from.wp04; from.wp03mincost = from.wp04mincost;
+		case 04: from.wp04 = from.wp05; from.wp04mincost = from.wp05mincost;
+		case 05: from.wp05 = from.wp06; from.wp05mincost = from.wp06mincost;
+		case 06: from.wp06 = from.wp07; from.wp06mincost = from.wp07mincost;
+		case 07: from.wp07 = from.wp08; from.wp07mincost = from.wp08mincost;
+		case 08: from.wp08 = from.wp09; from.wp08mincost = from.wp09mincost;
+		case 09: from.wp09 = from.wp10; from.wp09mincost = from.wp10mincost;
+		case 10: from.wp10 = from.wp11; from.wp10mincost = from.wp11mincost;
+		case 11: from.wp11 = from.wp12; from.wp11mincost = from.wp12mincost;
+		case 12: from.wp12 = from.wp13; from.wp12mincost = from.wp13mincost;
+		case 13: from.wp13 = from.wp14; from.wp13mincost = from.wp14mincost;
+		case 14: from.wp14 = from.wp15; from.wp14mincost = from.wp15mincost;
+		case 15: from.wp15 = from.wp16; from.wp15mincost = from.wp16mincost;
+		case 16: from.wp16 = from.wp17; from.wp16mincost = from.wp17mincost;
+		case 17: from.wp17 = from.wp18; from.wp17mincost = from.wp18mincost;
+		case 18: from.wp18 = from.wp19; from.wp18mincost = from.wp19mincost;
+		case 19: from.wp19 = from.wp20; from.wp19mincost = from.wp20mincost;
+		case 20: from.wp20 = from.wp21; from.wp20mincost = from.wp21mincost;
+		case 21: from.wp21 = from.wp22; from.wp21mincost = from.wp22mincost;
+		case 22: from.wp22 = from.wp23; from.wp22mincost = from.wp23mincost;
+		case 23: from.wp23 = from.wp24; from.wp23mincost = from.wp24mincost;
+		case 24: from.wp24 = from.wp25; from.wp24mincost = from.wp25mincost;
+		case 25: from.wp25 = from.wp26; from.wp25mincost = from.wp26mincost;
+		case 26: from.wp26 = from.wp27; from.wp26mincost = from.wp27mincost;
+		case 27: from.wp27 = from.wp28; from.wp27mincost = from.wp28mincost;
+		case 28: from.wp28 = from.wp29; from.wp28mincost = from.wp29mincost;
+		case 29: from.wp29 = from.wp30; from.wp29mincost = from.wp30mincost;
+		case 30: from.wp30 = from.wp31; from.wp30mincost = from.wp31mincost;
+		case 31: from.wp31 = NULL; from.wp31mincost = 10000000;
+	}
+
+	if (fromwp31_prev && !from.wp31)
+		waypoint_schedulerelink(from);
+}
+
+int waypoint_getlinknum(entity from, entity to)
+{
+	if (from.wp00 == to) return 00; if (from.wp01 == to) return 01; if (from.wp02 == to) return 02; if (from.wp03 == to) return 03;
+	if (from.wp04 == to) return 04; if (from.wp05 == to) return 05; if (from.wp06 == to) return 06; if (from.wp07 == to) return 07;
+	if (from.wp08 == to) return 08; if (from.wp09 == to) return 09; if (from.wp10 == to) return 10; if (from.wp11 == to) return 11;
+	if (from.wp12 == to) return 12; if (from.wp13 == to) return 13; if (from.wp14 == to) return 14; if (from.wp15 == to) return 15;
+	if (from.wp16 == to) return 16; if (from.wp17 == to) return 17; if (from.wp18 == to) return 18; if (from.wp19 == to) return 19;
+	if (from.wp20 == to) return 20; if (from.wp21 == to) return 21; if (from.wp22 == to) return 22; if (from.wp23 == to) return 23;
+	if (from.wp24 == to) return 24; if (from.wp25 == to) return 25; if (from.wp26 == to) return 26; if (from.wp27 == to) return 27;
+	if (from.wp28 == to) return 28; if (from.wp29 == to) return 29; if (from.wp30 == to) return 30; if (from.wp31 == to) return 31;
+	return -1;
 }
 
 bool waypoint_islinked(entity from, entity to)
 {
-	if (from.wp00 == to) return true;if (from.wp01 == to) return true;if (from.wp02 == to) return true;if (from.wp03 == to) return true;
-	if (from.wp04 == to) return true;if (from.wp05 == to) return true;if (from.wp06 == to) return true;if (from.wp07 == to) return true;
-	if (from.wp08 == to) return true;if (from.wp09 == to) return true;if (from.wp10 == to) return true;if (from.wp11 == to) return true;
-	if (from.wp12 == to) return true;if (from.wp13 == to) return true;if (from.wp14 == to) return true;if (from.wp15 == to) return true;
-	if (from.wp16 == to) return true;if (from.wp17 == to) return true;if (from.wp18 == to) return true;if (from.wp19 == to) return true;
-	if (from.wp20 == to) return true;if (from.wp21 == to) return true;if (from.wp22 == to) return true;if (from.wp23 == to) return true;
-	if (from.wp24 == to) return true;if (from.wp25 == to) return true;if (from.wp26 == to) return true;if (from.wp27 == to) return true;
-	if (from.wp28 == to) return true;if (from.wp29 == to) return true;if (from.wp30 == to) return true;if (from.wp31 == to) return true;
-	return false;
+	return (waypoint_getlinknum(from, to) >= 0);
 }
 
 void waypoint_updatecost_foralllinks()
@@ -898,7 +915,7 @@ void waypoint_load_or_remove_links_hardwired(bool removal_mode)
 			if(!found)
 			{
 				if(!removal_mode)
-					LOG_INFO("NOTICE: Can not find waypoint at ", vtos(wp_from_pos), ". Path skipped");
+					LOG_INFO("NOTICE: Can not find origin waypoint for the hardwired link ", s, ". Path skipped");
 				continue;
 			}
 		}
@@ -920,7 +937,7 @@ void waypoint_load_or_remove_links_hardwired(bool removal_mode)
 		if(!found)
 		{
 			if(!removal_mode)
-				LOG_INFO("NOTICE: Can not find waypoint at ", vtos(wp_to_pos), ". Path skipped");
+				LOG_INFO("NOTICE: Can not find destination waypoint for the hardwired link ", s, ". Path skipped");
 			continue;
 		}
 
@@ -1012,6 +1029,7 @@ void waypoint_save_links()
 			entity link = waypoint_get_link(it, j);
 			if(link)
 			{
+				// NOTE: vtos rounds vector components to 1 decimal place
 				string s = strcat(vtos(it.origin), "*", vtos(link.origin), "\n");
 				fputs(file, s);
 				++c;
@@ -1084,6 +1102,7 @@ void waypoint_saveall()
 			continue;
 
 		string s;
+		// NOTE: vtos rounds vector components to 1 decimal place
 		s = strcat(vtos(it.origin + it.mins), "\n");
 		s = strcat(s, vtos(it.origin + it.maxs));
 		s = strcat(s, "\n");
@@ -1278,19 +1297,42 @@ void waypoint_spawnforteleporter_boxes(entity e, int teleport_flag, vector org1,
 	e.nearestwaypointtimeout = -1;
 }
 
-void waypoint_spawnforteleporter_wz(entity e, vector org, vector destination, float timetaken, vector down_dir, entity tracetest_ent)
+void waypoint_spawnforteleporter_wz(entity e, entity tracetest_ent)
 {
-	// warpzones with oblique warp plane rely on down_dir to snap waypoints
-	// to the ground without leaving the warp plane
-	// warpzones with horizontal warp plane (down_dir.x == -1) generate
-	// destination waypoint snapped to the ground (leaving warpzone), source
-	// waypoint in the center of the warp plane
-	if(down_dir.x != -1)
-		org = waypoint_fixorigin_down_dir(org, tracetest_ent, down_dir);
-	if(down_dir.x == -1)
-		down_dir = '0 0 -1';
-	destination = waypoint_fixorigin_down_dir(destination, tracetest_ent, down_dir);
-	waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, org, org, destination, destination, timetaken);
+	float src_angle = e.warpzone_angles.x;
+	while (src_angle < -180) src_angle += 360;
+	while (src_angle > 180) src_angle -= 360;
+
+	float dest_angle = e.enemy.warpzone_angles.x;
+	while (dest_angle < -180) dest_angle += 360;
+	while (dest_angle > 180) dest_angle -= 360;
+
+	// no waypoints for warpzones pointing upwards, they can't be used by the bots
+	if (src_angle == -90 || dest_angle == -90)
+		return;
+
+	makevectors(e.warpzone_angles);
+	vector src = (e.absmin + e.absmax) * 0.5;
+	src += ((e.warpzone_origin - src) * v_forward) * v_forward + 16 * v_right;
+	vector down_dir_src = -v_up;
+
+	makevectors(e.enemy.warpzone_angles);
+	vector dest = (e.enemy.absmin + e.enemy.absmax) * 0.5;
+	dest += ((e.enemy.warpzone_origin - dest) * v_forward) * v_forward - 16 * v_right;
+	vector down_dir_dest = -v_up;
+
+	int extra_flag = 0;
+	// don't snap to the ground waypoints for source warpzones pointing downwards
+	if (src_angle != 90)
+	{
+		src = waypoint_fixorigin_down_dir(src, tracetest_ent, down_dir_src);
+		dest = waypoint_fixorigin_down_dir(dest, tracetest_ent, down_dir_dest);
+		// oblique warpzones need a jump otherwise bots gets stuck
+		if (src_angle != 0)
+			extra_flag = WAYPOINTFLAG_JUMP;
+	}
+
+	waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT | extra_flag, src, src, dest, dest, 0);
 }
 
 void waypoint_spawnforteleporter(entity e, vector destination, float timetaken, entity tracetest_ent)