small fix

This commit is contained in:
ineed bots 2024-04-04 17:01:33 -06:00
parent f133f5f33f
commit 5301ae50ec

View File

@ -570,6 +570,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
{ {
@ -916,21 +922,21 @@ updateBones()
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "death" ); self endon( "death" );
for ( ;; ) for ( ;; )
{ {
oldbones = self.pers[ "bots" ][ "skill" ][ "bones" ]; oldbones = self.pers[ "bots" ][ "skill" ][ "bones" ];
bones = strtok( oldbones, "," ); bones = strtok( oldbones, "," );
while ( oldbones == self.pers[ "bots" ][ "skill" ][ "bones" ] ) while ( oldbones == self.pers[ "bots" ][ "skill" ][ "bones" ] )
{ {
self waittill_notify_or_timeout( "new_enemy", self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ] ); self waittill_notify_or_timeout( "new_enemy", self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ] );
if ( !isdefined( self.bot.target ) ) if ( !isdefined( self.bot.target ) )
{ {
continue; continue;
} }
self.bot.target.bone = PickRandom( bones ); self.bot.target.bone = PickRandom( bones );
} }
} }
@ -1047,14 +1053,14 @@ targetObjUpdateNoTrace( obj )
checkTraceForBone( myEye, bone ) checkTraceForBone( myEye, bone )
{ {
boneLoc = self gettagorigin( bone ); boneLoc = self gettagorigin( bone );
if ( !isdefined( boneLoc ) ) if ( !isdefined( boneLoc ) )
{ {
return false; return false;
} }
trace = bullettrace( myEye, boneLoc, false, undefined ); trace = bullettrace( myEye, boneLoc, false, undefined );
return ( sighttracepassed( myEye, boneLoc, false, undefined ) && ( trace[ "fraction" ] >= 1.0 || trace[ "surfacetype" ] == "glass" ) ); return ( sighttracepassed( myEye, boneLoc, false, undefined ) && ( trace[ "fraction" ] >= 1.0 || trace[ "surfacetype" ] == "glass" ) );
} }
@ -1170,8 +1176,8 @@ target_loop()
} }
canTargetPlayer = ( ( player checkTraceForBone( myEye, "j_head" ) || canTargetPlayer = ( ( player checkTraceForBone( myEye, "j_head" ) ||
player checkTraceForBone( myEye, "j_ankle_le" ) || player checkTraceForBone( myEye, "j_ankle_le" ) ||
player checkTraceForBone( myEye, "j_ankle_ri" ) ) player checkTraceForBone( myEye, "j_ankle_ri" ) )
&& ( SmokeTrace( myEye, player.origin, level.smokeradius ) || && ( SmokeTrace( myEye, player.origin, level.smokeradius ) ||
daDist < level.bots_maxknifedistance * 4 ) daDist < level.bots_maxknifedistance * 4 )
@ -1827,6 +1833,7 @@ aim()
for ( ;; ) for ( ;; )
{ {
wait 0.05; wait 0.05;
waittillframeend;
if ( level.inprematchperiod || level.gameended || self.bot.isfrozen || self isFlared() ) if ( level.inprematchperiod || level.gameended || self.bot.isfrozen || self isFlared() )
{ {