mirror of
https://github.com/ineedbots/iw4_bot_warfare.git
synced 2025-04-19 04:52:54 +00:00
update bones
This commit is contained in:
ineed bots
parent
7a1f8fd916
commit
9e949c08d4
@ -980,24 +980,27 @@ updateBones()
|
||||
self endon( "disconnect" );
|
||||
self endon( "spawned_player" );
|
||||
|
||||
bones = strtok( self.pers[ "bots" ][ "skill" ][ "bones" ], "," );
|
||||
waittime = self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ];
|
||||
|
||||
for ( ;; )
|
||||
{
|
||||
self waittill_any_timeout( waittime, "new_enemy" );
|
||||
oldbones = self.pers[ "bots" ][ "skill" ][ "bones" ];
|
||||
bones = strtok( oldbones, "," );
|
||||
|
||||
if ( !isalive( self ) )
|
||||
while ( oldbones == self.pers[ "bots" ][ "skill" ][ "bones" ] )
|
||||
{
|
||||
return;
|
||||
}
|
||||
self waittill_any_timeout( self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ], "new_enemy" );
|
||||
|
||||
if ( !isdefined( self.bot.target ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if ( !isalive( self ) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
self.bot.target.bone = random( bones );
|
||||
if ( !isdefined( self.bot.target ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
self.bot.target.bone = random( bones );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1106,6 +1109,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.
|
||||
*/
|
||||
@ -1244,21 +1264,9 @@ target_loop()
|
||||
}
|
||||
else
|
||||
{
|
||||
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" ) )
|
||||
|
||||
&& ( ignoreSmoke ||
|
||||
SmokeTrace( myEye, player.origin, level.smokeradius ) ||
|
||||
@ -2169,9 +2177,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
|
||||
{
|
||||
|
||||
@ -1292,7 +1292,6 @@ readWpsFromFile( mapname )
|
||||
*/
|
||||
load_waypoints()
|
||||
{
|
||||
level.waypointcount = 0;
|
||||
level.waypointusage = [];
|
||||
level.waypointusage[ "allies" ] = [];
|
||||
level.waypointusage[ "axis" ] = [];
|
||||
@ -1331,9 +1330,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 ) )
|
||||
{
|
||||
@ -1432,7 +1429,7 @@ getWaypointsOfType( type )
|
||||
{
|
||||
answer = [];
|
||||
|
||||
for ( i = 0; i < level.waypointcount; i++ )
|
||||
for ( i = level.waypoints.size - 1; i >= 0; i-- )
|
||||
{
|
||||
wp = level.waypoints[ i ];
|
||||
|
||||
@ -2440,16 +2437,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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2461,7 +2460,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 ) )
|
||||
{
|
||||
@ -2490,7 +2489,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 );
|
||||
|
||||
@ -2575,7 +2574,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
|
||||
@ -2585,14 +2585,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
|
||||
@ -2608,6 +2610,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;
|
||||
@ -2616,9 +2619,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 )
|
||||
@ -2637,16 +2640,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;
|
||||
}
|
||||
@ -2655,11 +2658,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
|
||||
{
|
||||
@ -2675,19 +2678,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 [];
|
||||
|
||||
@ -137,29 +137,29 @@ watchAstarCommand()
|
||||
self endon( "death" );
|
||||
|
||||
self notifyonplayercommand( "astar", "+gostand" );
|
||||
self.astar = undefined;
|
||||
|
||||
for ( ;; )
|
||||
{
|
||||
self waittill( "astar" );
|
||||
|
||||
if ( 1 )
|
||||
if ( isdefined( self.astar ) )
|
||||
{
|
||||
continue;
|
||||
self iprintln( "Clear AStar" );
|
||||
self.astar = undefined;
|
||||
self waittill( "astar" );
|
||||
}
|
||||
|
||||
self iprintln( "Start AStar" );
|
||||
self.astar = undefined;
|
||||
astar = spawnstruct();
|
||||
astar.start = self.origin;
|
||||
self.astar = spawnstruct();
|
||||
self.astar.start = self.origin;
|
||||
|
||||
self waittill( "astar" );
|
||||
self iprintln( "End AStar" );
|
||||
astar.goal = self.origin;
|
||||
self.astar.goal = self.origin;
|
||||
|
||||
astar.nodes = AStarSearch( astar.start, astar.goal, undefined, true );
|
||||
self iprintln( "AStar size: " + astar.nodes.size );
|
||||
|
||||
self.astar = astar;
|
||||
self.astar.nodes = AStarSearch( self.astar.start, self.astar.goal, undefined, true );
|
||||
self iprintln( "AStar size: " + self.astar.nodes.size );
|
||||
}
|
||||
}
|
||||
|
||||
@ -251,21 +251,31 @@ updateWaypointsStats()
|
||||
|
||||
if ( isdefined( self.astar ) )
|
||||
{
|
||||
print3d( self.astar.start + ( 0, 0, 35 ), "start", ( 0, 0, 1 ), 2 );
|
||||
print3d( self.astar.goal + ( 0, 0, 35 ), "goal", ( 0, 0, 1 ), 2 );
|
||||
|
||||
prev = self.astar.start + ( 0, 0, 35 );
|
||||
|
||||
for ( i = self.astar.nodes.size - 1; i >= 0; i-- )
|
||||
if ( isdefined( self.astar.start ) )
|
||||
{
|
||||
node = self.astar.nodes[ i ];
|
||||
|
||||
line( prev, level.waypoints[ node ].origin + ( 0, 0, 35 ), ( 0, 1, 1 ) );
|
||||
|
||||
prev = level.waypoints[ node ].origin + ( 0, 0, 35 );
|
||||
print3d( self.astar.start + ( 0, 0, 35 ), "start", ( 0, 0, 1 ), 2 );
|
||||
}
|
||||
|
||||
line( prev, self.astar.goal + ( 0, 0, 35 ), ( 0, 1, 1 ) );
|
||||
if ( isdefined( self.astar.goal ) )
|
||||
{
|
||||
print3d( self.astar.goal + ( 0, 0, 35 ), "goal", ( 0, 0, 1 ), 2 );
|
||||
}
|
||||
|
||||
if ( isdefined( self.astar.start ) && isdefined( self.astar.goal ) && isdefined( self.astar.nodes ) )
|
||||
{
|
||||
prev = self.astar.start + ( 0, 0, 35 );
|
||||
|
||||
for ( i = self.astar.nodes.size - 1; i >= 0; i-- )
|
||||
{
|
||||
node = self.astar.nodes[ i ];
|
||||
|
||||
line( prev, level.waypoints[ node ].origin + ( 0, 0, 35 ), ( 0, 1, 1 ) );
|
||||
|
||||
prev = level.waypoints[ node ].origin + ( 0, 0, 35 );
|
||||
}
|
||||
|
||||
line( prev, self.astar.goal + ( 0, 0, 35 ), ( 0, 1, 1 ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -483,6 +493,7 @@ LoadWaypoints()
|
||||
self DeleteAllWaypoints();
|
||||
self iprintlnbold( "Loading WPS..." );
|
||||
load_waypoints();
|
||||
level.waypointcount = level.waypoints.size;
|
||||
|
||||
wait 1;
|
||||
|
||||
@ -771,7 +782,7 @@ DeleteAllWaypoints()
|
||||
self iprintln( "DelAllWps" );
|
||||
}
|
||||
|
||||
buildChildCountString ( wp )
|
||||
buildChildCountString( wp )
|
||||
{
|
||||
if ( wp == -1 )
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user