From c33982f97cee4068b4f532e06ca9a718100484bc Mon Sep 17 00:00:00 2001 From: TJ Date: Sun, 9 May 2021 18:53:05 -0500 Subject: [PATCH] Fix for blasters not consuming ammo --- module/item/entity.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/item/entity.js b/module/item/entity.js index accded14..a652085b 100644 --- a/module/item/entity.js +++ b/module/item/entity.js @@ -426,13 +426,13 @@ export default class Item5e extends Item { // Define follow-up actions resulting from the item usage let createMeasuredTemplate = hasArea; // Trigger a template creation let consumeRecharge = !!recharge.value; // Consume recharge - let consumeResource = !!resource.target && resource.type !== "ammo" && !['simpleB', 'martialB'].includes(id.weaponType); // Consume a linked (non-ammo) resource, ignore if use is from a blaster + let consumeResource = !!resource.target && resource.type !== "ammo"; // Consume a linked (non-ammo) resource let consumePowerSlot = requirePowerSlot; // Consume a power slot let consumeUsage = !!uses.per; // Consume limited uses let consumeQuantity = uses.autoDestroy; // Consume quantity of the item in lieu of uses // Display a configuration dialog to customize the usage - const needsConfiguration = createMeasuredTemplate || consumeRecharge || consumeResource || consumePowerSlot || consumeUsage; + const needsConfiguration = createMeasuredTemplate || consumeRecharge || (consumeResource && !['simpleB', 'martialB'].includes(id.weaponType)) || consumePowerSlot || (consumeUsage && !['simpleB', 'martialB'].includes(id.weaponType)); if (configureDialog && needsConfiguration) { const configuration = await AbilityUseDialog.create(this); if (!configuration) return;