Bots swap for more powerful weapons

Author: sunzenshen

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

@@ -20,6 +20,7 @@ CNEOBotCtgLoneWolf::CNEOBotCtgLoneWolf( void )
 	m_bHasRetreatedFromGhost = false;
 	m_vecDropThreatPos = CNEO_Player::VECTOR_INVALID_WAYPOINT;
 	m_closestCapturePoint = CNEO_Player::VECTOR_INVALID_WAYPOINT;
+	m_pIgnoredWeapons = std::make_unique<CNEOIgnoredWeaponsCache>();
 }
 
 //---------------------------------------------------------------------------------------------
@@ -33,6 +34,8 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::OnStart( CNEOBot *me, Action< CNEOBo
 	m_repathTimer.Invalidate();
 	m_stalemateTimer.Invalidate();
 	m_capPointUpdateTimer.Invalidate();
+	m_scavengeTimer.Invalidate();
+	m_pIgnoredWeapons->Reset();
 	m_vecDropThreatPos = CNEO_Player::VECTOR_INVALID_WAYPOINT;
 	m_closestCapturePoint = CNEO_Player::VECTOR_INVALID_WAYPOINT;
 	m_hPursueTarget = nullptr;
@@ -62,7 +65,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 		// First, ensure we have a weapon.
 		if ( !me->Weapon_GetSlot( 0 ) )
 		{
-			return SuspendFor( new CNEOBotSeekWeapon(), "Scavenging for weapon to hunt threat" );
+			return SuspendFor( new CNEOBotSeekWeapon(nullptr, m_pIgnoredWeapons.get()), "Scavenging for weapon to hunt threat" );
 		}
 
 		// We have a weapon. Investigate the last known location.
@@ -207,22 +210,19 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 		else
 		{
 			// Enemy is closer to goal (blocking us) or gaining on us.
-
-			// If we see a weapon nearby, drop the ghost and take it
-			CBaseEntity *pNearbyWeapon = FindNearestPrimaryWeapon( me->GetAbsOrigin(), true );
-			if ( pNearbyWeapon )
+			if ( m_scavengeTimer.IsElapsed() )
 			{
-				CBaseCombatWeapon *pGhostWep = me->Weapon_GetSlot( 0 );
-				if ( pGhostWep )
+				m_scavengeTimer.Start( RandomFloat( 0.5f, 1.0f ) );
+
+				// If we see a weapon nearby, drop the ghost and take it
+				CBaseEntity *pNearbyWeapon = FindNearestPrimaryWeapon( me, true, m_pIgnoredWeapons.get() );
+				if ( pNearbyWeapon )
 				{
-					if ( me->GetActiveWeapon() != pGhostWep )
+					CBaseCombatWeapon *pGhostWep = me->Weapon_GetSlot( 0 );
+					if ( pGhostWep )
 					{
-						me->Weapon_Switch( pGhostWep );
-						return Continue();
+						return SuspendFor( new CNEOBotSeekWeapon( pNearbyWeapon, m_pIgnoredWeapons.get() ), "Dropping ghost to scavenge nearby weapon" );
 					}
-
-					me->PressDropButton( 0.1f );
-					return ChangeTo( new CNEOBotSeekWeapon(), "Dropping ghost to scavenge nearby weapon" );
 				}
 			}
 

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

@@ -1,6 +1,9 @@
 #pragma once
 
 #include "bot/neo_bot.h"
+#include <memory>
+
+class CNEOIgnoredWeaponsCache;
 
 //--------------------------------------------------------------------------------------------------------
 class CNEOBotCtgLoneWolf : public Action< CNEOBot >
@@ -29,6 +32,8 @@ class CNEOBotCtgLoneWolf : public Action< CNEOBot >
 	Vector m_vecDropThreatPos;
 	CHandle<CBaseEntity> m_hPursueTarget;
 	bool m_bPursuingDropThreat;
+	std::unique_ptr<CNEOIgnoredWeaponsCache> m_pIgnoredWeapons;
+	CountdownTimer m_scavengeTimer;
 
 	ActionResult< CNEOBot > UpdateLookAround( CNEOBot *me, const Vector &anchorPos );
 	CountdownTimer m_lookAroundTimer;