Import more code from bot warfare.

This commit is contained in:
JezuzLizard 2022-11-22 10:28:33 -08:00
parent db823277b2
commit 1b1c2418ce
4 changed files with 3099 additions and 23 deletions

View File

@ -15,7 +15,7 @@ init()
if ( !getDvarInt( "bots_main" ) )
return;
thread load_waypoints();
//thread load_waypoints(); //Don't call for now
thread hook_callbacks();
if ( getDvar( "bots_main_GUIDs" ) == "" )
@ -144,8 +144,8 @@ onPlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon,
{
if ( self is_bot() )
{
//self maps\mp\bots\_bot_internal::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset );
//self maps\mp\bots\_bot_script::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset );
//self scripts\sp\bots\_bot_internal::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset );
self scripts\sp\bots\_bot_script::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset );
}
self [[level.prevCallbackPlayerDamage]]( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset );
@ -222,8 +222,8 @@ connected()
self thread added();
}
//self thread maps\mp\bots\_bot_internal::connected();
//self thread maps\mp\bots\_bot_script::connected();
self thread scripts\sp\bots\_bot_internal::connected();
self thread scripts\sp\bots\_bot_script::connected();
level.bots[level.bots.size] = self;
self thread onDisconnect();
@ -258,8 +258,8 @@ added()
{
self endon( "disconnect" );
//self thread maps\mp\bots\_bot_internal::added();
//self thread maps\mp\bots\_bot_script::added();
self thread scripts\sp\bots\_bot_internal::added();
//self thread scripts\sp\bots\_bot_script::added();
}
/*

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -69,15 +69,15 @@ BotSetStance( stance )
switch ( stance )
{
case "stand":
//self maps\mp\bots\_bot_internal::stand();
//self scripts\sp\bots\_bot_internal::stand();
break;
case "crouch":
//self maps\mp\bots\_bot_internal::crouch();
//self scripts\sp\bots\_bot_internal::crouch();
break;
case "prone":
//self maps\mp\bots\_bot_internal::prone();
//self scripts\sp\bots\_bot_internal::prone();
break;
}
}
@ -87,7 +87,7 @@ BotSetStance( stance )
*/
BotChangeToWeapon( weap )
{
//self maps\mp\bots\_bot_internal::changeToWeap( weap );
self botWeapon( weap );
}
/*
@ -95,7 +95,7 @@ BotChangeToWeapon( weap )
*/
BotPressAttack( time )
{
//self maps\mp\bots\_bot_internal::pressFire( time );
self scripts\sp\bots\_bot_internal::pressFire( time );
}
/*
@ -103,7 +103,7 @@ BotPressAttack( time )
*/
BotPressADS( time )
{
//self maps\mp\bots\_bot_internal::pressADS( time );
self scripts\sp\bots\_bot_internal::pressADS( time );
}
/*
@ -111,7 +111,7 @@ BotPressADS( time )
*/
BotPressUse( time )
{
//self maps\mp\bots\_bot_internal::use( time );
self scripts\sp\bots\_bot_internal::use( time );
}
/*
@ -119,7 +119,7 @@ BotPressUse( time )
*/
BotPressFrag( time )
{
//self maps\mp\bots\_bot_internal::frag( time );
self scripts\sp\bots\_bot_internal::frag( time );
}
/*
@ -127,7 +127,7 @@ BotPressFrag( time )
*/
BotPressSmoke( time )
{
//self maps\mp\bots\_bot_internal::smoke( time );
self scripts\sp\bots\_bot_internal::smoke( time );
}
/*
@ -798,13 +798,6 @@ load_waypoints()
}
else
{
switch ( mapname )
{
default:
maps\mp\bots\waypoints\_custom_map::main( mapname );
break;
}
if ( level.waypoints.size )
PrintConsole( "Loaded " + level.waypoints.size + " waypoints from script.\n" );
}
@ -1383,3 +1376,11 @@ random_normal_distribution( mean, std_deviation, lower_bound, upper_bound )
return ( number );
}
/*
If the player is in laststand
*/
inLastStand()
{
return ( isDefined( self.lastStand ) && self.lastStand );
}