From cdc0032b555d217d2f97e4eeef7845ae848dd698 Mon Sep 17 00:00:00 2001
From: ineedbots <ineedbots@outlook.com>
Date: Tue, 15 Jun 2021 16:24:16 -0600
Subject: [PATCH] Cod2

---
 mods/bots/maps/mp/bots/_bot.gsc         | 13 ++++++-
 mods/bots/maps/mp/bots/_bot_utility.gsc | 52 ++++++++++++-------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/mods/bots/maps/mp/bots/_bot.gsc b/mods/bots/maps/mp/bots/_bot.gsc
index 3b6dc55..99bf816 100644
--- a/mods/bots/maps/mp/bots/_bot.gsc
+++ b/mods/bots/maps/mp/bots/_bot.gsc
@@ -101,6 +101,15 @@ init()
 	level.players = [];
 
 	level.bots_fullautoguns = [];
+	level.bots_fullautoguns["greasegun"] = true;
+	level.bots_fullautoguns["thompson"] = true;
+	level.bots_fullautoguns["bar"] = true;
+	level.bots_fullautoguns["pps42"] = true;
+	level.bots_fullautoguns["sten"] = true;
+	level.bots_fullautoguns["bren"] = true;
+	level.bots_fullautoguns["mp44"] = true;
+	level.bots_fullautoguns["ppsh"] = true;
+	level.bots_fullautoguns["mp40"] = true;
 	
 	level thread fixGamemodes();
 	
@@ -908,9 +917,9 @@ watchGameEnded()
 			if (level.roundended)
 				break;
 		}
-		else if (isDefined(level.gameended))
+		else if (isDefined(level.mapended))
 		{
-			if (level.gameended)
+			if (level.mapended)
 				break;
 		}
 	}
diff --git a/mods/bots/maps/mp/bots/_bot_utility.gsc b/mods/bots/maps/mp/bots/_bot_utility.gsc
index d3f2299..03e89ad 100644
--- a/mods/bots/maps/mp/bots/_bot_utility.gsc
+++ b/mods/bots/maps/mp/bots/_bot_utility.gsc
@@ -58,6 +58,22 @@ is_bot()
 	return ((isDefined(self.pers["isBot"]) && self.pers["isBot"]) || (isDefined(self.pers["isBotWarfare"]) && self.pers["isBotWarfare"]) || isSubStr( self getguid()+"", "bot" ));
 }
 
+/*
+	iw5
+*/
+allowClassChoice()
+{
+	return true;
+}
+
+/*
+	iw5
+*/
+allowTeamChoice()
+{
+	return true;
+}
+
 /*
 	Bot changes to the weap
 */
@@ -309,36 +325,12 @@ HasThreat()
 	return (isDefined(self GetThreat()));
 }
 
-/*
-	If the player is defusing
-*/
-IsDefusing()
-{
-	return (isDefined(self.isDefusing) && self.isDefusing);
-}
-
-/*
-	If the play is planting
-*/
-isPlanting()
-{
-	return (isDefined(self.isPlanting) && self.isPlanting);
-}
-
-/*
-	If the player is carrying a bomb
-*/
-isBombCarrier()
-{
-	return (isDefined(self.isBombCarrier) && self.isBombCarrier);
-}
-
 /*
 	If the site is in use
 */
 isInUse()
 {
-	return (isDefined(self.inUse) && self.inUse);
+	return (isDefined(self.planting) && self.planting) || (isDefined(self.defusing) && self.defusing);
 }
 
 /*
@@ -347,6 +339,14 @@ isInUse()
 getValidGrenade()
 {
 	grenadeTypes = [];
+	grenadeTypes[0] = "frag_grenade_american_mp";
+	grenadeTypes[1] = "smoke_grenade_american_mp";
+	grenadeTypes[2] = "frag_grenade_british_mp";
+	grenadeTypes[3] = "smoke_grenade_british_mp";
+	grenadeTypes[4] = "frag_grenade_russian_mp";
+	grenadeTypes[5] = "smoke_grenade_russian_mp";
+	grenadeTypes[6] = "frag_grenade_german_mp";
+	grenadeTypes[7] = "smoke_grenade_german_mp";
 	
 	possibles = [];
 	
@@ -560,7 +560,7 @@ _timeout( delay )
 */
 isWeaponDroppable(weap)
 {
-	return false;
+	return (maps\mp\gametypes\_weapons::isPistol(weap) || maps\mp\gametypes\_weapons::isMainWeapon(weap));
 }
 
 /*