1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-25 14:40:32 -05:00

Staffs: fix alt weapon reload

This commit is contained in:
Jbleezy
2023-04-26 16:57:43 -07:00
parent 06fa6e6d5a
commit 148b69a001
2 changed files with 22 additions and 2 deletions

View File

@ -280,7 +280,7 @@
* Max ammo no longer fills clip ammo
* Upgraded: kill on any round
* Upgraded: charged shots damage Panzersoldat
* Upgraded: decreased alt weapon reload time to 0.5 seconds
* Upgraded: decreased alt weapon reload time to 0.4 seconds
* Fire upgraded: charged shots no longer deal additional damage to Panzersoldat
* Ice upgraded: fixed melee sound

View File

@ -34,7 +34,7 @@ staff_revive_reload( str_weapon )
{
self endon( "disconnect" );
wait weaponFireTime(str_weapon) - 0.05;
wait 0.4;
ammo_clip = self getWeaponAmmoClip(str_weapon);
ammo_stock = self getWeaponAmmoStock(str_weapon);
@ -43,5 +43,25 @@ staff_revive_reload( str_weapon )
{
self setWeaponAmmoClip(str_weapon, ammo_clip + 1);
self setWeaponAmmoStock(str_weapon, ammo_stock - 1);
return;
}
while (1)
{
self waittill( "weapon_change" );
if (self getCurrentWeapon() == str_weapon)
{
ammo_clip = self getWeaponAmmoClip(str_weapon);
ammo_stock = self getWeaponAmmoStock(str_weapon);
if (ammo_clip < 1 && ammo_stock >= 1)
{
self setWeaponAmmoClip(str_weapon, ammo_clip + 1);
self setWeaponAmmoStock(str_weapon, ammo_stock - 1);
}
return;
}
}
}