mirror of
https://github.com/ineedbots/t6_bot_warfare.git
synced 2025-02-05 11:49:02 +00:00
update for latest pluto
This commit is contained in:
parent
3c1d16f497
commit
d507ee22bd
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@ mpStats
|
||||
mpClassSets
|
||||
*.exe
|
||||
compiled/
|
||||
console_mp.log*
|
||||
|
@ -824,8 +824,8 @@ onBotSpawned()
|
||||
for ( ;; )
|
||||
{
|
||||
self waittill( "spawned_player" );
|
||||
self BotBuiltinClearOverrides( true );
|
||||
self BotBuiltinWeaponOverride( self getcurrentweapon() );
|
||||
self BotBuiltinBotClearOverride( false );
|
||||
self BotBuiltinBotWeaponOverride( self getcurrentweapon() );
|
||||
|
||||
self thread watch_for_override_stuff();
|
||||
self thread watch_for_melee_override();
|
||||
@ -948,9 +948,9 @@ watch_for_melee_override()
|
||||
|
||||
if ( self isonground() && self getstance() != "prone" && dist < getdvarfloat( "aim_automelee_range" ) && ( getConeDot( threat.origin, self.origin, self getplayerangles() ) > 0.9 || dist < 10 ) )
|
||||
{
|
||||
self BotBuiltinBotMeleeParams( threat getentitynumber(), dist );
|
||||
self BotBuiltinButtonOverride( "melee", "enable" );
|
||||
self BotBuiltinAimOverride();
|
||||
self BotBuiltinBotMeleeParamsOverride( threat getentitynumber(), dist );
|
||||
self BotBuiltinBotButtonOverride( "+melee" );
|
||||
self BotBuiltinBotAimOverride( true );
|
||||
|
||||
time_left = 1;
|
||||
once = false;
|
||||
@ -964,17 +964,17 @@ watch_for_melee_override()
|
||||
if ( !once )
|
||||
{
|
||||
once = true;
|
||||
self BotBuiltinClearButtonOverride( "melee" );
|
||||
self BotBuiltinBotButtonOverride( "~melee" );
|
||||
}
|
||||
}
|
||||
|
||||
if ( !once )
|
||||
{
|
||||
self BotBuiltinClearButtonOverride( "melee" );
|
||||
self BotBuiltinBotButtonOverride( "~melee" );
|
||||
}
|
||||
|
||||
self BotBuiltinClearMeleeParams();
|
||||
self BotBuiltinClearAimOverride();
|
||||
self BotBuiltinBotMeleeParamsOverride( false );
|
||||
self BotBuiltinBotAimOverride( false );
|
||||
wait 1;
|
||||
break;
|
||||
}
|
||||
@ -1047,13 +1047,13 @@ watch_for_override_stuff()
|
||||
last_jump_time = time;
|
||||
|
||||
// drop shot
|
||||
self BotBuiltinMovementOverride( 0, 0 );
|
||||
self BotBuiltinButtonOverride( "prone", "enable" );
|
||||
self BotBuiltinBotMovementOverride( 0, 0 );
|
||||
self BotBuiltinBotButtonOverride( "+prone" );
|
||||
|
||||
wait 1.5;
|
||||
|
||||
self BotBuiltinClearMovementOverride();
|
||||
self BotBuiltinClearButtonOverride( "prone" );
|
||||
self BotBuiltinBotMovementOverride( false );
|
||||
self BotBuiltinBotButtonOverride( "~prone" );
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -1061,9 +1061,9 @@ watch_for_override_stuff()
|
||||
last_jump_time = time;
|
||||
|
||||
// jump shot
|
||||
self BotBuiltinButtonOverride( "gostand", "enable" );
|
||||
self BotBuiltinBotMovementOverride( "+gostand" );
|
||||
wait 0.1;
|
||||
self BotBuiltinClearButtonOverride( "gostand" );
|
||||
self BotBuiltinBotMovementOverride( "~gostand" );
|
||||
}
|
||||
}
|
||||
|
||||
@ -1463,7 +1463,7 @@ BotBuiltinPrintConsole( s )
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinMovementOverride( a, b )
|
||||
BotBuiltinBotMovementOverride( a, b )
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botmovementoverride" ] ) )
|
||||
{
|
||||
@ -1473,57 +1473,27 @@ BotBuiltinMovementOverride( a, b )
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinClearMovementOverride()
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botclearmovementoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botclearmovementoverride" ] ]]();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinClearButtonOverride( a )
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botclearbuttonoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botclearbuttonoverride" ] ]]( a );
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinButtonOverride( a, b )
|
||||
BotBuiltinBotButtonOverride( a )
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botbuttonoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botbuttonoverride" ] ]]( a, b );
|
||||
self [[ level.bot_builtins[ "botbuttonoverride" ] ]]( a );
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinClearOverrides( a )
|
||||
BotBuiltinBotClearOverride( a )
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botclearoverrides" ] ) )
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botclearoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botclearoverrides" ] ]]( a );
|
||||
self [[ level.bot_builtins[ "botclearoverride" ] ]]( a );
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinClearWeaponOverride()
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botclearweaponoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botclearweaponoverride" ] ]]();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinWeaponOverride( a )
|
||||
BotBuiltinBotWeaponOverride( a )
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botweaponoverride" ] ) )
|
||||
{
|
||||
@ -1533,52 +1503,22 @@ BotBuiltinWeaponOverride( a )
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinClearButtonOverrides()
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botclearbuttonoverrides" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botclearbuttonoverrides" ] ]]();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinAimOverride()
|
||||
BotBuiltinBotAimOverride( a )
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botaimoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botaimoverride" ] ]]();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinClearAimOverride()
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botclearaimoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botclearaimoverride" ] ]]();
|
||||
self [[ level.bot_builtins[ "botaimoverride" ] ]]( a );
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
Sets melee params
|
||||
*/
|
||||
BotBuiltinBotMeleeParams( entNum, dist )
|
||||
BotBuiltinBotMeleeParamsOverride( entNum, dist )
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botmeleeparams" ] ) )
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botmeleeparamsoverride" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "botmeleeparams" ] ]]( entNum, dist );
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
BotBuiltinClearMeleeParams()
|
||||
{
|
||||
if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "clearbotmeleeparams" ] ) )
|
||||
{
|
||||
self [[ level.bot_builtins[ "clearbotmeleeparams" ] ]]();
|
||||
self [[ level.bot_builtins[ "botmeleeparamsoverride" ] ]]( entNum, dist );
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2,17 +2,11 @@ main()
|
||||
{
|
||||
level.bot_builtins[ "printconsole" ] = ::do_printconsole;
|
||||
level.bot_builtins[ "botmovementoverride" ] = ::do_botmovementoverride;
|
||||
level.bot_builtins[ "botclearmovementoverride" ] = ::do_botclearmovementoverride;
|
||||
level.bot_builtins[ "botclearbuttonoverride" ] = ::do_botclearbuttonoverride;
|
||||
level.bot_builtins[ "botbuttonoverride" ] = ::do_botbuttonoverride;
|
||||
level.bot_builtins[ "botclearoverrides" ] = ::do_botclearoverrides;
|
||||
level.bot_builtins[ "botclearweaponoverride" ] = ::do_botclearweaponoverride;
|
||||
level.bot_builtins[ "botclearoverride" ] = ::do_botclearoverride;
|
||||
level.bot_builtins[ "botweaponoverride" ] = ::do_botweaponoverride;
|
||||
level.bot_builtins[ "botclearbuttonoverrides" ] = ::do_botclearbuttonoverrides;
|
||||
level.bot_builtins[ "botaimoverride" ] = ::do_botaimoverride;
|
||||
level.bot_builtins[ "botclearaimoverride" ] = ::do_botclearaimoverride;
|
||||
level.bot_builtins[ "botmeleeparams" ] = ::do_botmeleeparams;
|
||||
level.bot_builtins[ "clearbotmeleeparams" ] = ::do_clearbotmeleeparams;
|
||||
level.bot_builtins[ "botmeleeparamsoverride" ] = ::do_botmeleeparamsoverride;
|
||||
level.bot_builtins[ "getfunction" ] = ::do_getfunction;
|
||||
level.bot_builtins[ "replacefunc" ] = ::do_replacefunc;
|
||||
level.bot_builtins[ "disabledetouronce" ] = ::do_disabledetouronce;
|
||||
@ -28,29 +22,14 @@ do_botmovementoverride( a, b )
|
||||
self botmovementoverride( a, b );
|
||||
}
|
||||
|
||||
do_botclearmovementoverride()
|
||||
do_botbuttonoverride( a )
|
||||
{
|
||||
self botclearmovementoverride();
|
||||
self botbuttonoverride( a );
|
||||
}
|
||||
|
||||
do_botclearbuttonoverride( a )
|
||||
do_botclearoverride( a )
|
||||
{
|
||||
self botclearbuttonoverride( a );
|
||||
}
|
||||
|
||||
do_botbuttonoverride( a, b )
|
||||
{
|
||||
self botbuttonoverride( a, b );
|
||||
}
|
||||
|
||||
do_botclearoverrides( a )
|
||||
{
|
||||
self botclearoverrides( a );
|
||||
}
|
||||
|
||||
do_botclearweaponoverride()
|
||||
{
|
||||
self botclearweaponoverride();
|
||||
self botclearoverride( a );
|
||||
}
|
||||
|
||||
do_botweaponoverride( a )
|
||||
@ -58,19 +37,14 @@ do_botweaponoverride( a )
|
||||
self botweaponoverride( a );
|
||||
}
|
||||
|
||||
do_botclearbuttonoverrides()
|
||||
do_botaimoverride( a )
|
||||
{
|
||||
self botclearbuttonoverrides();
|
||||
self botaimoverride( a );
|
||||
}
|
||||
|
||||
do_botaimoverride()
|
||||
do_botmeleeparamsoverride( entNum, dist )
|
||||
{
|
||||
self botaimoverride();
|
||||
}
|
||||
|
||||
do_botclearaimoverride()
|
||||
{
|
||||
self botclearaimoverride();
|
||||
self botmeleeparamsoverride( entNum, dist );
|
||||
}
|
||||
|
||||
do_getfunction( a, b )
|
||||
@ -87,13 +61,3 @@ do_disabledetouronce( a )
|
||||
{
|
||||
disabledetouronce( a );
|
||||
}
|
||||
|
||||
do_botmeleeparams( entNum, dist )
|
||||
{
|
||||
self botmeleeparams( entNum, dist );
|
||||
}
|
||||
|
||||
do_clearbotmeleeparams()
|
||||
{
|
||||
self botclearmeleeparams();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user