maps/mp/bots/_bot.gsc

@@ -264,8 +264,6 @@ init()
 	level thread onPlayerConnect();
 	level thread handleBots();
 	level thread onPlayerChat();
-
-	array_thread( getentarray( "misc_turret", "classname" ), ::turret_monitoruse_watcher );
 }
 
 /*
@@ -1250,47 +1248,3 @@ onPlayerChat()
 		}
 	}
 }
-
-/*
-	Monitors turret usage
-*/
-turret_monitoruse_watcher()
-{
-	self endon( "death" );
-	
-	for ( ;; )
-	{
-		self waittill ( "trigger", player );
-		
-		self monitor_player_turret( player );
-		
-		self.owner = undefined;
-		
-		if ( isdefined( player ) )
-		{
-			player.turret = undefined;
-		}
-	}
-}
-
-/*
-	While player uses turret
-*/
-monitor_player_turret( player )
-{
-	player endon( "death" );
-	player endon( "disconnect" );
-	
-	player.turret = self;
-	self.owner = player;
-	
-	while ( isdefined( player ) && player usebuttonpressed() )
-	{
-		wait 0.05;
-	}
-	
-	while ( isdefined( player ) && !player usebuttonpressed() )
-	{
-		wait 0.05;
-	}
-}

maps/mp/bots/_bot_internal.gsc

@@ -369,20 +369,6 @@ watchPickupGun()
 			continue;
 		}
 		
-		// todo have bots use turrets instead of just kicking them off of it
-		if ( isdefined( self.turret ) )
-		{
-			self thread use( 0.5 );
-			continue;
-		}
-		
-		// todo have bots use vehicles properly
-		if ( self isinvehicle() )
-		{
-			self thread use( 0.5 );
-			continue;
-		}
-		
 		weap = self getcurrentweapon();
 		
 		if ( weap != "none" && self getammocount( weap ) )

maps/mp/bots/_bot_script.gsc

@@ -3292,7 +3292,6 @@ bot_target_vehicle_loop()
 	myEye = self getEyePos();
 	target = undefined;
 	myAngles = self getplayerangles();
-	hasRocket = self getammocount( "bazooka_mp" );
 	
 	for ( i = 0; i < level.players.size; i++ )
 	{
@@ -3325,7 +3324,7 @@ bot_target_vehicle_loop()
 			continue;
 		}
 		
-		if ( getConeDot( vehicle.origin, self.origin, myAngles ) < 0.6 && !hasRecon && !hasRocket )
+		if ( getConeDot( vehicle.origin, self.origin, myAngles ) < 0.6 && !hasRecon )
 		{
 			continue;
 		}
@@ -3357,13 +3356,18 @@ bot_target_vehicle()
 	
 	for ( ;; )
 	{
-		wait( randomintrange( 1, 3 ) * 0.5 );
+		wait( randomintrange( 1, 3 ) );
 		
 		if ( self HasScriptEnemy() )
 		{
 			continue;
 		}
 		
+		if ( self.pers[ "bots" ][ "skill" ][ "base" ] <= 1 )
+		{
+			continue;
+		}
+		
 		if ( !isdefined( level.vehicles_list ) )
 		{
 			continue;
@@ -3380,7 +3384,7 @@ bot_vehicle_attack( target )
 {
 	target endon( "death" );
 	
-	wait_time = randomintrange( 14, 20 ) * 2;
+	wait_time = randomintrange( 14, 20 );
 	
 	for ( i = 0; i < wait_time; i++ )
 	{