added prio goal

This commit is contained in:
ineed bots 2023-11-30 03:31:43 -06:00
parent e02f7d6cb2
commit 5ceeabcc2a
2 changed files with 30 additions and 2 deletions

View File

@ -141,6 +141,8 @@ resetBotVars()
self.bot.is_cur_sniper = false; self.bot.is_cur_sniper = false;
self.bot.is_cur_akimbo = false; self.bot.is_cur_akimbo = false;
self.bot.prio_objective = false;
self.bot.rand = randomInt( 100 ); self.bot.rand = randomInt( 100 );
self BotBuiltinBotStop(); self BotBuiltinBotStop();
@ -1567,7 +1569,7 @@ aim_loop()
return; return;
} }
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_look_time = self.pers["bots"]["skill"]["no_trace_look_time"]; no_trace_look_time = self.pers["bots"]["skill"]["no_trace_look_time"];
no_trace_time = self.bot.target.no_trace_time; no_trace_time = self.bot.target.no_trace_time;
@ -1983,7 +1985,7 @@ killWalkCauseNoWaypoints()
*/ */
walk_loop() walk_loop()
{ {
hasTarget = ( ( isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) ) || isDefined( self.bot.jav_loc ) ); hasTarget = ( ( isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && !self.bot.prio_objective ) || isDefined( self.bot.jav_loc ) );
if ( hasTarget ) if ( hasTarget )
{ {

View File

@ -381,6 +381,32 @@ HasBotJavelinLocation()
return isDefined( self.bot.jav_loc ); return isDefined( self.bot.jav_loc );
} }
/*
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" );
}
/* /*
Sets the aim position of the bot Sets the aim position of the bot
*/ */