From: terencehill <piuntn@gmail.com>
Date: Tue, 16 May 2017 18:02:30 +0000 (+0200)
Subject: When bots are able to bunnyhop reduce travel cost of waypoint links
X-Git-Tag: xonotic-v0.8.5~2378^2~158
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5444bd39fcdcc064f706f3dea516dbc29e3b06a0;p=xonotic%2Fxonotic-data.pk3dir.git

When bots are able to bunnyhop reduce travel cost of waypoint links
---

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index 1905b7c27..3b9dd7c60 100644
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -678,6 +678,19 @@ void bot_serverframe()
 	if (time < 2)
 		return;
 
+	if(autocvar_skill != skill)
+	{
+		float wpcost_update = false;
+		if(skill >= autocvar_bot_ai_bunnyhop_skilloffset && autocvar_skill < autocvar_bot_ai_bunnyhop_skilloffset)
+			wpcost_update = true;
+		if(skill < autocvar_bot_ai_bunnyhop_skilloffset && autocvar_skill >= autocvar_bot_ai_bunnyhop_skilloffset)
+			wpcost_update = true;
+
+		skill = autocvar_skill;
+		if (wpcost_update)
+			waypoint_updatecost_foralllinks();
+	}
+
 	bot_calculate_stepheightvec();
 	bot_navigation_movemode = ((autocvar_bot_navigation_ignoreplayers) ? MOVE_NOMONSTERS : MOVE_NORMAL);
 
diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index 54f3c8fc4..73c901be6 100644
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -391,8 +391,49 @@ bool waypoint_islinked(entity from, entity to)
 	return false;
 }
 
+void waypoint_updatecost_foralllinks()
+{
+	IL_EACH(g_waypoints, !(it.wpflags & WAYPOINTFLAG_TELEPORT),
+	{
+		if(it.wp00) it.wp00mincost = waypoint_getlinkcost(it, it.wp00);
+		if(it.wp01) it.wp01mincost = waypoint_getlinkcost(it, it.wp01);
+		if(it.wp02) it.wp02mincost = waypoint_getlinkcost(it, it.wp02);
+		if(it.wp03) it.wp03mincost = waypoint_getlinkcost(it, it.wp03);
+		if(it.wp04) it.wp04mincost = waypoint_getlinkcost(it, it.wp04);
+		if(it.wp05) it.wp05mincost = waypoint_getlinkcost(it, it.wp05);
+		if(it.wp06) it.wp06mincost = waypoint_getlinkcost(it, it.wp06);
+		if(it.wp07) it.wp07mincost = waypoint_getlinkcost(it, it.wp07);
+		if(it.wp08) it.wp08mincost = waypoint_getlinkcost(it, it.wp08);
+		if(it.wp09) it.wp09mincost = waypoint_getlinkcost(it, it.wp09);
+		if(it.wp10) it.wp10mincost = waypoint_getlinkcost(it, it.wp10);
+		if(it.wp11) it.wp11mincost = waypoint_getlinkcost(it, it.wp11);
+		if(it.wp12) it.wp12mincost = waypoint_getlinkcost(it, it.wp12);
+		if(it.wp13) it.wp13mincost = waypoint_getlinkcost(it, it.wp13);
+		if(it.wp14) it.wp14mincost = waypoint_getlinkcost(it, it.wp14);
+		if(it.wp15) it.wp15mincost = waypoint_getlinkcost(it, it.wp15);
+		if(it.wp16) it.wp16mincost = waypoint_getlinkcost(it, it.wp16);
+		if(it.wp17) it.wp17mincost = waypoint_getlinkcost(it, it.wp17);
+		if(it.wp18) it.wp18mincost = waypoint_getlinkcost(it, it.wp18);
+		if(it.wp19) it.wp19mincost = waypoint_getlinkcost(it, it.wp19);
+		if(it.wp20) it.wp20mincost = waypoint_getlinkcost(it, it.wp20);
+		if(it.wp21) it.wp21mincost = waypoint_getlinkcost(it, it.wp21);
+		if(it.wp22) it.wp22mincost = waypoint_getlinkcost(it, it.wp22);
+		if(it.wp23) it.wp23mincost = waypoint_getlinkcost(it, it.wp23);
+		if(it.wp24) it.wp24mincost = waypoint_getlinkcost(it, it.wp24);
+		if(it.wp25) it.wp25mincost = waypoint_getlinkcost(it, it.wp25);
+		if(it.wp26) it.wp26mincost = waypoint_getlinkcost(it, it.wp26);
+		if(it.wp27) it.wp27mincost = waypoint_getlinkcost(it, it.wp27);
+		if(it.wp28) it.wp28mincost = waypoint_getlinkcost(it, it.wp28);
+		if(it.wp29) it.wp29mincost = waypoint_getlinkcost(it, it.wp29);
+		if(it.wp30) it.wp30mincost = waypoint_getlinkcost(it, it.wp30);
+		if(it.wp31) it.wp31mincost = waypoint_getlinkcost(it, it.wp31);
+	});
+}
+
 float waypoint_getdistancecost_simple(float dist)
 {
+	if(skill >= autocvar_bot_ai_bunnyhop_skilloffset)
+		return dist / (autocvar_sv_maxspeed * 1.25);
 	return dist / autocvar_sv_maxspeed;
 }
 
diff --git a/qcsrc/server/bot/default/waypoints.qh b/qcsrc/server/bot/default/waypoints.qh
index 1351bba61..1d3554f85 100644
--- a/qcsrc/server/bot/default/waypoints.qh
+++ b/qcsrc/server/bot/default/waypoints.qh
@@ -41,6 +41,7 @@ void waypoint_schedulerelink(entity wp);
 float waypoint_getlinkcost(entity from, entity to);
 float waypoint_getdistancecost(vector v1, vector v2);
 float waypoint_getdistancecost_simple(float dist);
+void waypoint_updatecost_foralllinks();
 
 void waypoint_remove_fromeditor(entity pl);
 void waypoint_remove(entity wp);
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 144821879..cf56e23ba 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -217,8 +217,6 @@ void StartFrame()
 	if (timeout_status == TIMEOUT_LEADTIME) // just before the timeout (when timeout_status will be TIMEOUT_ACTIVE)
 		orig_slowmo = autocvar_slowmo; // slowmo will be restored after the timeout
 
-	skill = autocvar_skill;
-
 	// detect when the pre-game countdown (if any) has ended and the game has started
 	game_delay = (time < game_starttime);