Skip to content

[TF2] Allow weapons with penetrating bullets to penetrate Medigun shield #1539

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 1 commit into
base: master
Choose a base branch
from
+21 −4
Open

[TF2] Allow weapons with penetrating bullets to penetrate Medigun shield #1539

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
25 changes: 21 additions & 4 deletions src/game/shared/tf/tf_player_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9937,7 +9937,8 @@ class CBulletPenetrateEnum : public IEntityEnumerator
if ( pEnt == m_pShooter )
return true;

if ( pEnt->IsCombatCharacter() || pEnt->IsBaseObject() )
CTFMedigunShield *pMedigunShield = dynamic_cast<CTFMedigunShield*>( pEnt );
if ( pEnt->IsCombatCharacter() || pEnt->IsBaseObject() || pMedigunShield )
{
if ( m_bIgnoreTeammates && pEnt->GetTeam() == m_pShooter->GetTeam() )
return true;
Expand Down Expand Up @@ -10203,7 +10204,8 @@ void CTFPlayer::FireBullet( CTFWeaponBase *pWpn, const FireBulletsInfo_t &info,
bool bPenetratingShot = ( (ePenetrateType == TF_DMG_CUSTOM_PENETRATE_ALL_PLAYERS) || (ePenetrateType == TF_DMG_CUSTOM_PENETRATE_MY_TEAM) || (ePenetrateType == TF_DMG_CUSTOM_PENETRATE_NONBURNING_TEAMMATE) );
if ( bPenetratingShot && trace.m_pEnt )
{
if ( trace.m_pEnt->IsCombatCharacter() || trace.m_pEnt->IsBaseObject() )
CTFMedigunShield *pMedigunShield = dynamic_cast<CTFMedigunShield*>( trace.m_pEnt );
if ( trace.m_pEnt->IsCombatCharacter() || trace.m_pEnt->IsBaseObject() || pMedigunShield )
{
const float penetrationHullExtension = 40.0f;
// Josh: EnumerateEntities only collides with bboxes, extend the ray to a larger hull, then we clip to it.
Expand Down Expand Up @@ -10319,6 +10321,7 @@ void CTFPlayer::FireBullet( CTFWeaponBase *pWpn, const FireBulletsInfo_t &info,
dmgInfo.SetPlayerPenetrationCount( iPenetratedPlayerCount );
pTarget->DispatchTraceAttack( dmgInfo, info.m_vecDirShooting, pTraceToUse, GetActiveWeapon() ? GetActiveWeapon()->GetDmgAccumulator() : NULL );

CTFMedigunShield* pMedigunShield = dynamic_cast<CTFMedigunShield*>( pTarget );
const bool bIsPenetratingPlayer = pTargetPlayer != NULL;
if ( bIsPenetratingPlayer )
{
Expand All @@ -10327,9 +10330,23 @@ void CTFPlayer::FireBullet( CTFWeaponBase *pWpn, const FireBulletsInfo_t &info,
CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( pWpn, flPenetrationPenalty, penetration_damage_penalty );
dmgInfo.SetDamage( dmgInfo.GetDamage() * flPenetrationPenalty );
}
else if ( pMedigunShield )
{
CBaseEntity *pTFOwner = pMedigunShield->GetOwnerEntity();
if ( pTFOwner )
{
int nShieldLevel = 0;
CALL_ATTRIB_HOOK_INT_ON_OTHER( pTFOwner, nShieldLevel, generate_rage_on_heal );
iPenetratedPlayerCount += nShieldLevel;

// Treat shield level 4 and higher inpenetrable, even by Sniper rifles
if ( nShieldLevel >= 4 )
break;
}
}

// If we're only supposed to penetrate players and this thing isn't a player, stop here.
if ( !bIsPenetratingPlayer && (ePenetrateType == TF_DMG_CUSTOM_PENETRATE_ALL_PLAYERS) )
// If we're only supposed to penetrate players and this thing isn't a player or medigun shield, stop here.
if ( !bIsPenetratingPlayer && (ePenetrateType == TF_DMG_CUSTOM_PENETRATE_ALL_PLAYERS) && !pMedigunShield )
break;
}
else
Expand Down