Skip to content

[TF2] improve medigun heal target selection to prioritize teammate directly under crosshair when teammates are close together #1773

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

Open
wgetJane wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[TF2] improve medigun heal target selection to prioritize teammate directly under crosshair when teammates are close together #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
683326a
improve heal target selection for mediguns
wgetJane Jan 17, 2026
423725d
improve targetid selection to replicate medigun heal target selection
wgetJane Jan 17, 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
9 changes: 9 additions & 0 deletions src/game/client/tf/c_tf_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7002,6 +7002,15 @@ void C_TFPlayer::UpdateIDTarget()

if ( tr.m_pEnt && tr.m_pEnt->IsPlayer() )
{
trace_t trShot;
// use the shot mask to replicate the medigun's trace
UTIL_TraceLine( vecStart, vecEnd, MASK_SHOT, this, COLLISION_GROUP_NONE, &trShot );

if ( trShot.fraction != 1.0 && trShot.m_pEnt && trShot.m_pEnt->IsPlayer() && ( !tr.startsolid || tr.m_pEnt != trShot.m_pEnt ) )
{
tr = trShot;
}

// It's okay to start solid against enemies because we sometimes press right against them
bIsEnemyPlayer = GetTeamNumber() != tr.m_pEnt->GetTeamNumber();
}
Expand Down
29 changes: 22 additions & 7 deletions src/game/shared/tf/tf_weapon_medigun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ void CWeaponMedigun::MaintainTargetInSlot()
pOwner->EyeVectors( &vecAiming );

Vector vecEnd = vecSrc + vecAiming * GetTargetRange();
UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, DMG_GENERIC, &tr );
UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, COLLISION_GROUP_NONE, &tr );

// Still visible?
if ( tr.m_pEnt == pTarget )
Expand Down Expand Up @@ -729,24 +729,39 @@ void CWeaponMedigun::FindNewTargetForSlot()
// Find a player in range of this player, and make sure they're healable.
Vector vecEnd = vecSrc + vecAiming * GetTargetRange();
trace_t tr;
// for leniency, trace for hull instead of hitboxes first
UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, COLLISION_GROUP_NONE, &tr );

UTIL_TraceLine( vecSrc, vecEnd, (MASK_SHOT & ~CONTENTS_HITBOX), pOwner, DMG_GENERIC, &tr );
if ( tr.fraction != 1.0 && tr.m_pEnt )
{
if ( !HealingTarget( tr.m_pEnt ) && AllowedToHealTarget( tr.m_pEnt ) )
CBaseEntity *pTarget = tr.m_pEnt;

// trace again but for hitboxes to help with selecting targets that are clumped together
UTIL_TraceLine( vecSrc, vecEnd, MASK_SHOT, pOwner, COLLISION_GROUP_NONE, &tr );

if ( tr.fraction != 1.0 && tr.m_pEnt && tr.m_pEnt != pTarget && !HealingTarget( tr.m_pEnt ) && AllowedToHealTarget( tr.m_pEnt ) )
{
pTarget = tr.m_pEnt;
}
else if ( HealingTarget( pTarget ) || !AllowedToHealTarget( pTarget ) )
{
pTarget = NULL;
}

if ( pTarget )
{
#ifdef GAME_DLL
pOwner->SpeakConceptIfAllowed( MP_CONCEPT_MEDIC_STARTEDHEALING );
if ( tr.m_pEnt->IsPlayer() )
if ( pTarget->IsPlayer() )
{
CTFPlayer *pTarget = ToTFPlayer( tr.m_pEnt );
pTarget->SpeakConceptIfAllowed( MP_CONCEPT_HEALTARGET_STARTEDHEALING );
CTFPlayer *pTFPlayer = ToTFPlayer( pTarget );
pTFPlayer->SpeakConceptIfAllowed( MP_CONCEPT_HEALTARGET_STARTEDHEALING );
}

// Start the heal target thinking.
SetContextThink( &CWeaponMedigun::HealTargetThink, gpGlobals->curtime, s_pszMedigunHealTargetThink );
#endif
m_hHealingTarget.Set( tr.m_pEnt );
m_hHealingTarget.Set( pTarget );
m_flNextTargetCheckTime = gpGlobals->curtime + 1.0f;
}
}
Expand Down