Skip to content

[TF2] Make baseball/ornament appearance and behavior consistent when reflected #1651

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 7 commits into
base: master
Choose a base branch
from
Open

[TF2] Make baseball/ornament appearance and behavior consistent when reflected #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dae377a
Fix baseballs having both RED and BLU auras after being reflected
Tkain Oct 26, 2025
c84c6af
Fix baseballs not changing their trails' colors after being reflected
Tkain Oct 26, 2025
0dcbd60
Consolidate baseball trail texture retrieval logic
Tkain Oct 26, 2025
422a7a8
Fix reflected ornaments shattering in the wrong color
Tkain Oct 26, 2025
64c49d9
Play ornament shatter sounds more loudly to reflector when reflected
Tkain Oct 26, 2025
b47ef87
Simplify ornament attacker retrieval logic
Tkain Nov 28, 2025
c7c62b0
Replace uses of `GetOwnerEntity` with `GetThrower` for baseballs and …
Tkain Nov 29, 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
45 changes: 31 additions & 14 deletions src/game/shared/tf/tf_weapon_bat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,12 @@ const char *CTFStunBall::GetBallViewModelName( void ) const
}


//-----------------------------------------------------------------------------
const char *CTFStunBall::GetTrailEffect( void ) const
{
return ( GetTeamNumber() == TF_TEAM_RED ) ? "effects/baseballtrail_red.vmt" : "effects/baseballtrail_blu.vmt";
}

//-----------------------------------------------------------------------------
// Purpose: Sets up initial properties.
//-----------------------------------------------------------------------------
Expand All @@ -674,10 +680,9 @@ void CTFStunBall::Spawn( void )
// Draw the trail for the Baseball on spawn
if ( !m_pBallTrail )
{
const char *pTrailTeamName = ( GetTeamNumber() == TF_TEAM_RED ) ? "effects/baseballtrail_red.vmt" : "effects/baseballtrail_blu.vmt";
CSpriteTrail *pTempTrail = NULL;

pTempTrail = CSpriteTrail::SpriteTrailCreate( pTrailTeamName, GetAbsOrigin(), true );
pTempTrail = CSpriteTrail::SpriteTrailCreate( GetTrailEffect(), GetAbsOrigin(), true );
pTempTrail->FollowEntity( this );
pTempTrail->SetTransparency( kRenderTransAlpha, 255, 255, 255, STUNBALL_TRAIL_ALPHA, kRenderFxNone );
pTempTrail->SetStartWidth( 9 );
Expand Down Expand Up @@ -715,7 +720,7 @@ void CTFStunBall::ApplyBallImpactEffectOnVictim( CBaseEntity *pOther )
if ( !pPlayer )
return;

CTFPlayer *pOwner = ToTFPlayer( GetOwnerEntity() );
CTFPlayer *pOwner = ToTFPlayer( GetThrower() );
if ( !pOwner )
return;

Expand Down Expand Up @@ -777,7 +782,7 @@ void CTFStunBall::ApplyBallImpactEffectOnVictim( CBaseEntity *pOther )

CBaseEntity *pInflictor = GetLauncher();
CTakeDamageInfo info;
info.SetAttacker( GetOwnerEntity() );
info.SetAttacker( pOwner );
info.SetInflictor( pInflictor );
info.SetWeapon( pInflictor );
info.SetDamage( ( flLifeTimeRatio >= 1.f ) ? GetDamage() * 1.5f : GetDamage() );
Expand Down Expand Up @@ -833,7 +838,7 @@ void CTFStunBall::PipebombTouch( CBaseEntity *pOther )
if ( !ShouldBallTouch( pOther ) )
return;

CTFPlayer* pOwner = ToTFPlayer( GetOwnerEntity() );
CTFPlayer* pOwner = ToTFPlayer( GetThrower() );
if ( !pOwner )
return;

Expand Down Expand Up @@ -888,7 +893,7 @@ void CTFStunBall::PipebombTouch( CBaseEntity *pOther )
//-----------------------------------------------------------------------------
void CTFStunBall::VPhysicsCollision( int index, gamevcollisionevent_t *pEvent )
{
CTFPlayer* pOwner = ToTFPlayer( GetOwnerEntity() );
CTFPlayer* pOwner = ToTFPlayer( GetThrower() );
bool bWasTouched = m_bTouched;
BaseClass::VPhysicsCollision( index, pEvent );
if ( pOwner && !bWasTouched && m_bTouched )
Expand Down Expand Up @@ -934,7 +939,7 @@ void CTFStunBall::RemoveBallTrail( void )
//-----------------------------------------------------------------------------
bool CTFStunBall::ShouldBallTouch( CBaseEntity *pOther )
{
CTFPlayer* pOwner = ToTFPlayer( GetOwnerEntity() );
CTFPlayer* pOwner = ToTFPlayer( GetThrower() );
if ( !pOwner )
return false;

Expand Down Expand Up @@ -976,6 +981,18 @@ bool CTFStunBall::ShouldBallTouch( CBaseEntity *pOther )
return true;
}

//-----------------------------------------------------------------------------
// Purpose: Baseball was deflected.
//-----------------------------------------------------------------------------
void CTFStunBall::Deflected( CBaseEntity* pDeflectedBy, Vector& vecDir )
{
BaseClass::Deflected( pDeflectedBy, vecDir );
if ( m_pBallTrail )
{
m_pBallTrail->SetModel( GetTrailEffect() );
}
}

// -- SERVER ONLY
#endif

Expand Down Expand Up @@ -1013,11 +1030,11 @@ void CTFStunBall::CreateTrailParticles( void )
{
if ( pEffectTrail )
{
ParticleProp()->StopEmission( pEffectTrail );
ParticleProp()->StopEmissionAndDestroyImmediately( pEffectTrail );
}
if ( pEffectCrit )
{
ParticleProp()->StopEmission( pEffectCrit );
ParticleProp()->StopEmissionAndDestroyImmediately( pEffectCrit );
}
pEffectTrail = ParticleProp()->Create( GetTrailParticleName(), PATTACH_ABSORIGIN_FOLLOW );
int iTeamNumber = GetTeamNumber();
Expand Down Expand Up @@ -1157,7 +1174,7 @@ void CTFBall_Ornament::ApplyBallImpactEffectOnVictim( CBaseEntity *pOther )
if ( !pPlayer )
return;

CTFPlayer *pOwner = ToTFPlayer( GetOwnerEntity() );
CTFPlayer *pOwner = ToTFPlayer( GetThrower() );
if ( !pOwner )
return;

Expand Down Expand Up @@ -1193,7 +1210,7 @@ void CTFBall_Ornament::ApplyBallImpactEffectOnVictim( CBaseEntity *pOther )

CBaseEntity *pInflictor = GetLauncher();
CTakeDamageInfo info;
info.SetAttacker( GetOwnerEntity() );
info.SetAttacker( pOwner );
info.SetInflictor( pInflictor );
info.SetWeapon( pInflictor );
info.SetDamage( GetDamage() );
Expand Down Expand Up @@ -1285,8 +1302,7 @@ void CTFBall_Ornament::VPhysicsCollisionThink( void )
void CTFBall_Ornament::Explode( trace_t *pTrace, int bitsDamageType )
{
// Create smashed glass particles when we explode
CTFPlayer* pOwner = ToTFPlayer( GetOwnerEntity() );
if ( pOwner && pOwner->GetTeamNumber() == TF_TEAM_RED )
if ( GetTeamNumber() == TF_TEAM_RED )
{
DispatchParticleEffect( "xms_ornament_smash_red", GetAbsOrigin(), GetAbsAngles() );
}
Expand All @@ -1296,6 +1312,7 @@ void CTFBall_Ornament::Explode( trace_t *pTrace, int bitsDamageType )
}

Vector vecOrigin = GetAbsOrigin();
CTFPlayer* pOwner = ToTFPlayer( GetThrower() );

// sound effects
EmitSound_t params;
Expand All @@ -1313,7 +1330,7 @@ void CTFBall_Ornament::Explode( trace_t *pTrace, int bitsDamageType )

// Do radius damage
Vector vecBlastForce(0.0f, 0.0f, 0.0f);
CTakeDamageInfo info( this, GetThrower(), m_hLauncher, vecBlastForce, GetAbsOrigin(), flExplodeDamage, bitsDamageType, TF_DMG_CUSTOM_BASEBALL, &vecOrigin );
CTakeDamageInfo info( this, pOwner, m_hLauncher, vecBlastForce, GetAbsOrigin(), flExplodeDamage, bitsDamageType, TF_DMG_CUSTOM_BASEBALL, &vecOrigin );
CTFRadiusDamageInfo radiusinfo( &info, vecOrigin, DEFAULT_ORNAMENT_EXPLODE_RADIUS, nullptr, 0.0f, 0.0f );
TFGameRules()->RadiusDamage( radiusinfo );

Expand Down
2 changes: 2 additions & 0 deletions src/game/shared/tf/tf_weapon_bat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ class CTFStunBall : public CTFGrenadePipebombProjectile
virtual int GetWeaponID( void ) const { return TF_WEAPON_GRENADE_STUNBALL; }
virtual const char *GetBallModelName( void ) const;
virtual const char *GetBallViewModelName( void ) const;
const char *GetTrailEffect( void ) const;

virtual bool IsAllowedToExplode( void ) OVERRIDE { return false; }
virtual void Explode( trace_t *pTrace, int bitsDamageType );
Expand All @@ -157,6 +158,7 @@ class CTFStunBall : public CTFGrenadePipebombProjectile
virtual float GetDamage( void );
virtual int GetDamageType( void ) { return DMG_CLUB; }
virtual Vector GetDamageForce( void );
virtual void Deflected( CBaseEntity* pDeflectedBy, Vector& vecDir ) OVERRIDE;

virtual float GetShakeAmplitude( void ) { return 0.0; }
virtual float GetShakeRadius( void ) { return 0.0; }
Expand Down