From b94d247135b36460d1d6be54284ba979d80f42f0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 7 Sep 2020 14:22:34 -0600
Subject: [PATCH] update

---
 main_shared/maps/mp/bots/_bot.gsc          |  4 +-
 main_shared/maps/mp/bots/_bot_internal.gsc | 47 +++++++++++++---------
 main_shared/maps/mp/bots/_bot_utility.gsc  |  9 ++++-
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/main_shared/maps/mp/bots/_bot.gsc b/main_shared/maps/mp/bots/_bot.gsc
index f7a8701..4398645 100644
--- a/main_shared/maps/mp/bots/_bot.gsc
+++ b/main_shared/maps/mp/bots/_bot.gsc
@@ -63,8 +63,10 @@ init()
 	
 	level.bots_minSprintDistance = 315;
 	level.bots_minSprintDistance *= level.bots_minSprintDistance;
-	level.bots_minGrenadeDistance = 375;
+	level.bots_minGrenadeDistance = 256;
 	level.bots_minGrenadeDistance *= level.bots_minGrenadeDistance;
+	level.bots_maxGrenadeDistance = 1024;
+	level.bots_maxGrenadeDistance *= level.bots_maxGrenadeDistance;
 	level.bots_maxKnifeDistance = 80;
 	level.bots_maxKnifeDistance *= level.bots_maxKnifeDistance;
 	level.bots_goalDistance = 27.5;
diff --git a/main_shared/maps/mp/bots/_bot_internal.gsc b/main_shared/maps/mp/bots/_bot_internal.gsc
index 2101cd3..b84d4a0 100644
--- a/main_shared/maps/mp/bots/_bot_internal.gsc
+++ b/main_shared/maps/mp/bots/_bot_internal.gsc
@@ -809,6 +809,7 @@ aim()
 			continue;
 			
 		aimspeed = self.pers["bots"]["skill"]["aim_time"];
+		eyePos = self getEyePos();
 		if(self IsStunned() || self isArtShocked())
 			aimspeed = 1;
 		
@@ -827,7 +828,6 @@ aim()
 				offset = self.bot.target.offset;
 				dist = self.bot.target.dist;
 				curweap = self getCurrentWeapon();
-				eyePos = self getEyePos();
 				angles = self GetPlayerAngles();
 				rand = self.bot.target.rand;
 				no_trace_ads_time = self.pers["bots"]["skill"]["no_trace_ads_time"];
@@ -850,7 +850,7 @@ aim()
 							if(!self.bot.isfraggingafter && !self.bot.issmokingafter)
 							{
 								nade = self getValidGrenade();
-								if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(myEye, myEye + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target)) // level.bots_minGrenadeDistance
+								if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(myEye, myEye + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target) && dist > level.bots_minGrenadeDistance && dist < level.bots_maxGrenadeDistance)
 								{
 									if(nade == "frag_grenade_mp")
 										self thread frag(2.5);
@@ -922,7 +922,17 @@ aim()
 			}
 		}
 		
-		if (!isDefined(self.bot.script_aimpos))
+		if (self.bot.next_wp != -1 && isDefined(level.waypoints[self.bot.next_wp].angles) && false)
+		{
+			forwardPos = anglesToForward(level.waypoints[self.bot.next_wp].angles) * 1024;
+
+			self botLookAt(eyePos + forwardPos, aimspeed);
+		}
+		else if (isDefined(self.bot.script_aimpos))
+		{
+			self botLookAt(self.bot.script_aimpos, aimspeed);
+		}
+		else
 		{
 			lookat = undefined;
 			if(self.bot.second_next_wp != -1 && !self.bot.issprinting)
@@ -933,10 +943,6 @@ aim()
 			if(isDefined(lookat))
 				self botLookAt(lookat + (0, 0, self getEyeHeight()), aimspeed);
 		}
-		else
-		{
-			self botLookAt(self.bot.script_aimpos, aimspeed);
-		}
 	}
 }
 
@@ -1290,19 +1296,22 @@ doWalk(goal, dist, isScriptGoal)
 	self thread watchOnGoal(goal, distsq);
 	
 	current = self initAStar(goal);
-	while(current >= 0)
-	{
-		self.bot.next_wp = self.bot.astar[current];
-		self.bot.second_next_wp = -1;
-		if(current != 0)
-			self.bot.second_next_wp = self.bot.astar[current-1];
+	//if (current >= 0 && DistanceSquared(self.origin, level.waypoints[self.bot.astar[current]].origin) < DistanceSquared(self.origin, goal))
+	//{
+		while(current >= 0)
+		{
+			self.bot.next_wp = self.bot.astar[current];
+			self.bot.second_next_wp = -1;
+			if(current != 0)
+				self.bot.second_next_wp = self.bot.astar[current-1];
+			
+			self notify("new_static_waypoint");
+			
+			self movetowards(level.waypoints[self.bot.next_wp].origin);
 		
-		self notify("new_static_waypoint");
-		
-		self movetowards(level.waypoints[self.bot.next_wp].origin);
-	
-		current = self removeAStar();
-	}
+			current = self removeAStar();
+		}
+	//}
 	
 	self.bot.next_wp = -1;
 	self.bot.second_next_wp = -1;
diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc
index 1b5bc01..6351d76 100644
--- a/main_shared/maps/mp/bots/_bot_utility.gsc
+++ b/main_shared/maps/mp/bots/_bot_utility.gsc
@@ -116,7 +116,12 @@ SetAttacker(att)
 */
 HasScriptGoal()
 {
-	return (isDefined(self.bot.script_goal));
+	return (isDefined(self GetScriptGoal()));
+}
+
+GetScriptGoal()
+{
+	return self.bot.script_goal;
 }
 
 /*
@@ -124,6 +129,8 @@ HasScriptGoal()
 */
 SetScriptGoal(goal, dist)
 {
+	if (!isDefined(dist))
+		dist = 16;
 	self.bot.script_goal = goal;
 	self.bot.script_goal_dist = dist;
 	waittillframeend;