Refactor ReloadIfLowClip

Author: sunzenshen

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

@@ -35,6 +35,7 @@ ActionResult<CNEOBot> CNEOBotJgrCapture::OnStart( CNEOBot *me, Action<CNEOBot> *
 
 	// Ignore enemies while capturing juggernaut
 	me->StopLookingAroundForEnemies();
+	me->ReloadIfLowClip(); // might as well as we're preoccupied
 	return Continue();
 }
 

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

@@ -204,7 +204,11 @@ ActionResult< CNEOBot >	CNEOBotRetreatToCover::Update( CNEOBot *me, float interv
 {
 	const CKnownEntity *threat = me->GetVisionInterface()->GetPrimaryKnownThreat( true );
 
-	if ( threat && threat->GetEntity() && threat->GetEntity()->IsPlayer() )
+	if (!threat)
+	{
+		me->ReloadIfLowClip();
+	}
+	else if ( threat->GetEntity() && threat->GetEntity()->IsPlayer() )
 	{
 		CNEO_Player *pThreatPlayer = ToNEOPlayer( threat->GetEntity() );
 		if ( pThreatPlayer && pThreatPlayer->IsCarryingGhost() )

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

@@ -435,6 +435,12 @@ ActionResult< CNEOBot >	CNEOBotTacticalMonitor::Update( CNEOBot *me, float inter
 		AvoidBumpingFriends( me );
 	}
 
+	const CKnownEntity *threat = me->GetVisionInterface()->GetPrimaryKnownThreat();
+	if ( !threat )
+	{
+		me->ReloadIfLowClip();
+	}
+
 	me->UpdateDelayedThreatNotices();
 
 	return Continue();

src/game/server/neo/bot/neo_bot.cpp

@@ -1600,37 +1600,66 @@ void CNEOBot::EquipBestWeaponForThreat(const CKnownEntity* threat, const bool bN
 void CNEOBot::ReloadIfLowClip(void)
 {
 	CNEOBaseCombatWeapon* myWeapon = static_cast<CNEOBaseCombatWeapon*>(GetActiveWeapon());
-	if (myWeapon && myWeapon->GetPrimaryAmmoCount() > 0)
+
+	if (!myWeapon)
+	{
+		return;
+	}
+
+	if (myWeapon->GetPrimaryAmmoCount() <= 0)
+	{
+		return;
+	}
+
+	if (myWeapon->Clip1() >= myWeapon->GetMaxClip1())
+	{
+		return;
+	}
+
+	if ((myWeapon->GetNeoWepBits() & NEO_WEP_BALC))
+	{
+		return;
+	}
+	else if ((myWeapon->GetNeoWepBits() & NEO_WEP_SMAC))
+	{
+		return;
+	}
+	else if ((myWeapon->GetNeoWepBits() & NEO_WEP_SUPA7))
 	{
-		bool shouldReload = false;
-		// SUPA7 reload doesn't discard ammo
-		if ((myWeapon->GetNeoWepBits() & NEO_WEP_SUPA7) && (myWeapon->Clip1() < myWeapon->GetMaxClip1()))
+		// Consider loading slug
+		if ( (myWeapon->m_iSecondaryAmmoCount > 0) && (myWeapon->Clip1() == myWeapon->GetMaxClip1() - 1))
 		{
-			shouldReload = true;
+			ReleaseFireButton();
+			PressAltFireButton();
+			return; // attempt to load slug
 		}
-		else
+		// SUPA7 reload doesn't discard ammo, continue
+	}
+	else if (myWeapon->Clip1() > 0)
+	{
+		auto* pPlayer = ToNEOPlayer(this);
+		if ( pPlayer->GetTimeSinceWeaponFired() < 3.0f)
 		{
-			int maxClip = myWeapon->GetMaxClip1();
-			bool isBarrage = IsBarrageAndReloadWeapon(myWeapon);
+			return; // still in the middle of a fight
+		}
 
-			int baseThreshold = isBarrage ? (maxClip / 3) : (maxClip / 2);
+		int maxClip = myWeapon->GetMaxClip1();
+		bool isBarrage = IsBarrageAndReloadWeapon(myWeapon);
 
-			float aggressionFactor = 1.0f - HealthFraction();
+		int baseThreshold = isBarrage ? (maxClip / 3) : (maxClip / 2);
 
-			float dynamicThreshold = baseThreshold + aggressionFactor * (maxClip - baseThreshold);
+		float aggressionFactor = 1.0f - HealthFraction();
 
-			if (myWeapon->Clip1() < static_cast<int>(dynamicThreshold))
-			{
-				shouldReload = true;
-			}
-		}
+		float dynamicThreshold = baseThreshold + aggressionFactor * (maxClip - baseThreshold);
 
-		if (shouldReload)
+		if (myWeapon->Clip1() > static_cast<int>(dynamicThreshold))
 		{
-			ReleaseFireButton();
-			PressReloadButton();
+			return; // reloads drop ammo, still have enough in clip
 		}
 	}
+
+	ReleaseFireButton();
+	PressReloadButton();
 }