Look for better weapons when searching for enemy

Author: sunzenshen

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

@@ -1,9 +1,6 @@
 #pragma once
 
 #include "bot/neo_bot.h"
-#include <memory>
-
-class CNEOIgnoredWeaponsCache;
 
 //--------------------------------------------------------------------------------------------------------
 class CNEOBotCtgLoneWolf : public Action< CNEOBot >

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

@@ -2,6 +2,7 @@
 #include "bot/neo_bot.h"
 #include "bot/behavior/neo_bot_attack.h"
 #include "bot/behavior/neo_bot_ctg_lone_wolf_seek.h"
+#include "bot/behavior/neo_bot_seek_weapon.h"
 #include "bot/neo_bot_path_compute.h"
 #include "neo_gamerules.h"
 #include "neo_player.h"
@@ -75,6 +76,15 @@ class CSearchForUnexplored : public ISearchSurroundingAreasFunctor
 	int m_iAreaLimit;
 };
 
+//---------------------------------------------------------------------------------------------
+CNEOBotCtgLoneWolfSeek::CNEOBotCtgLoneWolfSeek( void )
+{
+	m_pIgnoredWeapons = std::make_unique<CNEOIgnoredWeaponsCache>();
+}
+
+//---------------------------------------------------------------------------------------------
+CNEOBotCtgLoneWolfSeek::~CNEOBotCtgLoneWolfSeek() = default;
+
 //---------------------------------------------------------------------------------------------
 ActionResult< CNEOBot >	CNEOBotCtgLoneWolfSeek::OnStart( CNEOBot *me, Action< CNEOBot > *priorAction )
 {
@@ -87,6 +97,9 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfSeek::OnStart( CNEOBot *me, Action< CN
 	m_vecLastGhostPos = NEORules()->GetGhostPos();
 	m_pCachedGhostArea = TheNavMesh->GetNearestNavArea( m_vecLastGhostPos );
 
+	m_scavengeTimer.Invalidate();
+	m_pIgnoredWeapons->Reset();
+
 	return Continue();
 }
 
@@ -133,6 +146,18 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfSeek::Update( CNEOBot *me, float inter
 		me->ReloadIfLowClip(true); // force reload true
 	}
 
+	// Periodically look for better weapons
+	if ( ( !m_scavengeTimer.HasStarted() || m_scavengeTimer.IsElapsed() ) )
+	{
+		m_scavengeTimer.Start( RandomFloat( 3.0f, 6.0f ) );
+
+		CBaseEntity *pNearbyWeapon = FindNearestPrimaryWeapon( me, true, m_pIgnoredWeapons.get() );
+		if ( pNearbyWeapon )
+		{
+			return SuspendFor( new CNEOBotSeekWeapon( pNearbyWeapon, m_pIgnoredWeapons.get() ), "Scavenging for nearby weapon" );
+		}
+	}
+
 	Vector vecSoundPos = me->GetAudibleEnemySoundPos();
 	if ( vecSoundPos != CNEO_Player::VECTOR_INVALID_WAYPOINT )
 	{

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

@@ -3,15 +3,18 @@
 #include "bot/neo_bot.h"
 #include "bot/behavior/neo_bot_ctg_lone_wolf.h"
 #include "utlmap.h"
+#include <memory>
 
 class CWeaponDetpack;
+class CNEOIgnoredWeaponsCache;
 
 //--------------------------------------------------------------------------------------------------------
 class CNEOBotCtgLoneWolfSeek : public CNEOBotCtgLoneWolf
 {
 public:
 	typedef CNEOBotCtgLoneWolf BaseClass;
-	CNEOBotCtgLoneWolfSeek( void ) = default;
+	CNEOBotCtgLoneWolfSeek( void );
+	virtual ~CNEOBotCtgLoneWolfSeek();
 
 	virtual ActionResult< CNEOBot > OnStart( CNEOBot *me, Action< CNEOBot > *priorAction ) override;
 	virtual ActionResult< CNEOBot > Update( CNEOBot *me, float interval ) override;
@@ -35,5 +38,8 @@ class CNEOBotCtgLoneWolfSeek : public CNEOBotCtgLoneWolf
 	int m_iExplorationTargetId{-1};
 	Vector m_vecSearchWaypoint{CNEO_Player::VECTOR_INVALID_WAYPOINT};
 
+	std::unique_ptr<CNEOIgnoredWeaponsCache> m_pIgnoredWeapons;
+	CountdownTimer m_scavengeTimer;
+
 	void MarkVisibleAreasAsExplored( CNEOBot *me, CNavArea *currentArea, CNavArea *ghostArea = nullptr );
 };