Skip to content

Bots jump a gap link down instead of dropping into it #2198

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 5 commits into from
Oct 12, 2026
Merged

Bots jump a gap link down instead of dropping into it #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de18672
Jump a gap link down instead of dropping into it
sunzenshen Oct 4, 2026
63a4a8d
Name both outcomes of a gap link left on the ground
sunzenshen Oct 9, 2026
980f31d
Drop a null check CheckProgress does not need
sunzenshen Oct 9, 2026
ca746e6
Say where the gap separation constant comes from
sunzenshen Oct 9, 2026
e7987b3
Name both conditions of the gap-jump hand-off
sunzenshen Oct 9, 2026
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
30 changes: 30 additions & 0 deletions src/game/server/NextBot/Path/NextBotPath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,26 @@ ConVar NextBotPathDrawIncrement( "nb_path_draw_inc", "100", FCVAR_CHEAT );
ConVar NextBotPathDrawSegmentCount( "nb_path_draw_segment_count", "100", FCVAR_CHEAT );
ConVar NextBotPathSegmentInfluenceRadius( "nb_path_segment_influence_radius", "100", FCVAR_CHEAT );

#ifdef NEO
// areas farther apart than this in 2D (38 u with NEO's 20 u generation step) do not touch, so a link between them crosses a gap:
// the gap-jump pass's own separation test, unchanged from stock, now shared with the drop test
static const float GapSeparationTolerance = 1.9f * GenerationStepSize;

//--------------------------------------------------------------------------------------------------------------
/**
* Return true if the link from one area to the next crosses a gap, measured as the gap-jump pass measures it.
* The pass repeats this measure for its landing geometry, from a path position it may have moved, so the two agree by constant, not by point
*/
static bool IsLinkAcrossGap( const CNavArea *from, const Vector &fromPos, const CNavArea *to )
{
Vector closeTo, closeFrom;
to->GetClosestPointOnArea( fromPos, &closeTo );
from->GetClosestPointOnArea( closeTo, &closeFrom );

return ( closeFrom - closeTo ).AsVector2D().IsLengthGreaterThan( GapSeparationTolerance );
}
#endif

//--------------------------------------------------------------------------------------------------------------
Path::Path( void )
{
Expand Down Expand Up @@ -104,7 +124,13 @@ bool Path::ComputePathDetails( INextBot *bot, const Vector &start )

float expectedHeightDrop = -DotProduct( alongPath, groundNormal );

#ifdef NEO
// a drop on a link across a gap would send the bot into the gap, so leave the link on the ground:
// the gap-jump pass below adds a jump, or where the drop is more than twice the gap the bot walks off toward the landing
if ( expectedHeightDrop > mover->GetStepHeight() && !IsLinkAcrossGap( from->area, from->pos, to->area ) )
#else
if ( expectedHeightDrop > mover->GetStepHeight() )
#endif
{
// NOTE: We can't know this is a drop-down yet, because of subtle interactions
// between nav area links and "portals" and "area crossings"
Expand Down Expand Up @@ -281,7 +307,11 @@ bool Path::ComputePathDetails( INextBot *bot, const Vector &start )
}


#ifdef NEO
const float separationTolerance = GapSeparationTolerance;
#else
const float separationTolerance = 1.9f * GenerationStepSize;
#endif
if ( (closeFrom - closeTo).AsVector2D().IsLengthGreaterThan( separationTolerance ) && ( closeTo - closeFrom ).AsVector2D().IsLengthGreaterThan( 0.5f * fabs( closeTo.z - closeFrom.z ) ) )
{
// areas are disjoint and mostly level - add gap jump target
Expand Down
13 changes: 13 additions & 0 deletions src/game/server/NextBot/Path/NextBotPathFollow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,19 @@ bool PathFollower::CheckProgress( INextBot *bot )
{
ILocomotion *mover = bot->GetLocomotionInterface();

#ifdef NEO
// a path recomputed in mid-air starts from the area the bot jumped from, so its goal is the take-off behind it:
// while the bot is still jumping the gap, or once it stands on the landing's area, head for the landing instead
if ( m_goal->type == JUMP_OVER_GAP )
{
const Path::Segment *landing = NextSegment( m_goal );
if ( landing && ( mover->IsJumpingAcrossGap() || bot->GetEntity()->GetLastKnownArea() == landing->area ) )
{
m_goal = landing;
}
}
#endif

// skip nearby goal points that are redundant to smooth path following motion
const Path::Segment *pSkipToGoal = NULL;
if ( m_minLookAheadRange > 0.0f )
Expand Down
Loading