Look outward from juggernaut if not ready to activate

Author: sunzenshen

src/game/server/neo/bot/behavior/neo_bot_jgr_capture.cpp

@@ -123,11 +123,7 @@ ActionResult<CNEOBot> CNEOBotJgrCapture::Update( CNEOBot *me, float interval )
 			}
 
 			// Look away from the juggernaut to watch for threats
-			Vector vecAwayFromJgr = me->GetAbsOrigin() - m_hObjective->GetAbsOrigin();
-			Vector2D vecLookDir2D = vecAwayFromJgr.AsVector2D();
-			vecLookDir2D.NormalizeInPlace();
-			const Vector vecLookPos = me->EyePosition() + Vector( vecLookDir2D.x, vecLookDir2D.y, 0.0f ) * 500.0f;
-			me->GetBodyInterface()->AimHeadTowards( vecLookPos, IBody::IMPORTANT, 0.1f, nullptr, "Facing away from Juggernaut to watch for threats" );
+			CNEOBotJgrCapture::LookAwayFrom( me, m_hObjective );
 
 			me->ReleaseUseButton();
 			m_useAttemptTimer.Invalidate();
@@ -145,7 +141,9 @@ ActionResult<CNEOBot> CNEOBotJgrCapture::Update( CNEOBot *me, float interval )
 #endif
 			me->ReleaseUseButton();
 			m_useAttemptTimer.Invalidate();
-			return SuspendFor( new CNEOBotRetreatToCover( JGR_CAPTURE_LOCKED_RETREAT_TIME ), "Juggernaut is locked, taking cover to wait for it to unlock" );
+
+			// Look away from the juggernaut while it's locked to watch for threats
+			CNEOBotJgrCapture::LookAwayFrom( me, m_hObjective );
 		}
 
 		const Vector vecObjectiveCenter = m_hObjective->WorldSpaceCenter();
@@ -222,3 +220,19 @@ ActionResult<CNEOBot> CNEOBotJgrCapture::Update( CNEOBot *me, float interval )
 
 	return Continue();
 }
+
+//---------------------------------------------------------------------------------------------
+void CNEOBotJgrCapture::LookAwayFrom( CNEOBot *me, CBaseEntity *pTarget )
+{
+	if ( !pTarget )
+	{
+		return;
+	}
+
+	Vector vecAwayFromTarget = me->GetAbsOrigin() - pTarget->GetAbsOrigin();
+	Vector2D vecLookDir2D = vecAwayFromTarget.AsVector2D();
+	vecLookDir2D.NormalizeInPlace();
+
+	const Vector vecLookPos = me->EyePosition() + Vector( vecLookDir2D.x, vecLookDir2D.y, 0.0f ) * 500.0f;
+	me->GetBodyInterface()->AimHeadTowards( vecLookPos, IBody::IMPORTANT, 0.1f, nullptr, "Facing away from target to watch for threats" );
+}

src/game/server/neo/bot/behavior/neo_bot_jgr_capture.h

@@ -19,6 +19,8 @@ class CNEOBotJgrCapture : public Action<CNEOBot>
 	virtual ActionResult<CNEOBot> OnSuspend( CNEOBot *me, Action<CNEOBot> *interruptingAction ) override;
 	virtual ActionResult<CNEOBot> OnResume( CNEOBot *me, Action<CNEOBot> *interruptingAction ) override;
 
+	static void LookAwayFrom( CNEOBot *me, CBaseEntity *pTarget );
+
 private:
 	void StopMoving( CNEOBot *me );
 

src/game/server/neo/bot/behavior/neo_bot_jgr_seek.cpp

@@ -3,6 +3,7 @@
 #include "neo_gamerules.h"
 #include "bot/neo_bot.h"
 #include "bot/neo_bot_path_compute.h"
+#include "bot/behavior/neo_bot_attack.h"
 #include "bot/behavior/neo_bot_jgr_seek.h"
 #include "bot/behavior/neo_bot_jgr_escort.h"
 #include "bot/behavior/neo_bot_jgr_enemy.h"
@@ -65,7 +66,24 @@ ActionResult< CNEOBot > CNEOBotJgrSeek::Update( CNEOBot *me, float interval )
 
 					if ( FStrEq( classname, "neo_juggernaut" ) )
 					{
-						return SuspendFor( new CNEOBotJgrCapture( static_cast<CNEO_Juggernaut*>(m_hTargetEntity.Get()) ), "Capturing Juggernaut" );
+						CNEO_Juggernaut *pJgr = static_cast<CNEO_Juggernaut*>( m_hTargetEntity.Get() );
+						if ( pJgr )
+						{
+							CBasePlayer *pActivatingPlayer = pJgr->GetActivatingPlayer();
+							if ( NEORules()->IsJuggernautLocked()
+								|| ( pActivatingPlayer && me->InSameTeam( pActivatingPlayer ) && pActivatingPlayer != me ) )
+							{
+								CNEOBotJgrCapture::LookAwayFrom( me, pJgr );
+								m_path.Invalidate(); // wait at juggernaut
+								if ( me->GetVisionInterface()->GetPrimaryKnownThreat() )
+								{
+									return SuspendFor( new CNEOBotAttack, "Intercepting enemies near juggernaut" );
+								}
+								return Continue();
+							}
+						}
+
+						return SuspendFor( new CNEOBotJgrCapture( pJgr ), "Capturing Juggernaut" );
 					}
 				}
 			}
@@ -98,6 +116,17 @@ void CNEOBotJgrSeek::RecomputeSeekPath( CNEOBot *me )
 			CBaseEntity* pJuggernaut = gEntList.FindEntityByClassname(NULL, "neo_juggernaut");
 			if (pJuggernaut)
 			{
+				const float useRangeSq = CNEO_Juggernaut::GetUseDistanceSquared() * 0.8f;
+				if ( me->GetAbsOrigin().DistToSqr( pJuggernaut->GetAbsOrigin() ) < useRangeSq )
+				{
+					// We're already at the goal, no need to path.
+					m_vGoalPos = pJuggernaut->WorldSpaceCenter();
+					m_bGoingToTargetEntity = true;
+					m_hTargetEntity = pJuggernaut;
+					m_path.Invalidate();
+					return;
+				}
+
 				m_vGoalPos = pJuggernaut->WorldSpaceCenter();
 				m_bGoingToTargetEntity = true;
 				m_hTargetEntity = pJuggernaut;