Skip to content

[TF2] Changed player-dropped ammo boxes to be more dynamic (alternate method) #1621

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
Open

[TF2] Changed player-dropped ammo boxes to be more dynamic (alternate method) #1621

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cac76b
Fixed dropped ammo packs only giving 100 metal in MvM
JoriKos Oct 25, 2025
5a3aa88
Scaling with currently-held metal
JoriKos Oct 25, 2025
c0ae2c8
Scaling only on < 100 metal packs
JoriKos Oct 25, 2025
f915981
Updated comment + fixed wrong operator
JoriKos Nov 5, 2025
ee702c0
Fixed dropped ammo boxes only giving 100 metal unless it's leftover E…
JoriKos Nov 5, 2025
383bee7
Now scales up Engineer-dropped ammo box
JoriKos Nov 5, 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
12 changes: 11 additions & 1 deletion src/game/server/tf/tf_ammo_pack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void CTFAmmoPack::InitAmmoPack( CTFPlayer *pPlayer, CTFWeaponBase *pWeapon, int
// Fill up the ammo pack.
GiveAmmo( iPrimary, TF_AMMO_PRIMARY ); // Gets recalculated in PackTouch
GiveAmmo( iSecondary, TF_AMMO_SECONDARY ); // Gets recalculated in PackTouch
GiveAmmo( iMetal, TF_AMMO_METAL );
GiveAmmo( iMetal, TF_AMMO_METAL ); // Gets recalculated in PackTouch if it's not a building gib
SetHealthInstead( pWeapon && pWeapon->GetWeaponID() == TF_WEAPON_LUNCHBOX && pPlayer->IsPlayerClass( TF_CLASS_HEAVYWEAPONS ) );
}
else
Expand Down Expand Up @@ -350,6 +350,16 @@ void CTFAmmoPack::PackTouch( CBaseEntity *pOther )
int iMaxSecondary = pPlayer->GetMaxAmmo(TF_AMMO_SECONDARY);
GiveAmmo( ceil( iMaxSecondary * m_flAmmoRatio ), TF_AMMO_SECONDARY );

// Do not scale building gibs
if ( GetOwnerEntity() && !GetOwnerEntity()->IsBaseObject() )
{
int iMetalRatio = pPlayer->GetMaxAmmo(TF_AMMO_METAL) / 200;

// Scale metal given
int iMetal = m_iAmmo[TF_AMMO_METAL] == 100 ? ceil( pPlayer->GetMaxAmmo(TF_AMMO_METAL) * m_flAmmoRatio ) : ceil( m_iAmmo[TF_AMMO_METAL] * iMetalRatio );
GiveAmmo( iMetal, TF_AMMO_METAL );
}

int iAmmoTaken = 0;

for ( int i=0;i<TF_AMMO_COUNT;i++ )
Expand Down