valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-08 19:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 9f9386f7a7 into 0565403b15

Browse source
This commit is contained in:
claiwe 2025-04-02 23:17:34 -04:00 committed by GitHub
commit be35197ee4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/shared/tf/tf_gamerules.cpp
View file

@ -5679,7 +5679,7 @@ void CTFGameRules::RadiusDamage( CTFRadiusDamageInfo &info )
//-----------------------------------------------------------------------------
void CTFRadiusDamageInfo::CalculateFalloff( void )
{
if ( dmgInfo->GetDamageType() & DMG_RADIUS_MAX )
if ( dmgInfo->GetDamageCustom() != TF_DMG_CUSTOM_STICKBOMB_EXPLOSION && dmgInfo->GetDamageType() & DMG_RADIUS_MAX )
flFalloff = 0.f;
else if ( dmgInfo->GetDamageType() & DMG_HALF_FALLOFF )
flFalloff = 0.5f;
@ -6109,9 +6109,9 @@ bool CTFGameRules::ApplyOnDamageModifyRules( CTakeDamageInfo &info, CBaseEntity
eDamageBonusCond = TF_COND_OFFENSEBUFF;
}
}
else if ( pTFAttacker && (bitsDamage & DMG_RADIUS_MAX) && pWeapon && ( (pWeapon->GetWeaponID() == TF_WEAPON_SWORD) || (pWeapon->GetWeaponID() == TF_WEAPON_BOTTLE)|| (pWeapon->GetWeaponID() == TF_WEAPON_WRENCH) ) )
else if ( pTFAttacker && ( bitsDamage & DMG_RADIUS_MAX ) && pWeapon && ( ( pWeapon->GetWeaponID() == TF_WEAPON_SWORD ) || ( pWeapon->GetWeaponID() == TF_WEAPON_BOTTLE ) || ( pWeapon->GetWeaponID() == TF_WEAPON_STICKBOMB ) || ( pWeapon->GetWeaponID() == TF_WEAPON_WRENCH ) ) )
{
// First sword or bottle attack after a charge is a mini-crit.
// First sword, bottle, or caber attack after a charge is a mini-crit.
bAllSeeCrit = true;
info.SetCritType( CTakeDamageInfo::CRIT_MINI );
eBonusEffect = kBonusEffect_MiniCrit;

2
src/game/shared/tf/tf_weapon_bottle.cpp
View file

@ -257,6 +257,8 @@ void CTFStickBomb::Smack( void )
int dmgType = DMG_BLAST | DMG_USEDISTANCEMOD;
if ( IsCurrentAttackACrit() )
dmgType |= DMG_CRITICAL;
else if ( m_bMiniCrit )
dmgType |= DMG_RADIUS_MAX;
CTakeDamageInfo info( pTFPlayer, pTFPlayer, this, explosion, explosion, 75.0f, dmgType, TF_DMG_CUSTOM_STICKBOMB_EXPLOSION, &explosion );
CTFRadiusDamageInfo radiusinfo( &info, explosion, 100.f );