update

README.md

@@ -95,7 +95,7 @@ Make sure to disable this DVAR by adding ```set bots_main_firstIsHost 0``` in yo
 | bots_team_amount                 | When `bots_team` is set to `custom`. The amount of bots to be placed on the axis team. The remainder will be placed on the allies team. | 0 |
 | bots_team_force                  | If the server should force bots' teams according to the `bots_team` value. When `bots_team` is `autoassign`, unbalanced teams will be balanced. This dvar is ignored when `bots_team` is `custom`. | 0     |
 | bots_team_mode                   | When `bots_team_force` is `1` and `bots_team` is `autoassign`, players/bots counting method. <ul><li>`0` - counts both players and bots.</li><li>`1` - only counts bots</li></ul> | 0 |
-| bots_skill                       | Bots' difficulty.<ul><li>`0` - Random difficulty for each bot.</li><li>`1` - Easiest difficulty for all bots.</li><li>`2` to `6` - Between easy and hard difficulty for all bots.</li><li>`7` - The hardest difficulty for all bots.</li><li>`8` - custom (look at the `bots_skill_<team>_<difficulty>` dvars</li></ul> | 0 |
+| bots_skill                       | Bots' difficulty.<ul><li>`0` - Random difficulty for each bot.</li><li>`1` - Easiest difficulty for all bots.</li><li>`2` to `6` - Between easy and hard difficulty for all bots.</li><li>`7` - The hardest difficulty for all bots.</li><li>`8` - custom (look at the `bots_skill_<team>_<difficulty>` dvars)</li></ul> | 0 |
 | bots_skill_axis_hard             | When `bots_skill` is set to `8`, the amount of hard difficulty bots to set on the axis team. | 0            |
 | bots_skill_axis_med              | When `bots_skill` is set to `8`, the amount of medium difficulty bots to set on the axis team. The remaining bots on the team will be set to easy difficulty. | 0 |
 | bots_skill_allies_hard           | When `bots_skill` is set to `8`, the amount of hard difficulty bots to set on the allies team. | 0          |
@@ -119,6 +119,10 @@ Make sure to disable this DVAR by adding ```set bots_main_firstIsHost 0``` in yo
 | bots_play_aim                    | If the bots can aim.                                                                           | 1          |
 
 ## Changelog
+- v2.3.0 (not released yet)
+  - Smoothed bot aim at range
+  - Fixed bots_manage_fill_spec players being counted with bots_manage_fill_mode 1 (bot only)
+
 - v2.2.0
   - Bots can now melee lunge
   - Waypoints only load from csv now

maps/mp/bots/_bot.gsc

@@ -8,7 +8,7 @@
 */
 init()
 {
-	level.bw_version = "2.2.0";
+	level.bw_version = "2.3.0";
 	
 	if ( getdvar( "bots_main" ) == "" )
 	{
@@ -1014,11 +1014,11 @@ addBots_loop()
 	if ( fillMode == 0 || fillMode == 2 )
 	{
 		amount += players;
-	}
 		
-	if ( getdvarint( "bots_manage_fill_spec" ) )
+		if ( getdvarint( "bots_manage_fill_spec" ) )
-	{
+		{
-		amount += spec;
+			amount += spec;
+		}
 	}
 	
 	if ( amount < fillAmount )

maps/mp/bots/_bot_internal.gsc

@@ -1622,7 +1622,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 );
 					}
@@ -1646,7 +1646,7 @@ aim_loop()
 					
 					conedot = getConeDot( aimpos, eyePos, angles );
 					
-					if ( ( isdefined( self.bot.knifing_target ) && self.bot.knifing_target == target ) || ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 ) )
+					if ( ( isdefined( self.bot.knifing_target ) && self.bot.knifing_target == target ) || ( !nadeAimOffset && conedot > 0.999995 && lengthsquared( aimoffset ) < 0.05 ) )
 					{
 						self thread bot_lookat( aimpos, 0.05 );
 					}
@@ -1664,7 +1664,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 );
 					}
@@ -2940,7 +2940,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;
 	}
 }

maps/mp/bots/_bot_script.gsc

@@ -3010,6 +3010,12 @@ bot_killstreak_think_loop()
 {
 	curWeap = self getcurrentweapon();
 	
+	if ( curWeap == "radar_mp" || curWeap == "dogs_mp" || curWeap == "artillery_mp" )
+	{
+		self thread changeToWeapon( self.lastdroppableweapon );
+		return;
+	}
+	
 	if ( curWeap == "none" || !isWeaponDroppable( curWeap ) )
 	{
 		curWeap = self.lastdroppableweapon;

maps/mp/bots/_bot_utility.gsc

@@ -135,6 +135,17 @@ BotBuiltinBotMeleeParams( yaw, dist )
 	}
 }
 
+/*
+	Sets angles
+*/
+BotBuiltinBotAngles( angles )
+{
+	if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botangles" ] ) )
+	{
+		self [[ level.bot_builtins[ "botangles" ] ]]( angles );
+	}
+}
+
 /*
 	Returns if player is the host
 */

scripts/mp/bots_adapter_pt4.gsc

@@ -8,6 +8,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;
 }
 
@@ -54,6 +55,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();