From fc3c41abec59434025e1e2cf1596aa72207ae262 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 18 Sep 2020 11:11:40 -0600
Subject: [PATCH] more straight paths

---
 .gitignore                             |  2 ++
 userraw/maps/mp/bots/_bot_internal.gsc | 19 +++++++++++++++++--
 userraw/maps/mp/bots/_bot_utility.gsc  |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3286ec5..a37f10c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@
 *.stat
 logs/
 demos/
+images/
+weapons/
 missingasset.csv
\ No newline at end of file
diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc
index 6387e34..d4055d3 100644
--- a/userraw/maps/mp/bots/_bot_internal.gsc
+++ b/userraw/maps/mp/bots/_bot_internal.gsc
@@ -2295,9 +2295,24 @@ doWalk(goal, dist, isScriptGoal)
 	//{
 		while(current >= 0)
 		{
+			for (;;)
+			{
+				if (current <= 0)
+					break;
+
+				ppt = PlayerPhysicsTrace(self.origin + (0,0,32), level.waypoints[self.bot.astar[current-1]].origin, false, self);
+				if (DistanceSquared(level.waypoints[self.bot.astar[current-1]].origin, ppt) > 1.0)
+					break;
+
+				if (level.waypoints[self.bot.astar[current-1]].type == "climb" || level.waypoints[self.bot.astar[current]].type == "climb")
+					break;
+
+				current = self removeAStar();
+			}
+
 			self.bot.next_wp = self.bot.astar[current];
 			self.bot.second_next_wp = -1;
-			if(current != 0)
+			if(current > 0)
 				self.bot.second_next_wp = self.bot.astar[current-1];
 			
 			self notify("new_static_waypoint");
@@ -2513,7 +2528,7 @@ knife(ent, knifeDist)
 	}
 
 	if(isSubStr(curWeap, "tactical_") || usedRiot)
-		wait 0.75;
+		wait 1;
 	else
 		wait 1.5;
 
diff --git a/userraw/maps/mp/bots/_bot_utility.gsc b/userraw/maps/mp/bots/_bot_utility.gsc
index 1dda22d..17c68ba 100644
--- a/userraw/maps/mp/bots/_bot_utility.gsc
+++ b/userraw/maps/mp/bots/_bot_utility.gsc
@@ -2154,6 +2154,7 @@ botGiveLoadout( team, class, allowCopycat )
 	self maps\mp\perks\_perks::cac_selector();
 	
 	self notify ( "changed_kit" );
+	self notify( "bot_giveLoadout", allowCopycat );
 }
 
 botGetPerkUpgrade( perkName )