[Zscript] adding something to a custom action function

[Ultimate Freedoomer]

Hi. As some of you may know, I did a little set of DECORATE that replicates Strife: Quest For The Sigil's vanilla weapon functionality using non-restricted action functions. I'm currently working on the 1st post-release update, & I had to use ZScript to create a non-restricted custom action function that identically replicates the existing functionality of A_FireGrenade. The thing is, I'm trying to add a "consume ammo" boolean (functionality in this custom function is otherwise unchanged from A_FireGrenade) so a weapon that relies on a firemode toggle alt for accessing different primary fire modes (rather than using separate ammo for primary & secondary) only consumes the appropriate ammo for the active primary fire mode. Here's the code for the custom function as applies to my mod:

Code: Select all

version "3.2.5"

class SimpleStrifeGrenadeLauncherBase : StrifeWeapon
{
action void A_CustomGrenade (class<Actor> grenadetype, double angleofs, statelabel flash, bool useammo = true)
	{
		if (player == null)
		{
			return;
		}
		Weapon weapon = player.ReadyWeapon;
		if (weapon != null)
		{
			if (!weapon.DepleteAmmo (weapon.bAltFire))
				return;
			player.SetPsprite (PSP_FLASH, weapon.FindState(flash), true);
		}
		if (grenadetype != null)
		{
			AddZ(32);
			Actor grenade = SpawnSubMissile (grenadetype, self);
			AddZ(-32);
			if (grenade == null)
				return;
			if (grenade.SeeSound != 0)
			{
				grenade.A_PlaySound (grenade.SeeSound, CHAN_VOICE);
			}
			grenade.Vel.Z = (-clamp(tan(Pitch), -5, 5)) * grenade.Speed + 8;
			Vector2 offset = AngleToVector(angle, radius + grenade.radius);
			double an = Angle + angleofs;
			offset += AngleToVector(an, 15);
			grenade.SetOrigin(grenade.Vec3Offset(offset.X, offset.Y, 0.), false);
		}
	}
}

I guess what I'm trying to ask is: what do I add/change to make the "ammo consumption" boolean functional?