1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 23:57:59 -05:00

Fix last stand pistol dual wield clip ammo

This commit is contained in:
Jbleezy
2023-12-15 18:36:19 -08:00
parent 9bcd638681
commit a3fe39b188

View File

@ -2222,27 +2222,42 @@ last_stand_pistol_swap()
self.stored_weapon_info[self.laststandpistol].given_amt = amt; self.stored_weapon_info[self.laststandpistol].given_amt = amt;
} }
clip_amt = weaponclipsize( self.laststandpistol ); clip_amt_init = 0;
if ( clip_amt > amt ) left_clip_amt_init = 0;
if (self.hadpistol)
{ {
clip_amt = amt; clip_amt_init = self.stored_weapon_info[self.laststandpistol].clip_amt;
if (dual_wield_wep != "none")
{
left_clip_amt_init = self.stored_weapon_info[self.laststandpistol].left_clip_amt;
}
amt -= clip_amt_init + left_clip_amt_init;
} }
self setweaponammoclip( self.laststandpistol, clip_amt ); clip_amt_add = weaponclipsize( self.laststandpistol ) - clip_amt_init;
if ( clip_amt_add > amt )
{
clip_amt_add = amt;
}
amt -= clip_amt; self setweaponammoclip( self.laststandpistol, clip_amt_init + clip_amt_add );
amt -= clip_amt_add;
if ( dual_wield_wep != "none" ) if ( dual_wield_wep != "none" )
{ {
left_clip_amt = weaponclipsize( dual_wield_wep ); left_clip_amt_add = weaponclipsize( dual_wield_wep ) - left_clip_amt_init;
if ( left_clip_amt > amt ) if ( left_clip_amt_add > amt )
{ {
left_clip_amt = amt; left_clip_amt_add = amt;
} }
self set_weapon_ammo_clip_left( self.laststandpistol, left_clip_amt ); self set_weapon_ammo_clip_left( self.laststandpistol, left_clip_amt_init + left_clip_amt_add );
amt -= left_clip_amt; amt -= left_clip_amt_add;
} }
stock_amt = doubleclip; stock_amt = doubleclip;