add goal prio

This commit is contained in:
ineed bots 2023-11-30 03:19:54 -06:00
parent a114e724fd
commit 90eec289a1
3 changed files with 31 additions and 3 deletions

View File

@ -159,6 +159,8 @@ resetBotVars()
self.bot.cur_weap_dist_multi = 1; self.bot.cur_weap_dist_multi = 1;
self.bot.is_cur_sniper = false; self.bot.is_cur_sniper = false;
self.bot.prio_objective = false;
self.bot.rand = randomInt( 100 ); self.bot.rand = randomInt( 100 );
self BotBuiltinBotStop(); self BotBuiltinBotStop();
@ -1294,7 +1296,7 @@ aim_loop()
aimspeed *= 1 + adsAimSpeedFact * adsAmount; aimspeed *= 1 + adsAimSpeedFact * adsAmount;
} }
if ( isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) ) if ( isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && !( self.bot.prio_objective && isDefined( self.bot.script_aimpos ) ) )
{ {
no_trace_time = self.bot.target.no_trace_time; no_trace_time = self.bot.target.no_trace_time;
no_trace_look_time = self.pers["bots"]["skill"]["no_trace_look_time"]; no_trace_look_time = self.pers["bots"]["skill"]["no_trace_look_time"];
@ -1672,7 +1674,7 @@ killWalkCauseNoWaypoints()
*/ */
walk_loop() walk_loop()
{ {
hasTarget = isDefined( self.bot.target ) && isDefined( self.bot.target.entity ); hasTarget = isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && !self.bot.prio_objective;
if ( hasTarget ) if ( hasTarget )
{ {

View File

@ -468,6 +468,32 @@ HasThreat()
return ( isDefined( self GetThreat() ) ); return ( isDefined( self GetThreat() ) );
} }
/*
Returns whether the bot has a priority objective
*/
HasPriorityObjective()
{
return self.bot.prio_objective;
}
/*
Sets the bot to prioritize the objective over targeting enemies
*/
SetPriorityObjective()
{
self.bot.prio_objective = true;
self notify( "kill_goal" );
}
/*
Clears the bot's priority objective to allow the bot to target enemies automatically again
*/
ClearPriorityObjective()
{
self.bot.prio_objective = false;
self notify( "kill_goal" );
}
/* /*
If the player is defusing If the player is defusing
*/ */

View File

@ -12,7 +12,7 @@ init()
do_printconsole( s ) do_printconsole( s )
{ {
PrintConsole( s + "\n" ); PrintConsole( s );
} }
do_filewrite( file, contents, mode ) do_filewrite( file, contents, mode )