INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 23:57:59 -05:00
Code Issues Releases Wiki Activity

Fix upgraded starting pistol having 2 clips in last stand

Browse Source
This commit is contained in:
Jbleezy
2023-05-24 21:32:53 -07:00
parent 3f23a4c2a4
commit 26d1c4ed15
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/zm/_zm_reimagined.gsc
View File

@ -2153,17 +2153,17 @@ last_stand_pistol_swap()
{ {
self setweaponammostock( self.laststandpistol, ammoclip + doubleclip - curclip ); self setweaponammostock( self.laststandpistol, ammoclip + doubleclip - curclip );
} }
else if ( self.laststandpistol == "ray_gun_zm" || self.laststandpistol == "ray_gun_upgraded_zm" || self.laststandpistol == "raygun_mark2_zm" || self.laststandpistol == "raygun_mark2_upgraded_zm" ) else if ( self.laststandpistol == "ray_gun_zm" || self.laststandpistol == "ray_gun_upgraded_zm" || self.laststandpistol == "raygun_mark2_zm" || self.laststandpistol == "raygun_mark2_upgraded_zm" || self.laststandpistol == level.default_solo_laststandpistol )
{ {
amt = ammoclip; amt = ammoclip;
if(amt > self.stored_weapon_info[self.laststandpistol].total_amt) if(self.hadpistol && amt > self.stored_weapon_info[self.laststandpistol].total_amt)
{ {
amt = self.stored_weapon_info[self.laststandpistol].total_amt; amt = self.stored_weapon_info[self.laststandpistol].total_amt;
} }
self.stored_weapon_info[self.laststandpistol].total_given_amt = amt; self.stored_weapon_info[self.laststandpistol].total_given_amt = amt;
amt -= (self.stored_weapon_info[self.laststandpistol].clip_amt + self.stored_weapon_info[self.laststandpistol].left_clip_amt); amt -= curclip;
self setweaponammostock( self.laststandpistol, amt ); self setweaponammostock( self.laststandpistol, amt );
self.stored_weapon_info[self.laststandpistol].given_amt = amt; self.stored_weapon_info[self.laststandpistol].given_amt = amt;
@ -2171,14 +2171,14 @@ last_stand_pistol_swap()
else else
{ {
amt = ammoclip + doubleclip; amt = ammoclip + doubleclip;
if(amt > self.stored_weapon_info[self.laststandpistol].total_amt) if(self.hadpistol && amt > self.stored_weapon_info[self.laststandpistol].total_amt)
{ {
amt = self.stored_weapon_info[self.laststandpistol].total_amt; amt = self.stored_weapon_info[self.laststandpistol].total_amt;
} }
self.stored_weapon_info[self.laststandpistol].total_given_amt = amt; self.stored_weapon_info[self.laststandpistol].total_given_amt = amt;
amt -= (self.stored_weapon_info[self.laststandpistol].clip_amt + self.stored_weapon_info[self.laststandpistol].left_clip_amt); amt -= curclip;
self setweaponammostock( self.laststandpistol, amt ); self setweaponammostock( self.laststandpistol, amt );
self.stored_weapon_info[ self.laststandpistol ].given_amt = amt; self.stored_weapon_info[ self.laststandpistol ].given_amt = amt;