From 1b058f0540d3369a93f922ce715e12fd81c051e5 Mon Sep 17 00:00:00 2001 From: TJ Date: Fri, 22 Jan 2021 16:17:49 -0600 Subject: [PATCH] Two ammo display fixes 1. Allow ammunition items to show up in the dropdown picker 2. Don't prompt to consume resources if the consuming object is a blaster --- module/config.js | 2 +- module/item/entity.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/config.js b/module/config.js index 4008e13b..c5168635 100644 --- a/module/config.js +++ b/module/config.js @@ -274,7 +274,7 @@ SW5E.consumableTypes = { "food": "SW5E.ConsumableFood", "medpac": "SW5E.ConsumableMedpac", "technology": "SW5E.ConsumableTechnology", - "ammunition": "SW5E.ConsumableAmmunition", + "ammo": "SW5E.ConsumableAmmunition", "trinket": "SW5E.ConsumableTrinket", "force": "SW5E.ConsumableForce", "tech": "SW5E.ConsumableTech" diff --git a/module/item/entity.js b/module/item/entity.js index 8b35bcc5..37bcb1ee 100644 --- a/module/item/entity.js +++ b/module/item/entity.js @@ -399,7 +399,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") // Consume a linked (non-ammo) resource + 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 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