X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fhavocbot%2Froles.qc;h=4947c987eaadc85652bf1642af4263b2ba9fd49c;hb=3846c9bd40c2b3c1aa220c1eeef9198b1912aab4;hp=514c364ac723963e1617e17ee3bc5ac28287bbf6;hpb=6d68e7d785c375f9e4df9f6651e95b8ee43e38aa;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index 514c364ac..4947c987e 100644
--- a/qcsrc/server/bot/havocbot/roles.qc
+++ b/qcsrc/server/bot/havocbot/roles.qc
@@ -7,15 +7,17 @@
 
 void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 {
-	local entity head;
-	local entity player;
-	local float rating, d, discard, distance, friend_distance, enemy_distance;
+	entity head;
+	entity player;
+	float rating, d, discard, distance, friend_distance, enemy_distance;
+	vector o;
 	ratingscale = ratingscale * 0.0001; // items are rated around 10000 already
 	head = findchainfloat(bot_pickup, TRUE);
 
 	while (head)
 	{
-		distance = vlen(head.origin - org);
+		o = (head.absmin + head.absmax) * 0.5;
+		distance = vlen(o - org);
 		friend_distance = 10000; enemy_distance = 10000;
 		rating = 0;
 
@@ -28,7 +30,7 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 		// Check if the item can be picked up safely
 		if(head.classname == "droppedweapon")
 		{
-			traceline(head.origin, head.origin + '0 0 -1500', TRUE, world);
+			traceline(o, o + '0 0 -1500', TRUE, world);
 
 			d = pointcontents(trace_endpos + '0 0 1');
 			if(d & CONTENT_WATER || d & CONTENT_SLIME || d & CONTENT_LAVA)
@@ -53,7 +55,7 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 			}
 		}
 
-		if(teams_matter)
+		if(teamplay)
 		{
 			discard = FALSE;
 
@@ -63,7 +65,7 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 				if ( self == player || player.deadflag )
 					continue;
 
-				d = vlen(player.origin - head.origin); // distance between player and item
+				d = vlen(player.origin - o); // distance between player and item
 
 				if ( player.team == self.team )
 				{
@@ -127,11 +129,11 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 
 void havocbot_goalrating_controlpoints(float ratingscale, vector org, float sradius)
 {
-	local entity head;
+	entity head;
 	head = findchain(classname, "dom_controlpoint");
 	while (head)
 	{
-		if (vlen(head.origin - org) < sradius)
+		if (vlen(( ( head.absmin + head.absmax ) * 0.5 ) - org) < sradius)
 		{
 			if(head.cnt > -1) // this is just being fought for
 				navigation_routerating(head, ratingscale, 5000);
@@ -146,9 +148,9 @@ void havocbot_goalrating_controlpoints(float ratingscale, vector org, float srad
 
 void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradius)
 {
-	local entity head;
-	local float t, noteam, distance;
-	noteam = ((self.team == 0) || !teams_matter); // fteqcc sucks
+	entity head;
+	float t, noteam, distance;
+	noteam = ((self.team == 0) || !teamplay); // fteqcc sucks
 
 	if (autocvar_bot_nofire)
 		return;
@@ -168,6 +170,9 @@ void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradi
 			if (distance < 100 || distance > sradius)
 				continue;
 
+			if (head.freezetag_frozen)
+				continue;
+
 			if(g_minstagib)
 			if(head.items & IT_STRENGTH)
 				continue;
@@ -194,6 +199,10 @@ void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradi
 					continue;
 			}
 
+			// TODO: rate waypoints near the targetted player at that moment, instead of the player itself
+			//		 adding a player as a goal seems to be quite dangerous, especially on space maps
+			//		 remove hack in navigation_poptouchedgoals() after performing this change
+
 			t = (self.health + self.armorvalue ) / (head.health + head.armorvalue );
 			navigation_routerating(head, t * ratingscale, 2000);
 		}
@@ -274,24 +283,6 @@ void havocbot_role_race()
 	}
 };
 
-// Keepaway
-// If you don't have the ball, get it; if you do, kill people.
-void havocbot_role_ka()
-{
-	if(self.deadflag != DEAD_NO)
-		return;
-
-	if (self.bot_strategytime < time)
-	{
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-		navigation_goalrating_start();
-		havocbot_goalrating_items(10000, self.origin, 10000);
-		havocbot_goalrating_enemyplayers(20000, self.origin, 10000);
-		//havocbot_goalrating_waypoints(1, self.origin, 1000);
-		navigation_goalrating_end();
-	}
-}
-
 void havocbot_chooserole_dm()
 {
 	self.havocbot_role = havocbot_role_dm;
@@ -307,11 +298,6 @@ void havocbot_chooserole_dom()
 	self.havocbot_role = havocbot_role_dom;
 };
 
-void havocbot_chooserole_ka()
-{
-	self.havocbot_role = havocbot_role_ka;
-}
-
 void havocbot_chooserole()
 {
 	dprint("choosing a role...\n");
@@ -328,6 +314,10 @@ void havocbot_chooserole()
 		havocbot_chooserole_ons();
 	else if (g_keepaway)
 		havocbot_chooserole_ka();
+	else if (g_freezetag)
+		havocbot_chooserole_ft();
+	else if (g_assault)
+		havocbot_chooserole_ast();
 	else // assume anything else is deathmatch
 		havocbot_chooserole_dm();
 };