From 7d8ed25cdc341a94d17888b6f79eb30b82d8f984 Mon Sep 17 00:00:00 2001
From: ineedbots <ineedbots@outlook.com>
Date: Fri, 4 Jun 2021 14:13:52 -0600
Subject: [PATCH] Reduce var usage

---
 main_shared/maps/mp/bots/_bot_internal.gsc |  9 ++++-----
 main_shared/maps/mp/bots/_bot_script.gsc   |  3 +++
 main_shared/maps/mp/bots/_bot_utility.gsc  | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/main_shared/maps/mp/bots/_bot_internal.gsc b/main_shared/maps/mp/bots/_bot_internal.gsc
index 3a5cf7e..98be870 100644
--- a/main_shared/maps/mp/bots/_bot_internal.gsc
+++ b/main_shared/maps/mp/bots/_bot_internal.gsc
@@ -1790,7 +1790,7 @@ killWalkOnEvents()
 	self endon("disconnect");
 	self endon("death");
 	
-	ret = self waittill_any_return("flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal");
+	self waittill_any("flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal");
 
 	waittillframeend;
 	
@@ -1804,12 +1804,11 @@ doWalkScriptNotify()
 {
 	self endon("disconnect");
 	self endon("death");
+	self endon("kill_goal");
 	
-	ret = self waittill_any_return("kill_goal", "goal_internal", "bad_path_internal");
-	
-	if (ret == "goal_internal")
+	if (self waittill_either_return("goal_internal", "bad_path_internal") == "goal_internal")
 		self notify("goal");
-	else if (ret == "bad_path_internal")
+	else
 		self notify("bad_path");
 }
 
diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index 8417eb9..e291c3d 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -36,6 +36,9 @@ connected()
 	self thread onBotSpawned();
 	self thread onSpawned();
 	self thread onDeath();
+
+	wait 0.1;
+	self.challengeData = [];
 }
 
 /*
diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc
index e659caa..9ba79f6 100644
--- a/main_shared/maps/mp/bots/_bot_utility.gsc
+++ b/main_shared/maps/mp/bots/_bot_utility.gsc
@@ -496,6 +496,27 @@ GetEyePos()
 	return self getTagOrigin("tag_eye");
 }
 
+/*
+	helper
+*/
+waittill_either_return_(str1, str2)
+{
+	self endon(str1);
+	self waittill(str2);
+	return true;
+}
+
+/*
+	Returns which string gets notified first
+*/
+waittill_either_return(str1, str2)
+{
+	if (!isDefined(self waittill_either_return_(str1, str2)))
+		return str1;
+
+	return str2;
+}
+
 /*
 	Taken from iw4 script
 */