From: terencehill <piuntn@gmail.com>
Date: Sun, 24 Jun 2018 13:55:23 +0000 (+0200)
Subject: Bot AI: Attempt to improve freezetag roles (less priority to unfrozen teammates)
X-Git-Tag: xonotic-v0.8.5~1923^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=580499c326841f50267d1c2071d1885d603d56db;p=xonotic%2Fxonotic-data.pk3dir.git

Bot AI: Attempt to improve freezetag roles (less priority to unfrozen teammates)
---

diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
index f97638370..2ca0ba6a9 100644
--- a/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
@@ -220,9 +220,10 @@ float freezetag_isEliminated(entity e)
 void(entity this) havocbot_role_ft_freeing;
 void(entity this) havocbot_role_ft_offense;
 
-void havocbot_goalrating_freeplayers(entity this, float ratingscale, vector org, float sradius)
+void havocbot_goalrating_ft_freeplayers(entity this, float ratingscale, vector org, float sradius)
 {
-	float t;
+	entity best_pl = NULL;
+	float best_dist2 = FLOAT_MAX;
 	FOREACH_CLIENT(IS_PLAYER(it) && it != this && SAME_TEAM(it, this), {
 		if (STAT(FROZEN, it) == 1)
 		{
@@ -230,14 +231,24 @@ void havocbot_goalrating_freeplayers(entity this, float ratingscale, vector org,
 				continue;
 			navigation_routerating(this, it, ratingscale, 2000);
 		}
-		else if(vdist(it.origin - org, >, 400)) // avoid gathering all teammates in one place
+		else if (best_dist2
+			&& GetResourceAmount(it, RESOURCE_HEALTH) < GetResourceAmount(this, RESOURCE_HEALTH) + 30
+			&& vlen2(it.origin - org) < best_dist2)
 		{
 			// If teamate is not frozen still seek them out as fight better
 			// in a group.
-			t = 0.2 * 150 / (GetResourceAmount(this, RESOURCE_HEALTH) + GetResourceAmount(this, RESOURCE_ARMOR));
-			navigation_routerating(this, it, t * ratingscale, 2000);
+			best_dist2 = vlen2(it.origin - org);
+			if (best_dist2 < 700 ** 2)
+			{
+				best_pl = NULL;
+				best_dist2 = 0; // already close to a teammate
+			}
+			else
+				best_pl = it;
 		}
 	});
+	if (best_pl)
+		navigation_routerating(this, best_pl, ratingscale / 2, 2000);
 }
 
 void havocbot_role_ft_offense(entity this)
@@ -264,9 +275,9 @@ void havocbot_role_ft_offense(entity this)
 	if (navigation_goalrating_timeout(this))
 	{
 		navigation_goalrating_start(this);
-		havocbot_goalrating_items(this, 10000, this.origin, 10000);
+		havocbot_goalrating_items(this, 12000, this.origin, 10000);
 		havocbot_goalrating_enemyplayers(this, 10000, this.origin, 10000);
-		havocbot_goalrating_freeplayers(this, 9000, this.origin, 10000);
+		havocbot_goalrating_ft_freeplayers(this, 9000, this.origin, 10000);
 		havocbot_goalrating_waypoints(this, 1, this.origin, 3000);
 		navigation_goalrating_end(this);
 
@@ -293,9 +304,9 @@ void havocbot_role_ft_freeing(entity this)
 	if (navigation_goalrating_timeout(this))
 	{
 		navigation_goalrating_start(this);
-		havocbot_goalrating_items(this, 8000, this.origin, 10000);
+		havocbot_goalrating_items(this, 10000, this.origin, 10000);
 		havocbot_goalrating_enemyplayers(this, 5000, this.origin, 10000);
-		havocbot_goalrating_freeplayers(this, 20000, this.origin, 10000);
+		havocbot_goalrating_ft_freeplayers(this, 20000, this.origin, 10000);
 		havocbot_goalrating_waypoints(this, 1, this.origin, 3000);
 		navigation_goalrating_end(this);