From a130a9ecb05681828fe5bf7c54868a7e23873ffc Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 18 Aug 2020 15:03:40 -0600
Subject: [PATCH] ll

---
 userraw/maps/mp/bots/_bot.gsc          |  3 ++
 userraw/maps/mp/bots/_bot_internal.gsc |  6 +--
 userraw/maps/mp/bots/_bot_script.gsc   | 10 ++---
 userraw/maps/mp/bots/_bot_utility.gsc  | 51 ++++++++++++++------------
 4 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/userraw/maps/mp/bots/_bot.gsc b/userraw/maps/mp/bots/_bot.gsc
index 5ba4a2d..8e7ad7e 100644
--- a/userraw/maps/mp/bots/_bot.gsc
+++ b/userraw/maps/mp/bots/_bot.gsc
@@ -140,6 +140,9 @@ handleBots()
 	level thread diffBots();
 	level addBots();
 
+	while(!level.intermission)
+		wait 0.05;
+
 	setDvar("bots_manage_add", getBotArray().size);
 }
 
diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc
index 0f1657a..e7de4e2 100644
--- a/userraw/maps/mp/bots/_bot_internal.gsc
+++ b/userraw/maps/mp/bots/_bot_internal.gsc
@@ -1078,7 +1078,7 @@ grenade_danager()
 
 		curWeap = self GetCurrentWeapon();
 
-		if (!isWeaponDroppable(curWeap))
+		if (!isWeaponPrimary(curWeap))
 			continue;
 
 		myEye = self getEye();
@@ -2138,7 +2138,7 @@ knife(ent, knifeDist)
 
 	curWeap = self GetCurrentWeapon();
 
-	if (!isWeaponDroppable(curWeap))
+	if (!isWeaponPrimary(curWeap))
 		return;
 
 	if (self.bot.knifing || self.bot.isfraggingafter)
@@ -2316,7 +2316,7 @@ botThrowGrenade(grenName)
 
 	curWeap = self GetCurrentWeapon();
 
-	if (!isWeaponDroppable(curWeap))
+	if (!isWeaponPrimary(curWeap))
 		return "cur weap is not droppable";
 
 	if (self.bot.knifingafter)
diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc
index 7126ed3..e0c96d8 100644
--- a/userraw/maps/mp/bots/_bot_script.gsc
+++ b/userraw/maps/mp/bots/_bot_script.gsc
@@ -258,7 +258,7 @@ getKillstreaks()
 	{
 		streak_name = tableLookupByRow( "mp/killstreakTable.csv", i, 1 );
 
-		if(streak_name == "")
+		if(streak_name == "" || streak_name == "none")
 			continue;
 
 		if(streak_name == "b1")
@@ -1052,7 +1052,7 @@ bot_weapon_think()
 			}
 		}
 		
-		if(curWeap != "none" && self getAmmoCount(curWeap) && curWeap != "stinger_mp" && curWeap != "javelin_mp")
+		if(curWeap != "none" && self getAmmoCount(curWeap) && curWeap != "stinger_mp" && curWeap != "javelin_mp" && curWeap != "onemanarmy_mp")
 		{
 			if(randomInt(100) > self.pers["bots"]["behavior"]["switch"])
 				continue;
@@ -1071,10 +1071,10 @@ bot_weapon_think()
 			if(!self getAmmoCount(weapon))
 				continue;
 					
-			if (!isWeaponDroppable(weapon))
+			if (!isWeaponPrimary(weapon))
 				continue;
 				
-			if(curWeap == weapon || weapon == "none" || weapon == "")
+			if(curWeap == weapon || weapon == "none" || weapon == "" || weapon == "javelin_mp" || weapon == "stinger_mp" || weapon == "onemanarmy_mp")
 				continue;
 				
 			weap = weapon;
@@ -1253,7 +1253,7 @@ bot_killstreak_think()
 			continue;
 
 		curWeap = self GetCurrentWeapon();
-		if (!isWeaponDroppable(curWeap))
+		if (!isWeaponPrimary(curWeap))
 			continue;
 
 		if (self isEMPed())
diff --git a/userraw/maps/mp/bots/_bot_utility.gsc b/userraw/maps/mp/bots/_bot_utility.gsc
index bba6228..9a6f73b 100644
--- a/userraw/maps/mp/bots/_bot_utility.gsc
+++ b/userraw/maps/mp/bots/_bot_utility.gsc
@@ -13,11 +13,6 @@ is_bot()
 	return ((isDefined(self.pers["isBot"]) && self.pers["isBot"]) || (isDefined(self.pers["isBotWarfare"]) && self.pers["isBotWarfare"]) || isSubStr( self.guid, "bot" ));
 }
 
-entIsVehicle(ent)
-{
-	return (ent.classname == "script_vehicle" || ent.model == "vehicle_uav_static_mp" || ent.model == "vehicle_ac130_coop");
-}
-
 /*
 	Returns how much the bot is ads'ing all the way.
 */
@@ -167,19 +162,6 @@ GetThreat()
 	return self.bot.target.entity;
 }
 
-/*
-	Returns if the given weapon is full auto.
-*/
-WeaponIsFullAuto(weap)
-{
-	weaptoks = strtok(weap, "_");
-
-	assert(isDefined(weaptoks[0]));
-	assert(isString(weaptoks[0]));
-	
-	return !isDefined(level.bots_nonfullautoguns[weaptoks[0]]);
-}
-
 /*
 	Returns if the bot has a script enemy.
 */
@@ -201,6 +183,34 @@ IsBotKnifing()
 	return self.bot.knifing;
 }
 
+getBotVelocity()
+{
+	return self.bot.velocity;
+}
+
+isWeaponPrimary(weap)
+{
+	return (maps\mp\gametypes\_weapons::isPrimaryWeapon(weap) || maps\mp\gametypes\_weapons::isAltModeWeapon(weap));
+}
+
+entIsVehicle(ent)
+{
+	return (ent.classname == "script_vehicle" || ent.model == "vehicle_uav_static_mp" || ent.model == "vehicle_ac130_coop");
+}
+
+/*
+	Returns if the given weapon is full auto.
+*/
+WeaponIsFullAuto(weap)
+{
+	weaptoks = strtok(weap, "_");
+
+	assert(isDefined(weaptoks[0]));
+	assert(isString(weaptoks[0]));
+	
+	return !isDefined(level.bots_nonfullautoguns[weaptoks[0]]);
+}
+
 IsDefusing()
 {
 	return (isDefined(self.isDefusing) && self.isDefusing);
@@ -234,11 +244,6 @@ IsStunned()
 	return (isdefined(self.concussionEndTime) && self.concussionEndTime > gettime());
 }
 
-getBotVelocity()
-{
-	return self.bot.velocity;
-}
-
 /*
 	Returns if we are beingArtilleryShellshocked 
 */