Skip to content

[TF2] Fix multiple inconsistency on Disposable Sentry Gun #2088

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
num-get wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Fix multiple inconsistency on Disposable Sentry Gun #2088

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
15 changes: 10 additions & 5 deletions src/game/server/tf/tf_obj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,8 @@ bool CBaseObject::Construct( float flHealth )
// Minibuildings build health at a reduced rate
// Staging_engy
{
SetHealth( Min( (float)GetMaxHealth(), m_flHealth + (IsMiniBuilding() ? (flHealth * 0.5f) : flHealth) ) );
float flMult = IsDisposableBuilding() ? 0.f : 0.5f;
SetHealth( Min( (float)GetMaxHealth(), m_flHealth + (IsMiniBuilding() ? (flHealth * flMult) : flHealth) ) );
}

// Return true if we're constructed now
Expand Down Expand Up @@ -2192,7 +2193,7 @@ float CBaseObject::GetConstructionMultiplier( void )
{
m_ConstructorList.RemoveAt( iThis );
}
else
else if ( !IsDisposableBuilding() )
{
// STAGING_ENGY
// each Player adds a fixed amount of speed boost
Expand All @@ -2203,7 +2204,11 @@ float CBaseObject::GetConstructionMultiplier( void )

// See if we have any attributes that want to modify our build rate
CTFPlayer* pBuilder = GetOwner();
if( pBuilder )
if ( IsDisposableBuilding() )
{
flMultiplier += m_bCarryDeploy ? 7.f : 3.f;
}
else if( pBuilder )
{
flMultiplier += pBuilder->GetObjectBuildSpeedMultiplier( ObjectType(), m_bCarryDeploy );
}
Expand Down Expand Up @@ -2261,7 +2266,7 @@ void CBaseObject::CreateObjectGibs( void )
if ( IsMiniBuilding() )
{
// STAGING_ENGY
nMetalPerGib = 0;
nMetalPerGib = IsDisposableBuilding() ? 7 : 0;
nLeftOver = 0;
}

Expand Down Expand Up @@ -2782,7 +2787,7 @@ bool CBaseObject::InputWrenchHit( CTFPlayer *pPlayer, CTFWrench *pWrench, Vector
bDidWork = OnWrenchHit( pPlayer, pWrench, hitLoc );
// bDidWork = false;
}
else if ( IsBuilding() )
else if ( IsBuilding() && !IsDisposableBuilding() )
{
OnConstructionHit( pPlayer, pWrench, hitLoc );
bDidWork = true;
Expand Down