Skip to content

[TF2] Fix extended melee range while charging not working #1619

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
wants to merge 6 commits into
base: master
Choose a base branch
from
+9 −2
Open

[TF2] Fix extended melee range while charging not working #1619

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1dee1a8
Fix extended melee range while charging not working
Kajek777 Nov 5, 2025
c06d2ef
Changed cvar to be used as the range value, improved implementation
Kajek777 Nov 5, 2025
8f66d6f
Changed default value of cvar to 0
Kajek777 Nov 6, 2025
11bc5cd
Changed to account for swinging before charging
Kajek777 Nov 6, 2025
d39f6bb
Split condition into two for clarity
Kajek777 Nov 7, 2025
dd1a4ed
Added check for negative values
Kajek777 Nov 10, 2025
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
11 changes: 9 additions & 2 deletions src/game/shared/tf/tf_weaponbase_melee.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

ConVar tf_weapon_criticals_melee( "tf_weapon_criticals_melee", "1", FCVAR_REPLICATED | FCVAR_NOTIFY, "Controls random crits for melee weapons. 0 - Melee weapons do not randomly crit. 1 - Melee weapons can randomly crit only if tf_weapon_criticals is also enabled. 2 - Melee weapons can always randomly crit regardless of the tf_weapon_criticals setting." );

ConVar tf_shield_charge_melee_range("tf_shield_charge_melee_range", "0", FCVAR_REPLICATED | FCVAR_NOTIFY, "The range of a melee attack performed during a shield charge. Set to 0 for no change.");

//=============================================================================
//
// TFWeaponBase Melee tables.
Expand Down Expand Up @@ -166,8 +168,13 @@ int CTFWeaponBaseMelee::GetSwingRange( void )
CTFPlayer *pOwner = ToTFPlayer( GetOwner() );
if ( pOwner && pOwner->m_Shared.InCond( TF_COND_SHIELD_CHARGE ) )
{
// mvm bots that can attack while charging
return 128;
}
else if ( IsCurrentAttackDuringDemoCharge() && tf_shield_charge_melee_range.GetInt() > 0 )
{
return tf_shield_charge_melee_range.GetInt();
}
else
{
int iIsSword = 0;
Expand Down Expand Up @@ -200,11 +207,11 @@ void CTFWeaponBaseMelee::PrimaryAttack()

pPlayer->EndClassSpecialSkill();

m_bCurrentAttackIsDuringDemoCharge = pPlayer->m_Shared.GetNextMeleeCrit() != MELEE_NOCRIT;

// Swing the weapon.
Swing( pPlayer );

m_bCurrentAttackIsDuringDemoCharge = pPlayer->m_Shared.GetNextMeleeCrit() != MELEE_NOCRIT;

if ( pPlayer->m_Shared.GetNextMeleeCrit() == MELEE_MINICRIT )
{
m_bMiniCrit = true;
Expand Down