From 62e31afff2bbdb6101e8f849d3b942f6daf4405e Mon Sep 17 00:00:00 2001
From: TJ <Cyr-@users.noreply.github.com>
Date: Mon, 28 Jun 2021 19:15:31 -0500
Subject: [PATCH] Fix for blaster ammunition

---
 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 cf6374e5..11ffc620 100644
--- a/module/item/entity.js
+++ b/module/item/entity.js
@@ -496,7 +496,7 @@ 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
@@ -504,7 +504,7 @@ export default class Item5e extends Item {
     if ( requirePowerSlot ) consumePowerLevel = id.preparation.mode === "pact" ? "pact" : `power${id.level}`;
 
   // 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;