wait for notifies

maps/bots/_bot.gsc

@@ -7,7 +7,7 @@
 */
 init()
 {
-	level.bw_version = "2.2.0 PR 1";
+	level.bw_version = "2.3.0 PR 1";
 	
 	if ( getdvar( "bots_main" ) == "" )
 	{
@@ -67,6 +67,11 @@ init()
 		setdvar( "bots_manage_fill_kick", false ); // kick bots if too many
 	}
 	
+	if ( getdvar( "bots_manage_fill_watchplayers" ) == "" )
+	{
+		setdvar( "bots_manage_fill_watchplayers", false ); // add bots when player exists, kick if not
+	}
+	
 	if ( getdvar( "bots_skill" ) == "" )
 	{
 		setdvar( "bots_skill", 0 ); // 0 is random, 1 is easy 7 is hard, 8 is custom, 9 is completely random
@@ -139,7 +144,7 @@ init()
 	}
 	
 	level.bot_inittime = gettime();
-
+	
 	level.bots_minsprintdistance = 315;
 	level.bots_minsprintdistance *= level.bots_minsprintdistance;
 	level.bots_mingrenadedistance = 256;
@@ -274,7 +279,7 @@ onPlayerConnect()
 onDisconnectAll()
 {
 	name = self.playername;
-
+	
 	self waittill( "disconnect" );
 	
 	level.players = array_remove( level.players, self );
@@ -364,10 +369,10 @@ connected()
 	
 	level.bots[ level.bots.size ] = self;
 	self thread onDisconnect();
-	
-	level notify( "bot_connected", self );
-	
 	self thread watchBotDebugEvent();
+
+	waittillframeend; // wait for waittills to process
+	level notify( "bot_connected", self );
 }
 
 /*
@@ -582,6 +587,14 @@ addBots_loop()
 			players++;
 		}
 	}
+
+	if ( !randomint( 999 ) )
+	{
+		setdvar( "testclients_doreload", true );
+		wait 0.1;
+		setdvar( "testclients_doreload", false );
+		// doExtraCheck();
+	}
 	
 	amount = bots;
 	
@@ -589,18 +602,35 @@ addBots_loop()
 	{
 		amount += players;
 	}
-	
+
+	if ( players <= 0 && getdvarint( "bots_manage_fill_watchplayers" ) )
+	{
+		amount = fillAmount + bots;
+	}
+
 	if ( amount < fillAmount )
 	{
-		setdvar( "bots_manage_add", 1 );
+		setdvar( "bots_manage_add", fillAmount - amount );
 	}
 	else if ( amount > fillAmount && getdvarint( "bots_manage_fill_kick" ) )
 	{
-		tempBot = getBotToKick();
+		botsToKick = amount - fillAmount;
 		
-		if ( isdefined( tempBot ) )
+		if ( botsToKick > 64 )
 		{
-			BotBuiltinCmdExec( "clientkick " + tempBot getentitynumber() );
+			botsToKick = 64;
+		}
+		
+		for ( i = 0; i < botsToKick; i++ )
+		{
+			tempBot = getBotToKick();
+			
+			if ( isdefined( tempBot ) )
+			{
+				BotBuiltinCmdExec( "clientkick " + tempBot getentitynumber() + " EXE_PLAYERKICKED" );
+				
+				wait 0.25;
+			}
 		}
 	}
 }

maps/bots/_bot_internal.gsc

@@ -830,7 +830,7 @@ bot_lookat( pos, time, vel, doAimPredict )
 	for ( i = 0; i < steps; i++ )
 	{
 		myAngle = ( angleclamp180( myAngle[ 0 ] + X ), angleclamp180( myAngle[ 1 ] + Y ), 0 );
-		self setplayerangles( myAngle );
+		self BotBuiltinBotAngles( myAngle );
 		wait 0.05;
 	}
 }
@@ -1477,7 +1477,7 @@ aim_loop()
 					{
 						self thread bot_lookat( target gettagorigin( "j_spine4" ), 0.05 );
 					}
-					else if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 )
+					else if ( !nadeAimOffset && conedot > 0.999995 && lengthsquared( aimoffset ) < 0.05 )
 					{
 						self thread bot_lookat( aimpos, 0.05 );
 					}
@@ -1495,7 +1495,7 @@ aim_loop()
 					
 					conedot = getConeDot( aimpos, eyePos, angles );
 					
-					if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 )
+					if ( !nadeAimOffset && conedot > 0.999995 && lengthsquared( aimoffset ) < 0.05 )
 					{
 						self thread bot_lookat( aimpos, 0.05 );
 					}

maps/bots/_bot_utility.gsc

@@ -85,8 +85,18 @@ BotBuiltinBotMeleeParams( yaw, dist )
 }
 
 /*
-	Test if is a bot
+	Sets angles
+*/
+BotBuiltinBotAngles( angles )
+{
+	if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botangles" ] ) )
+	{
+		self [[ level.bot_builtins[ "botangles" ] ]]( angles );
+	}
+}
 
+/*
+	Test if is a bot
 */
 BotBuiltinIsBot()
 {

scripts/sp/bots_adapter_pt4.gsc

@@ -5,6 +5,7 @@ init()
 	level.bot_builtins[ "botstop" ] = ::do_botstop;
 	level.bot_builtins[ "botmovement" ] = ::do_botmovement;
 	level.bot_builtins[ "botmeleeparams" ] = ::do_botmeleeparams;
+	level.bot_builtins[ "botangles" ] = ::do_botangles;
 	level.bot_builtins[ "isbot" ] = ::do_isbot;
 	level.bot_builtins[ "generatepath" ] = ::do_generatepath;
 	level.bot_builtins[ "getfunction" ] = ::do_getfunction;
@@ -46,6 +47,12 @@ do_botmeleeparams( yaw, dist )
 	self botmeleeparams( yaw, dist );
 }
 
+do_botangles( angles )
+{
+	self setplayerangles( angles );
+	// self botangles( angles[ 0 ], angles[ 1 ], angles[ 2 ] );
+}
+
 do_isbot()
 {
 	return self isbot();