From 7b1973a689ff021c06f18507c77d472379c57350 Mon Sep 17 00:00:00 2001
From: ineed bots <ineedbots@pbot.org>
Date: Wed, 7 Jun 2023 13:34:21 -0600
Subject: [PATCH] flared movement

---
 main_shared/maps/mp/bots/_bot_internal.gsc | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/main_shared/maps/mp/bots/_bot_internal.gsc b/main_shared/maps/mp/bots/_bot_internal.gsc
index c67ac29..aedc635 100644
--- a/main_shared/maps/mp/bots/_bot_internal.gsc
+++ b/main_shared/maps/mp/bots/_bot_internal.gsc
@@ -1926,7 +1926,24 @@ killWalkOnEvents()
 	self endon( "disconnect" );
 	self endon( "death" );
 
-	self waittill_any( "flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal" );
+	self waittill_any( "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal" );
+
+	waittillframeend;
+
+	self notify( "kill_goal" );
+}
+
+/*
+	Will stop the goal walk when an enemy is found or flashed or a new goal appeared for the bot.
+*/
+watchOnFlared()
+{
+	self endon( "kill_goal" );
+	self endon( "disconnect" );
+	self endon( "death" );
+
+	while ( !self isFlared() )
+		wait 0.05;
 
 	waittillframeend;
 
@@ -1963,6 +1980,7 @@ doWalk( goal, dist, isScriptGoal )
 		self thread doWalkScriptNotify();
 
 	self thread killWalkOnEvents();
+	self thread watchOnFlared();
 	self thread watchOnGoal( goal, dist );
 
 	current = self initAStar( goal );
@@ -2484,7 +2502,7 @@ bot_lookat( pos, time, vel, doAimPredict )
 
 	for ( i = 0; i < steps; i++ )
 	{
-		myAngle = ( AngleClamp180(myAngle[0] + X), AngleClamp180(myAngle[1] + Y), 0 );
+		myAngle = ( AngleClamp180( myAngle[0] + X ), AngleClamp180( myAngle[1] + Y ), 0 );
 		self setPlayerAngles( myAngle );
 		wait 0.05;
 	}