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

Fix last stand pistol ammos

Browse Source 
Boomhilda: decrease last stand ammo
This commit is contained in:
Jbleezy
2023-05-17 01:28:58 -07:00
parent a1c40cf996
commit bfec0cd90d
2 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -160,6 +160,9 @@
### M8A1 ### M8A1
* Decreased recoil * Decreased recoil
### Mauser C96
* Upgraded: decreased last stand ammo from 2 clips to 1 clip
### MTAR ### MTAR
* Decreased recoil * Decreased recoil

27
scripts/zm/_zm_reimagined.gsc
View File

@ -2142,17 +2142,9 @@ last_stand_pistol_swap()
{ {
self._special_solo_pistol_swap = 0; self._special_solo_pistol_swap = 0;
self.hadpistol = 0; self.hadpistol = 0;
self setweaponammostock( self.laststandpistol, doubleclip - curclip ); self setweaponammostock( self.laststandpistol, 0 );
} }
else if ( flag( "solo_game" ) && self.laststandpistol == level.default_solo_laststandpistol ) 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 )
{
self setweaponammostock(self.laststandpistol, doubleclip - curclip);
}
else if ( self.laststandpistol == level.default_laststandpistol )
{
self setweaponammostock( self.laststandpistol, doubleclip );
}
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 == "m1911_upgraded_zm" )
{ {
amt = ammoclip; amt = ammoclip;
if(amt > self.stored_weapon_info[self.laststandpistol].total_amt) if(amt > self.stored_weapon_info[self.laststandpistol].total_amt)
@ -2213,8 +2205,6 @@ last_stand_restore_pistol_ammo(only_store_info = false)
{ {
dual_wield_name = weapondualwieldweaponname( weapon_to_restore[ j ] ); dual_wield_name = weapondualwieldweaponname( weapon_to_restore[ j ] );
if ( weapon != level.default_laststandpistol )
{
last_clip = self getweaponammoclip( weapon ); last_clip = self getweaponammoclip( weapon );
last_left_clip = 0; last_left_clip = 0;
if( "none" != dual_wield_name ) if( "none" != dual_wield_name )
@ -2223,7 +2213,7 @@ last_stand_restore_pistol_ammo(only_store_info = false)
} }
last_stock = self getweaponammostock( weapon ); last_stock = self getweaponammostock( weapon );
last_total = last_clip + last_left_clip + last_stock; last_total = last_clip + last_left_clip + last_stock;
used_amt = self.stored_weapon_info[ weapon ].given_amt - last_total;
self.stored_weapon_info[ weapon ].total_used_amt = self.stored_weapon_info[ weapon ].total_given_amt - last_total; self.stored_weapon_info[ weapon ].total_used_amt = self.stored_weapon_info[ weapon ].total_given_amt - last_total;
if (only_store_info) if (only_store_info)
@ -2231,11 +2221,13 @@ last_stand_restore_pistol_ammo(only_store_info = false)
break; break;
} }
if ( used_amt >= self.stored_weapon_info[ weapon ].stock_amt ) stock_used_amt = self.stored_weapon_info[ weapon ].given_amt - last_stock;
if ( stock_used_amt >= self.stored_weapon_info[ weapon ].stock_amt )
{ {
used_amt = used_amt - self.stored_weapon_info[weapon].stock_amt; stock_used_amt = stock_used_amt - self.stored_weapon_info[weapon].stock_amt;
self.stored_weapon_info[ weapon ].stock_amt = 0; self.stored_weapon_info[ weapon ].stock_amt = 0;
self.stored_weapon_info[ weapon ].clip_amt = self.stored_weapon_info[ weapon ].clip_amt - used_amt; self.stored_weapon_info[ weapon ].clip_amt = self.stored_weapon_info[ weapon ].clip_amt - stock_used_amt;
if ( self.stored_weapon_info[ weapon ].clip_amt < 0 ) if ( self.stored_weapon_info[ weapon ].clip_amt < 0 )
{ {
self.stored_weapon_info[ weapon ].clip_amt = 0; self.stored_weapon_info[ weapon ].clip_amt = 0;
@ -2243,13 +2235,12 @@ last_stand_restore_pistol_ammo(only_store_info = false)
} }
else else
{ {
new_stock_amt = self.stored_weapon_info[ weapon ].stock_amt - used_amt; new_stock_amt = self.stored_weapon_info[ weapon ].stock_amt - stock_used_amt;
if ( new_stock_amt < self.stored_weapon_info[ weapon ].stock_amt ) if ( new_stock_amt < self.stored_weapon_info[ weapon ].stock_amt )
{ {
self.stored_weapon_info[ weapon ].stock_amt = new_stock_amt; self.stored_weapon_info[ weapon ].stock_amt = new_stock_amt;
} }
} }
}
self setweaponammostock( weapon_to_restore[ j ], self.stored_weapon_info[weapon_to_restore[ j ] ].stock_amt ); self setweaponammostock( weapon_to_restore[ j ], self.stored_weapon_info[weapon_to_restore[ j ] ].stock_amt );
break; break;