Future/iw2_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw2_bot_warfare.git synced 2025-05-15 15:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Future:a1a28aec3a982211bc3d0fec8182847ecd23732c
Branches Tags
Future:master
..
compare: Future:28c490b4e63debb2716f2239a5426e4f0b34d381
Branches Tags
Future:master

No commits in common. "a1a28aec3a982211bc3d0fec8182847ecd23732c" and "28c490b4e63debb2716f2239a5426e4f0b34d381" have entirely different histories.
a1a28aec3a ... 28c490b4e6

4 changed files with 25 additions and 33 deletions
Show Stats Expand all files Collapse all files

10
maps/mp/bots/_bot.gsc
View File

@ -1088,11 +1088,11 @@ addBots_loop()
if ( fillMode == 0 || fillMode == 2 ) if ( fillMode == 0 || fillMode == 2 )
{ {
amount += players; amount += players;
}
if ( getcvarint( "bots_manage_fill_spec" ) )
{ if ( getcvarint( "bots_manage_fill_spec" ) )
amount += spec; {
} amount += spec;
} }
if ( amount < fillAmount ) if ( amount < fillAmount )

12
maps/mp/bots/_bot_internal.gsc
View File

@ -422,6 +422,12 @@ onWeaponChange()
{ {
first = false; first = false;
newWeapon = self getcurrentweapon(); newWeapon = self getcurrentweapon();
// hack fix for botstop overridding weapon
if ( newWeapon != "none" )
{
self switchtoweapon( newWeapon );
}
} }
else else
{ {
@ -1271,7 +1277,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 );
} }
@ -1289,7 +1295,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 );
} }
@ -2416,7 +2422,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;
} }
} }

11
maps/mp/bots/_bot_utility.gsc
View File

@ -85,17 +85,6 @@ BotBuiltinIsBot()
return false; return false;
} }
/*
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 Returns if player is the host
*/ */

25
scripts/mp/bots_adapter_libcod.gsc
View File

@ -5,7 +5,6 @@ init()
level.bot_builtins[ "botstop" ] = ::do_botstop; level.bot_builtins[ "botstop" ] = ::do_botstop;
level.bot_builtins[ "botmovement" ] = ::do_botmovement; level.bot_builtins[ "botmovement" ] = ::do_botmovement;
level.bot_builtins[ "isbot" ] = ::do_isbot; level.bot_builtins[ "isbot" ] = ::do_isbot;
level.bot_builtins[ "botangles" ] = ::do_botangles;
} }
do_printconsole( s ) do_printconsole( s )
@ -102,28 +101,32 @@ do_botstop()
do_botmovement( forward, right ) do_botmovement( forward, right )
{ {
// best i can do for libcod... // best i can do for libcod...
self setwalkdir( "none" );
if ( forward > 63 ) if ( forward > 63 )
{ {
self setwalkdir( "forward" ); self setwalkdir( "forward" );
} return;
if ( forward < -63 )
{
self setwalkdir( "back" );
} }
if ( right > 63 ) if ( right > 63 )
{ {
self setwalkdir( "right" ); self setwalkdir( "right" );
return;
}
if ( forward < -63 )
{
self setwalkdir( "back" );
return;
} }
if ( right < -63 ) if ( right < -63 )
{ {
self setwalkdir( "left" ); self setwalkdir( "left" );
return;
} }
self setwalkdir( "none" );
// self botmovement( forward, right ); // self botmovement( forward, right );
} }
@ -132,9 +135,3 @@ do_isbot()
return false; // no equal in libcod return false; // no equal in libcod
// self isbot(); // self isbot();
} }
do_botangles( angles )
{
self setplayerangles( angles );
// self botangles( angles[ 0 ], angles[ 1 ], angles[ 2 ] );
}