Compare commits

..

No commits in common. "dc03e0fbb3ef69d9e2827f9b901ab9c549b23405" and "02761a101387c536bd02d62b7d2f6f4676de8ea9" have entirely different histories.

6 changed files with 10 additions and 38 deletions

View File

@ -120,10 +120,6 @@ You can easily setup a local LAN dedicated server for you to join and play on. H
## Changelog ## 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 - v2.2.0
- Fixed some chat related script runtime errors - Fixed some chat related script runtime errors
- Waypoints only load from csv now - Waypoints only load from csv now

View File

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

View File

@ -1600,7 +1600,7 @@ aim_loop()
{ {
self thread bot_lookat( target gettagorigin( "j_spine4" ), 0.05 ); self thread bot_lookat( target gettagorigin( "j_spine4" ), 0.05 );
} }
else if ( !nadeAimOffset && conedot > 0.999995 && lengthsquared( aimoffset ) < 0.05 ) else if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 )
{ {
self thread bot_lookat( aimpos, 0.05 ); self thread bot_lookat( aimpos, 0.05 );
} }
@ -1618,7 +1618,7 @@ aim_loop()
conedot = getConeDot( aimpos, eyePos, angles ); conedot = getConeDot( aimpos, eyePos, angles );
if ( !nadeAimOffset && conedot > 0.999995 && lengthsquared( aimoffset ) < 0.05 ) if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 )
{ {
self thread bot_lookat( aimpos, 0.05 ); self thread bot_lookat( aimpos, 0.05 );
} }
@ -2858,7 +2858,7 @@ bot_lookat( pos, time, vel, doAimPredict )
for ( i = 0; i < steps; i++ ) 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 BotBuiltinBotAngles( myAngle ); self setplayerangles( myAngle );
wait 0.05; wait 0.05;
} }
} }

View File

@ -358,7 +358,7 @@ classWatch()
a[ a.size ] = "sniper"; a[ a.size ] = "sniper";
self notify( "menuresponse", game[ "menu_changeclass_" + self.pers[ "team" ] ], random( a ) ); self notify( "menuresponse", game[ "menu_changeclass_" + self.pers[ "team" ] ], random( a ) );
wait 0.5; wait 0.5;
} }
@ -2856,12 +2856,6 @@ bot_killstreak_think_loop()
{ {
curWeap = self getcurrentweapon(); curWeap = self getcurrentweapon();
if ( curWeap == "radar_mp" || curWeap == "helicopter_mp" || curWeap == "airstrike_mp" )
{
self thread changeToWeapon( self.lastdroppableweapon );
return;
}
if ( curWeap == "none" || !isWeaponDroppable( curWeap ) ) if ( curWeap == "none" || !isWeaponDroppable( curWeap ) )
{ {
curWeap = self.lastdroppableweapon; curWeap = self.lastdroppableweapon;

View File

@ -133,17 +133,6 @@ BotBuiltinBotMeleeParams( yaw, dist )
} }
} }
/*
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 Test if is a bot
*/ */

View File

@ -7,7 +7,6 @@ init()
level.bot_builtins[ "botmovement" ] = ::do_botmovement; level.bot_builtins[ "botmovement" ] = ::do_botmovement;
level.bot_builtins[ "botmoveto" ] = ::do_botmoveto; level.bot_builtins[ "botmoveto" ] = ::do_botmoveto;
level.bot_builtins[ "botmeleeparams" ] = ::do_botmeleeparams; level.bot_builtins[ "botmeleeparams" ] = ::do_botmeleeparams;
level.bot_builtins[ "botangles" ] = ::do_botangles;
level.bot_builtins[ "isbot" ] = ::do_isbot; level.bot_builtins[ "isbot" ] = ::do_isbot;
level.bot_builtins[ "fs_fopen" ] = ::do_fs_fopen; level.bot_builtins[ "fs_fopen" ] = ::do_fs_fopen;
level.bot_builtins[ "fs_fclose" ] = ::do_fs_fclose; level.bot_builtins[ "fs_fclose" ] = ::do_fs_fclose;
@ -50,12 +49,6 @@ do_botmeleeparams( yaw, dist )
// cod4x removed lunging due to movement exploits // cod4x removed lunging due to movement exploits
} }
do_botangles( angles )
{
self setplayerangles( angles );
// self botangles( angles[ 0 ], angles[ 1 ], angles[ 2 ] );
}
do_isbot() do_isbot()
{ {
return self.isbot; return self.isbot;