From ca35422d374cde28c1736e85fb16018129172fbd Mon Sep 17 00:00:00 2001
From: INeedGames <ineedbots@outlook.com>
Date: Sun, 8 Nov 2020 16:29:04 -0600
Subject: [PATCH] Cleanup

---
 main_shared/maps/mp/bots/_bot_utility.gsc | 244 +++++++++++-----------
 1 file changed, 122 insertions(+), 122 deletions(-)

diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc
index 3bb2935..a5abc02 100644
--- a/main_shared/maps/mp/bots/_bot_utility.gsc
+++ b/main_shared/maps/mp/bots/_bot_utility.gsc
@@ -52,26 +52,7 @@ is_bot()
 */
 BotPressAttack(time)
 {
-	self maps\mp\bots\_bot_internal::fire(time);
-}
-
-/*
-	Returns the bot's random assigned number.
-*/
-BotGetRandom()
-{
-	return self.bot.rand;
-}
-
-/*
-	Returns a random number thats different everytime it changes target
-*/
-BotGetTargetRandom()
-{
-	if (!isDefined(self.bot.target))
-		return undefined;
-
-	return self.bot.target.rand;
+	self maps\mp\bots\_bot_internal::pressFire(time);
 }
 
 /*
@@ -99,51 +80,22 @@ BotPressSmoke(time)
 }
 
 /*
-	Returns a valid grenade launcher weapon
+	Returns the bot's random assigned number.
 */
-getValidTube()
+BotGetRandom()
 {
-	weaps = self getweaponslist();
-
-	for (i = 0; i < weaps.size; i++)
-	{
-		weap = weaps[i];
-
-		if(!self getAmmoCount(weap))
-			continue;
-
-		if (isSubStr(weap, "gl_") && !isSubStr(weap, "_gl_"))
-			return weap;
-	}
-
-	return undefined;
+	return self.bot.rand;
 }
 
 /*
-	Returns a random grenade in the bot's inventory.
+	Returns a random number thats different everytime it changes target
 */
-getValidGrenade()
+BotGetTargetRandom()
 {
-	grenadeTypes = [];
-	grenadeTypes[grenadeTypes.size] = "frag_grenade_mp";
-	grenadeTypes[grenadeTypes.size] = "smoke_grenade_mp";
-	grenadeTypes[grenadeTypes.size] = "flash_grenade_mp";
-	grenadeTypes[grenadeTypes.size] = "concussion_grenade_mp";
-	
-	possibles = [];
-	
-	for(i = 0; i < grenadeTypes.size; i++)
-	{
-		if ( !self hasWeapon( grenadeTypes[i] ) )
-			continue;
-			
-		if ( !self getAmmoCount( grenadeTypes[i] ) )
-			continue;
-			
-		possibles[possibles.size] = grenadeTypes[i];
-	}
-	
-	return random(possibles);
+	if (!isDefined(self.bot.target))
+		return undefined;
+
+	return self.bot.target.rand;
 }
 
 /*
@@ -197,11 +149,14 @@ BotIsFrozen()
 }
 
 /*
-	Sets the bot's target to be this ent.
+	Bot will stop moving
 */
-SetAttacker(att)
+BotStopMoving(what)
 {
-	self.bot.target_this_frame = att;
+	self.bot.stop_move = what;
+
+	if(what)
+		self notify("kill_goal");
 }
 
 /*
@@ -275,6 +230,14 @@ HasScriptAimPos()
 	return isDefined(self GetScriptAimPos());
 }
 
+/*
+	Sets the bot's target to be this ent.
+*/
+SetAttacker(att)
+{
+	self.bot.target_this_frame = att;
+}
+
 /*
 	Sets the script enemy for a bot.
 */
@@ -303,27 +266,6 @@ GetThreat()
 	return self.bot.target.entity;
 }
 
-/*
-	Returns if the given weapon is full auto.
-*/
-WeaponIsFullAuto(weap)
-{
-	weaptoks = strtok(weap, "_");
-	
-	return isDefined(weaptoks[0]) && isString(weaptoks[0]) && isdefined(level.bots_fullautoguns[weaptoks[0]]);
-}
-
-/*
-	Bot will stop moving
-*/
-BotStopMoving(what)
-{
-	self.bot.stop_move = what;
-
-	if(what)
-		self notify("kill_goal");
-}
-
 /*
 	Returns if the bot has a script enemy.
 */
@@ -340,6 +282,104 @@ 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 in laststand
+*/
+inLastStand()
+{
+	return (isDefined(self.lastStand) && self.lastStand);
+}
+
+/*
+	Returns if we are stunned.
+*/
+IsStunned()
+{
+	return (isdefined(self.concussionEndTime) && self.concussionEndTime > gettime());
+}
+
+/*
+	Returns if we are beingArtilleryShellshocked 
+*/
+isArtShocked()
+{
+	return (isDefined(self.beingArtilleryShellshocked) && self.beingArtilleryShellshocked);
+}
+
+/*
+	Returns a valid grenade launcher weapon
+*/
+getValidTube()
+{
+	weaps = self getweaponslist();
+
+	for (i = 0; i < weaps.size; i++)
+	{
+		weap = weaps[i];
+
+		if(!self getAmmoCount(weap))
+			continue;
+
+		if (isSubStr(weap, "gl_") && !isSubStr(weap, "_gl_"))
+			return weap;
+	}
+
+	return undefined;
+}
+
+/*
+	Returns a random grenade in the bot's inventory.
+*/
+getValidGrenade()
+{
+	grenadeTypes = [];
+	grenadeTypes[grenadeTypes.size] = "frag_grenade_mp";
+	grenadeTypes[grenadeTypes.size] = "smoke_grenade_mp";
+	grenadeTypes[grenadeTypes.size] = "flash_grenade_mp";
+	grenadeTypes[grenadeTypes.size] = "concussion_grenade_mp";
+	
+	possibles = [];
+	
+	for(i = 0; i < grenadeTypes.size; i++)
+	{
+		if ( !self hasWeapon( grenadeTypes[i] ) )
+			continue;
+			
+		if ( !self getAmmoCount( grenadeTypes[i] ) )
+			continue;
+			
+		possibles[possibles.size] = grenadeTypes[i];
+	}
+	
+	return random(possibles);
+}
+
+/*
+	Returns if the given weapon is full auto.
+*/
+WeaponIsFullAuto(weap)
+{
+	weaptoks = strtok(weap, "_");
+	
+	return isDefined(weaptoks[0]) && isString(weaptoks[0]) && isdefined(level.bots_fullautoguns[weaptoks[0]]);
+}
+
 /*
 	Returns what our eye height is.
 */
@@ -485,46 +525,6 @@ isWeaponDroppable(weap)
 	return (maps\mp\gametypes\_weapons::mayDropWeapon(weap));
 }
 
-/*
-	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 in laststand
-*/
-inLastStand()
-{
-	return (isDefined(self.lastStand) && self.lastStand);
-}
-
-/*
-	Returns if we are stunned.
-*/
-IsStunned()
-{
-	return (isdefined(self.concussionEndTime) && self.concussionEndTime > gettime());
-}
-
-/*
-	Returns if we are beingArtilleryShellshocked 
-*/
-isArtShocked()
-{
-	return (isDefined(self.beingArtilleryShellshocked) && self.beingArtilleryShellshocked);
-}
-
 /*
 	Selects a random element from the array.
 */