mirror of
https://github.com/JezuzLizard/t4sp_bot_warfare.git
synced 2025-09-18 22:27:27 +00:00
Add debug prints. Move objective related code into separate scripts.
Add the ability to prioritize objectives over targets.
This commit is contained in:
@@ -96,6 +96,9 @@ resetBotVars()
|
||||
self.bot.cur_weap_dist_multi = 1;
|
||||
self.bot.is_cur_sniper = false;
|
||||
|
||||
self.bot.prio_objective = false;
|
||||
self.bot.path_inaccessible = false;
|
||||
|
||||
self.bot.rand = randomInt( 100 );
|
||||
|
||||
self botStop();
|
||||
@@ -419,6 +422,8 @@ stance_loop()
|
||||
if ( toStance != "stand" && toStance != "crouch" && toStance != "prone" )
|
||||
toStance = "crouch";
|
||||
|
||||
toStance = "stand"; //Hack to make the bots never crouch
|
||||
|
||||
if ( toStance == "stand" )
|
||||
self stand();
|
||||
else if ( toStance == "crouch" )
|
||||
@@ -1187,7 +1192,7 @@ aim_loop()
|
||||
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 )
|
||||
{
|
||||
no_trace_time = self.bot.target.no_trace_time;
|
||||
no_trace_look_time = self.pers["bots"]["skill"]["no_trace_look_time"];
|
||||
@@ -1466,9 +1471,9 @@ walk()
|
||||
*/
|
||||
walk_loop()
|
||||
{
|
||||
hasTarget = isDefined( self.bot.target ) && isDefined( self.bot.target.entity );
|
||||
shouldTarget = isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && !self.bot.prio_objective;
|
||||
|
||||
if ( hasTarget )
|
||||
if ( shouldTarget )
|
||||
{
|
||||
curweap = self getCurrentWeapon();
|
||||
|
||||
@@ -1495,7 +1500,7 @@ walk_loop()
|
||||
|
||||
isScriptGoal = false;
|
||||
|
||||
if ( isDefined( self.bot.script_goal ) && !hasTarget )
|
||||
if ( isDefined( self.bot.script_goal ) && !shouldTarget )
|
||||
{
|
||||
goal = self.bot.script_goal;
|
||||
dist = self.bot.script_goal_dist;
|
||||
@@ -1504,7 +1509,7 @@ walk_loop()
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( hasTarget )
|
||||
if ( shouldTarget )
|
||||
goal = self.bot.target.last_seen_pos;
|
||||
|
||||
self notify( "new_goal_internal" );
|
||||
@@ -1538,11 +1543,11 @@ doWalk( goal, dist, isScriptGoal )
|
||||
path_was_truncated = ( current + 1 ) >= 32;
|
||||
|
||||
//Couldn't generate path to goal
|
||||
self.path_inaccessible = false;
|
||||
self.bot.path_inaccessible = false;
|
||||
if ( current <= -1 )
|
||||
{
|
||||
self.bot.path_inaccessible = true;
|
||||
self notify( "bad_path_internal" );
|
||||
self.path_inaccessible = true;
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user