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

---
 userraw/maps/mp/bots/_bot.gsc          |  4 +++-
 userraw/maps/mp/bots/_bot_internal.gsc |  8 ++++----
 userraw/maps/mp/bots/_bot_script.gsc   | 20 ++++++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/userraw/maps/mp/bots/_bot.gsc b/userraw/maps/mp/bots/_bot.gsc
index 94b5707..6553922 100644
--- a/userraw/maps/mp/bots/_bot.gsc
+++ b/userraw/maps/mp/bots/_bot.gsc
@@ -67,8 +67,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/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc
index 03bbd40..fdbb467 100644
--- a/userraw/maps/mp/bots/_bot_internal.gsc
+++ b/userraw/maps/mp/bots/_bot_internal.gsc
@@ -1780,7 +1780,7 @@ aim()
 							if(!self.bot.isfraggingafter)
 							{
 								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)) //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)
 								{
 									self thread botThrowGrenade(nade);
 									self notify("kill_goal");
@@ -2252,8 +2252,8 @@ doWalk(goal, dist, isScriptGoal)
 	self thread watchOnGoal(goal, distsq);
 	
 	current = self initAStar(goal);
-	if (current >= 0 && DistanceSquared(self.origin, level.waypoints[self.bot.astar[current]].origin) < DistanceSquared(self.origin, goal))
-	{
+	//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];
@@ -2267,7 +2267,7 @@ doWalk(goal, dist, isScriptGoal)
 		
 			current = self removeAStar();
 		}
-	}
+	//}
 	
 	self.bot.next_wp = -1;
 	self.bot.second_next_wp = -1;
diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc
index af4d479..3a27e9c 100644
--- a/userraw/maps/mp/bots/_bot_script.gsc
+++ b/userraw/maps/mp/bots/_bot_script.gsc
@@ -1001,6 +1001,7 @@ onSpawned()
 		self.bot_lock_goal = false;
 		self.bot_oma_class = undefined;
 		self.help_time = undefined;
+		self.bot_was_follow_script_update = undefined;
 
 		self thread bot_dom_cap_think();
 	}
@@ -1090,17 +1091,20 @@ onBotSpawned()
 		gameFlagWait("prematch_done");
 
 		self thread bot_killstreak_think();
-		self thread bot_target_vehicle();
 		self thread bot_weapon_think();
-		self thread bot_crate_think();
-		self thread bot_turret_think();
-		self thread bot_revenge_think();
-		self thread bot_uav_think();
-		self thread bot_listen_to_steps();
-		self thread bot_equipment_kill_think();
-		self thread bot_jav_loc_think();
 		self thread bot_perk_think();
 
+		self thread bot_target_vehicle();
+		self thread bot_equipment_kill_think();
+		self thread bot_turret_think();
+
+		self thread bot_crate_think();
+		self thread bot_revenge_think();
+
+		self thread bot_uav_think();
+		self thread bot_listen_to_steps();
+
+		self thread bot_jav_loc_think();
 		self thread bot_think_follow();
 		self thread bot_think_camp();