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

update bones

Browse Source
This commit is contained in:
ineed bots 2024-04-04 15:24:06 -06:00
parent 13b52670ed
commit 7d3dc13328
2 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -612,19 +612,22 @@ updateBones()
self endon( "disconnect" );
self endon( "death" );
bones = strtok( self.pers[ "bots" ][ "skill" ][ "bones" ], "," );
waittime = self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ];
for ( ;; )
{
self waittill_notify_or_timeout( "new_enemy", waittime );
oldbones = self.pers[ "bots" ][ "skill" ][ "bones" ];
bones = strtok( oldbones, "," );
if ( !isdefined( self.bot.target ) )
while ( oldbones == self.pers[ "bots" ][ "skill" ][ "bones" ] )
{
continue;
self waittill_notify_or_timeout( "new_enemy", self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ] );
if ( !isdefined( self.bot.target ) )
{
continue;
}
self.bot.target.bone = random( bones );
}
self.bot.target.bone = random( bones );
}
}
@ -733,6 +736,23 @@ targetObjUpdateNoTrace( obj )
obj.didlook = false;
}
/*
Returns true if myEye can see the bone of self
*/
checkTraceForBone( myEye, bone )
{
boneLoc = self getTagOrigin( bone );
if ( !isdefined( boneLoc ) )
{
return false;
}
trace = bullettrace( myEye, boneLoc, false, undefined );
return ( sighttracepassed( myEye, boneLoc, false, undefined ) && ( trace[ "fraction" ] >= 1.0 || trace[ "surfacetype" ] == "glass" ) );
}
/*
The main target thread, will update the bot's main target. Will auto target enemy players and handle script targets.
*/
@ -840,21 +860,9 @@ target_loop()
continue;
}
targetHead = player getTagOrigin( "j_head" );
targetAnkleLeft = player getTagOrigin( "j_ankle_le" );
targetAnkleRight = player getTagOrigin( "j_ankle_ri" );
traceHead = bullettrace( myEye, targetHead, false, undefined );
traceAnkleLeft = bullettrace( myEye, targetAnkleLeft, false, undefined );
traceAnkleRight = bullettrace( myEye, targetAnkleRight, false, undefined );
canTargetPlayer = ( ( sighttracepassed( myEye, targetHead, false, undefined ) ||
sighttracepassed( myEye, targetAnkleLeft, false, undefined ) ||
sighttracepassed( myEye, targetAnkleRight, false, undefined ) )
&& ( ( traceHead[ "fraction" ] >= 1.0 || traceHead[ "surfacetype" ] == "glass" ) ||
( traceAnkleLeft[ "fraction" ] >= 1.0 || traceAnkleLeft[ "surfacetype" ] == "glass" ) ||
( traceAnkleRight[ "fraction" ] >= 1.0 || traceAnkleRight[ "surfacetype" ] == "glass" ) )
canTargetPlayer = ( ( player checkTraceForBone( myEye, "j_head" ) ||
player checkTraceForBone( myEye, "j_ankle_le" ) ||
player checkTraceForBone( myEye, "j_ankle_ri" ) )
&& ( SmokeTrace( myEye, player.origin, level.smokeradius ) ||
daDist < level.bots_maxknifedistance * 4 )
@ -1615,9 +1623,9 @@ walk_loop()
dist = 16;
if ( level.waypointcount )
if ( level.waypoints.size )
{
goal = level.waypoints[ randomint( level.waypointcount ) ].origin;
goal = level.waypoints[ randomint( level.waypoints.size ) ].origin;
}
else
{

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

@ -1526,7 +1526,6 @@ load_waypoints()
{
mapname = getcvar( "mapname" );
level.waypointcount = 0;
level.waypointusage = [];
level.waypointusage[ "allies" ] = [];
level.waypointusage[ "axis" ] = [];
@ -1576,9 +1575,7 @@ load_waypoints()
BotBuiltinPrintConsole( "No waypoints loaded!" );
}
level.waypointcount = level.waypoints.size;
for ( i = 0; i < level.waypointcount; i++ )
for ( i = level.waypoints.size - 1; i >= 0; i-- )
{
if ( !isdefined( level.waypoints[ i ].children ) || !isdefined( level.waypoints[ i ].children.size ) )
{
@ -1677,7 +1674,7 @@ getWaypointsOfType( type )
{
answer = [];
for ( i = 0; i < level.waypointcount; i++ )
for ( i = level.waypoints.size - 1; i >= 0; i-- )
{
wp = level.waypoints[ i ];
@ -2406,16 +2403,18 @@ RemoveWaypointUsage( wp, team )
return;
}
if ( !isdefined( level.waypointusage[ team ][ wp + "" ] ) )
wpstr = wp + "";
if ( !isdefined( level.waypointusage[ team ][ wpstr ] ) )
{
return;
}
level.waypointusage[ team ][ wp + "" ]--;
level.waypointusage[ team ][ wpstr ]--;
if ( level.waypointusage[ team ][ wp + "" ] <= 0 )
if ( level.waypointusage[ team ][ wpstr ] <= 0 )
{
level.waypointusage[ team ][ wp + "" ] = undefined;
level.waypointusage[ team ][ wpstr ] = undefined;
}
}
@ -2427,7 +2426,7 @@ GetNearestWaypointWithSight( pos )
candidate = undefined;
dist = 2147483647;
for ( i = 0; i < level.waypointcount; i++ )
for ( i = level.waypoints.size - 1; i >= 0; i-- )
{
if ( !bullettracepassed( pos + ( 0, 0, 15 ), level.waypoints[ i ].origin + ( 0, 0, 15 ), false, undefined ) )
{
@ -2456,7 +2455,7 @@ getNearestWaypoint( pos )
candidate = undefined;
dist = 2147483647;
for ( i = 0; i < level.waypointcount; i++ )
for ( i = level.waypoints.size - 1; i >= 0; i-- )
{
curdis = distancesquared( level.waypoints[ i ].origin, pos );
@ -2541,7 +2540,8 @@ AStarSearch( start, goal, team, greedy_path )
// pop bestnode from queue
bestNode = open.data[ 0 ];
open HeapRemove();
openset[ bestNode.index + "" ] = undefined;
bestNodeStr = bestNode.index + "";
openset[ bestNodeStr ] = undefined;
wp = level.waypoints[ bestNode.index ];
// check if we made it to the goal
@ -2551,14 +2551,16 @@ AStarSearch( start, goal, team, greedy_path )
while ( isdefined( bestNode ) )
{
bestNodeStr = bestNode.index + "";
if ( isdefined( team ) && isdefined( level.waypointusage ) )
{
if ( !isdefined( level.waypointusage[ team ][ bestNode.index + "" ] ) )
if ( !isdefined( level.waypointusage[ team ][ bestNodeStr ] ) )
{
level.waypointusage[ team ][ bestNode.index + "" ] = 0;
level.waypointusage[ team ][ bestNodeStr ] = 0;
}
level.waypointusage[ team ][ bestNode.index + "" ]++;
level.waypointusage[ team ][ bestNodeStr ]++;
}
// construct path
@ -2574,6 +2576,7 @@ AStarSearch( start, goal, team, greedy_path )
for ( i = wp.children.size - 1; i >= 0; i-- )
{
child = wp.children[ i ];
childStr = child + "";
childWp = level.waypoints[ child ];
penalty = 1;
@ -2582,9 +2585,9 @@ AStarSearch( start, goal, team, greedy_path )
{
temppen = 1;
if ( isdefined( level.waypointusage[ team ][ child + "" ] ) )
if ( isdefined( level.waypointusage[ team ][ childStr ] ) )
{
temppen = level.waypointusage[ team ][ child + "" ]; // consider how many bots are taking this path
temppen = level.waypointusage[ team ][ childStr ]; // consider how many bots are taking this path
}
if ( temppen > 1 )
@ -2603,16 +2606,16 @@ AStarSearch( start, goal, team, greedy_path )
newg = bestNode.g + distancesquared( wp.origin, childWp.origin ) * penalty; // bots on same team's path are more expensive
// check if this child is in open or close with a g value less than newg
inopen = isdefined( openset[ child + "" ] );
inopen = isdefined( openset[ childStr ] );
if ( inopen && openset[ child + "" ].g <= newg )
if ( inopen && openset[ childStr ].g <= newg )
{
continue;
}
inclosed = isdefined( closed[ child + "" ] );
inclosed = isdefined( closed[ childStr ] );
if ( inclosed && closed[ child + "" ].g <= newg )
if ( inclosed && closed[ childStr ].g <= newg )
{
continue;
}
@ -2621,11 +2624,11 @@ AStarSearch( start, goal, team, greedy_path )
if ( inopen )
{
node = openset[ child + "" ];
node = openset[ childStr ];
}
else if ( inclosed )
{
node = closed[ child + "" ];
node = closed[ childStr ];
}
else
{
@ -2641,19 +2644,19 @@ AStarSearch( start, goal, team, greedy_path )
// check if in closed, remove it
if ( inclosed )
{
closed[ child + "" ] = undefined;
closed[ childStr ] = undefined;
}
// check if not in open, add it
if ( !inopen )
{
open HeapInsert( node );
openset[ child + "" ] = node;
openset[ childStr ] = node;
}
}
// done with children, push onto closed
closed[ bestNode.index + "" ] = bestNode;
closed[ bestNodeStr ] = bestNode;
}
return [];