From c675a4a46c88d36bc40800dd3ed0843085e249cd Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Sun, 29 Nov 2020 18:17:46 -0600
Subject: [PATCH] fix cap

---
 main_shared/maps/mp/bots/_bot_script.gsc  | 16 ++++++++--------
 main_shared/maps/mp/bots/_bot_utility.gsc |  8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index 84d08dd..fc98184 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -946,7 +946,7 @@ start_bot_threads()
 		self thread bot_sd_defenders();
 		self thread bot_sd_attackers();
 
-		// war and cap
+		self thread bot_cap();
 	}
 
 	self thread bot_revive_think();
@@ -3874,24 +3874,24 @@ bot_cap()
 	{
 		wait( randomintrange( 3, 5 ) );
 		
-		if ( self IsUsingRemote() || self.bot_lock_goal )
+		if ( self.bot_lock_goal )
 		{
 			continue;
 		}
 		
-		if(!isDefined(level.capZones))
+		if(!isDefined(level.teamFlagZones))
 			continue;
 		
 		if(!isDefined(level.teamFlags))
 			continue;
 		
 		myflag = level.teamFlags[myteam];
-		myzone = level.capZones[myteam];
+		myzone = level.teamFlagZones[myteam];
 		
 		theirflag = level.teamFlags[otherTeam];
-		theirzone = level.capZones[otherTeam];
+		theirzone = level.teamFlagZones[otherTeam];
 		
-		if(!myflag maps\mp\gametypes\_gameobjects::isHome())
+		if(myflag maps\mp\gametypes\_gameobjects::isObjectAwayFromHome())
 		{
 			carrier = myflag.carrier;
 			
@@ -3906,7 +3906,7 @@ bot_cap()
 			}
 			else
 			{
-				if(theirflag maps\mp\gametypes\_gameobjects::isHome() && randomint(100) < 50)
+				if(!theirflag maps\mp\gametypes\_gameobjects::isObjectAwayFromHome() && randomint(100) < 50)
 				{ //take their flag
 					self bot_cap_get_flag(theirflag);
 				}
@@ -3923,7 +3923,7 @@ bot_cap()
 					if(theirzone.bots > 2 || randomInt(100) < 45)
 					{
 						//kill carrier
-						if(carrier _hasPerk( "specialty_coldblooded" ))
+						if(carrier hasPerk( "specialty_gpsjammer" ))
 							continue;
 						
 						origin = carrier.origin;
diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc
index 0dcd006..c7ddf42 100644
--- a/main_shared/maps/mp/bots/_bot_utility.gsc
+++ b/main_shared/maps/mp/bots/_bot_utility.gsc
@@ -362,6 +362,14 @@ isGased()
 	return (isdefined(self.inPoisonArea) && self.inPoisonArea && !self hasPerk("specialty_gas_mask"));
 }
 
+/*
+	If the player is the flag carrier
+*/
+isFlagCarrier()
+{
+	return (isDefined(self.isFlagCarrier) && self.isFlagCarrier);
+}
+
 /*
 	Returns a valid grenade launcher weapon
 */