Skip to content

More bot reload reliability tweaks #2112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunzenshen merged 1 commit into from
Sep 5, 2026
Merged

More bot reload reliability tweaks #2112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/game/server/neo/bot/behavior/neo_bot_behavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,8 @@ QueryResultType CNEOBotMainAction::ShouldWalk(const CNEOBot *me, const QueryResu
}

// Walk until reload actually starts so sprint does not block the reload initiation
if (myWeapon && myWeapon->Clip1() <= 0 && !myWeapon->m_bInReload)
if (myWeapon && !myWeapon->m_bInReload &&
(myWeapon->Clip1() <= 0 || (me->m_nButtons & IN_RELOAD)))
{
return ANSWER_YES;
}
Expand Down Expand Up @@ -716,7 +717,7 @@ QueryResultType CNEOBotMainAction::ShouldAim(const CNEOBot *me, const bool bWepH
}

const bool bIsPlayerStopped =
me->GetLocomotionInterface()->GetSpeed() == 0.0f && !(me->GetNeoFlags() & NEO_FL_FREEZETIME);
me->GetLocomotionInterface()->GetSpeed() < 10.0f && !(me->GetNeoFlags() & NEO_FL_FREEZETIME);
Comment thread
sunzenshen marked this conversation as resolved.
const bool bIsScoped = pNeoWep->GetNeoWepBits() & NEO_WEP_SCOPEDWEAPON;

const bool bIsNowFiring = me->IsFiring();
Expand Down Expand Up @@ -751,6 +752,12 @@ void CNEOBotMainAction::FireWeaponAtEnemy( CNEOBot *me )
if ( !myWeapon )
return;

// Check reload waiting edge case, potentially from weapon swaps
if ( m_isWaitingForFullReload && myWeapon->GetMaxClip1() > 0 && myWeapon->Clip1() >= myWeapon->GetMaxClip1() )
{
m_isWaitingForFullReload = false;
}

if ( me->IsBarrageAndReloadWeapon( myWeapon ) )
{
if ( me->HasAttribute( CNEOBot::HOLD_FIRE_UNTIL_FULL_RELOAD ) || neo_bot_always_full_reload.GetBool() )
Expand Down Expand Up @@ -882,6 +889,8 @@ void CNEOBotMainAction::FireWeaponAtEnemy( CNEOBot *me )
&& !( myWeapon->GetNeoWepBits() & NEO_WEP_BALC )
&& myWeapon->m_iClip1 <= 0 )
{
bool bShouldConsiderReload = false;

if (myWeapon->m_bInReload)
{
// passthrough: don't introduce decision jitter
Expand All @@ -890,10 +899,21 @@ void CNEOBotMainAction::FireWeaponAtEnemy( CNEOBot *me )
{
// intention is to swap to secondary if available
me->EquipBestWeaponForThreat(threat, bNotPrimary);

auto *pActive = static_cast<CNEOBaseCombatWeapon *>( me->GetActiveWeapon() );
if ( pActive && pActive->m_iClip1 <= 0 && !pActive->m_bInReload )
{
bShouldConsiderReload = true;
}
}
else
{
me->ReloadIfLowClip(true);
bShouldConsiderReload = true;
}

if ( bShouldConsiderReload )
{
me->ReloadIfLowClip( true );
m_isWaitingForFullReload = true;
}
return;
Expand Down
9 changes: 5 additions & 4 deletions src/game/server/neo/bot/neo_bot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,9 +1607,8 @@ void CNEOBot::EquipBestWeaponForThreat(const CKnownEntity* threat, const bool bN
// Ideally for close range empty primary reaction
else if ( secondaryWeapon
&& primaryWeapon->Clip1() <= 0
&& (secondaryWeapon->Clip1() > 0)
Comment thread
sunzenshen marked this conversation as resolved.
&& threat->IsVisibleInFOVNow()
&& (IsRangeLessThan(threat->GetLastKnownPosition(), 250.0f)) )
&& secondaryWeapon->Clip1() > 0
&& IsRangeLessThan(threat->GetLastKnownPosition(), 250.0f) )
{
// passthrough
}
Expand Down Expand Up @@ -1710,7 +1709,9 @@ void CNEOBot::ReloadIfLowClip(bool bForceReload)
}
else if (myWeapon->Clip1() > 0)
{
if (GetTimeSinceWeaponFired() < 3.0f)
const CKnownEntity *threat = GetVisionInterface()->GetPrimaryKnownThreat();
const bool bAwareOfThreat = threat && threat->GetEntity() && threat->IsVisibleRecently();
if (bAwareOfThreat)
Comment thread
sunzenshen marked this conversation as resolved.
{
return; // still in the middle of a fight
}
Expand Down