OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Pistol start tweaks.

Browse source
This commit is contained in:
Mari the Deer 2022-10-08 15:45:19 +02:00
commit 564c99782a
16 changed files with 86 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zscript/weapons/swwm_shot.zsc
View file

@ -76,9 +76,13 @@ Class Spreadgun : SWWMWeapon
override void DoEffect()
{
Super.DoEffect();
// push back selection order if weapon is unloaded (or has a golden shell loaded)
if ( !bInitialized ) SelectionOrder = default.SelectionOrder;
else SelectionOrder = (chambered&&!fired&&!goldload)?default.SelectionOrder:1500;
// push back selection order if a golden shell is loaded (or golden shells are the only available ammo)
if ( bInitialized && ((chambered && !fired && goldload) || ((Ammo1.Amount <= 0) && (Ammo2.Amount > 0))) )
{
SelectionOrder = 1500;
return;
}
SelectionOrder = default.SelectionOrder;
}
override bool ReportHUDAmmo()