diff --git a/lang/en.json b/lang/en.json
index 8e60a81b..84c0df9a 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2125,7 +2125,8 @@
}
},
"Consumable": {
- "consumeOnUse": "Consume On Use"
+ "consumeOnUse": "Consume On Use",
+ "destroyOnEmpty": "Destroy On Empty"
},
"DomainCard": {
"type": "Type",
diff --git a/module/data/fields/action/costField.mjs b/module/data/fields/action/costField.mjs
index 2371323f..e8ecf79b 100644
--- a/module/data/fields/action/costField.mjs
+++ b/module/data/fields/action/costField.mjs
@@ -199,14 +199,16 @@ export default class CostField extends fields.ArrayField {
switch (r.key) {
case CONFIG.DH.GENERAL.itemAbilityCosts.resource.id:
return {
- 'system.resource.value': r.target.system.resource.value + r.value
+ path: 'system.resource.value',
+ value: r.target.system.resource.value + r.value
};
case CONFIG.DH.GENERAL.itemAbilityCosts.quantity.id:
return {
- 'system.quantity': r.target.system.quantity + r.value
+ path: 'system.quantity',
+ value: r.target.system.quantity + r.value
};
default:
- return {};
+ return { path: '', value: undefined };
}
}
diff --git a/module/data/item/consumable.mjs b/module/data/item/consumable.mjs
index f74f9975..5a50525a 100644
--- a/module/data/item/consumable.mjs
+++ b/module/data/item/consumable.mjs
@@ -1,5 +1,4 @@
import BaseDataItem from './base.mjs';
-import { ActionField } from '../fields/actionField.mjs';
export default class DHConsumable extends BaseDataItem {
/** @inheritDoc */
@@ -19,7 +18,8 @@ export default class DHConsumable extends BaseDataItem {
const fields = foundry.data.fields;
return {
...super.defineSchema(),
- consumeOnUse: new fields.BooleanField({ initial: false })
+ consumeOnUse: new fields.BooleanField({ initial: true }),
+ destroyOnEmpty: new fields.BooleanField({ initial: true })
};
}
@@ -27,14 +27,4 @@ export default class DHConsumable extends BaseDataItem {
/**@override */
static DEFAULT_ICON = 'systems/daggerheart/assets/icons/documents/items/round-potion.svg';
-
- async _preUpdate(changes, options, userId) {
- const allowed = await super._preUpdate(changes, options, userId);
- if (allowed === false) return;
-
- if (changes.system?.quantity !== undefined && Number(changes.system.quantity) === 0) {
- this.parent.delete();
- return;
- }
- }
}
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index f6c6a676..79e71549 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -660,10 +660,21 @@ export default class DhpActor extends Actor {
resources.forEach(r => {
if (r.itemId) {
- updates.items[r.key] = {
- target: r.target,
- resources: game.system.api.fields.ActionFields.CostField.getItemIdCostUpdate(r)
- };
+ const { path, value } = game.system.api.fields.ActionFields.CostField.getItemIdCostUpdate(r);
+
+ if (
+ r.key === 'quantity' &&
+ r.target.type === 'consumable' &&
+ value === 0 &&
+ r.target.system.destroyOnEmpty
+ ) {
+ r.target.delete();
+ } else {
+ updates.items[r.key] = {
+ target: r.target,
+ resources: { [path]: value }
+ };
+ }
} else {
switch (r.key) {
case 'fear':
diff --git a/src/packs/items/consumables/consumable_Acidpaste_cfVFmS8vT9dbq9s1.json b/src/packs/items/consumables/consumable_Acidpaste_cfVFmS8vT9dbq9s1.json
index 942640e3..9bbca941 100644
--- a/src/packs/items/consumables/consumable_Acidpaste_cfVFmS8vT9dbq9s1.json
+++ b/src/packs/items/consumables/consumable_Acidpaste_cfVFmS8vT9dbq9s1.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Armor_Stitcher_VlbsCjvvLNfTzNXb.json b/src/packs/items/consumables/consumable_Armor_Stitcher_VlbsCjvvLNfTzNXb.json
index a2e980b6..b06f1634 100644
--- a/src/packs/items/consumables/consumable_Armor_Stitcher_VlbsCjvvLNfTzNXb.json
+++ b/src/packs/items/consumables/consumable_Armor_Stitcher_VlbsCjvvLNfTzNXb.json
@@ -48,6 +48,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json b/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json
index 05353d12..ad6dea85 100644
--- a/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json
+++ b/src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json b/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json
index 917ed5a5..1e875f98 100644
--- a/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json
+++ b/src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Blood_of_the_Yorgi_pDGzmczoTlKGmKgd.json b/src/packs/items/consumables/consumable_Blood_of_the_Yorgi_pDGzmczoTlKGmKgd.json
index 121a4ea2..545ce424 100644
--- a/src/packs/items/consumables/consumable_Blood_of_the_Yorgi_pDGzmczoTlKGmKgd.json
+++ b/src/packs/items/consumables/consumable_Blood_of_the_Yorgi_pDGzmczoTlKGmKgd.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json b/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json
index 11ab6bce..56bd6696 100644
--- a/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json
+++ b/src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Bonding_Honey_PfQvqopXgvroBklL.json b/src/packs/items/consumables/consumable_Bonding_Honey_PfQvqopXgvroBklL.json
index a866f8ba..73dcfc1f 100644
--- a/src/packs/items/consumables/consumable_Bonding_Honey_PfQvqopXgvroBklL.json
+++ b/src/packs/items/consumables/consumable_Bonding_Honey_PfQvqopXgvroBklL.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Bridge_Seed_RrIasiMCt6mqVTps.json b/src/packs/items/consumables/consumable_Bridge_Seed_RrIasiMCt6mqVTps.json
index b84e2de2..777adc08 100644
--- a/src/packs/items/consumables/consumable_Bridge_Seed_RrIasiMCt6mqVTps.json
+++ b/src/packs/items/consumables/consumable_Bridge_Seed_RrIasiMCt6mqVTps.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Channelstone_IKMVQ6VwtapwoUim.json b/src/packs/items/consumables/consumable_Channelstone_IKMVQ6VwtapwoUim.json
index b05132c0..85e8ed29 100644
--- a/src/packs/items/consumables/consumable_Channelstone_IKMVQ6VwtapwoUim.json
+++ b/src/packs/items/consumables/consumable_Channelstone_IKMVQ6VwtapwoUim.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json b/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json
index 945b8af0..ae60104a 100644
--- a/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json
+++ b/src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Circle_of_the_Void_elsyP6VhHw1JjGSl.json b/src/packs/items/consumables/consumable_Circle_of_the_Void_elsyP6VhHw1JjGSl.json
index 38870dd3..a6ca40ba 100644
--- a/src/packs/items/consumables/consumable_Circle_of_the_Void_elsyP6VhHw1JjGSl.json
+++ b/src/packs/items/consumables/consumable_Circle_of_the_Void_elsyP6VhHw1JjGSl.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json b/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json
index fe1b1580..3c58799a 100644
--- a/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json
+++ b/src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json b/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json
index d44fcc37..fe22618c 100644
--- a/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json
+++ b/src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Dragonbloom_Tea_wM18PWWW2Ami4fBG.json b/src/packs/items/consumables/consumable_Dragonbloom_Tea_wM18PWWW2Ami4fBG.json
index c14d49a9..3bb5766f 100644
--- a/src/packs/items/consumables/consumable_Dragonbloom_Tea_wM18PWWW2Ami4fBG.json
+++ b/src/packs/items/consumables/consumable_Dragonbloom_Tea_wM18PWWW2Ami4fBG.json
@@ -89,6 +89,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Dripfang_Poison_eU8VpbWB2NHIL47n.json b/src/packs/items/consumables/consumable_Dripfang_Poison_eU8VpbWB2NHIL47n.json
index 0db33648..73f1b3c2 100644
--- a/src/packs/items/consumables/consumable_Dripfang_Poison_eU8VpbWB2NHIL47n.json
+++ b/src/packs/items/consumables/consumable_Dripfang_Poison_eU8VpbWB2NHIL47n.json
@@ -71,6 +71,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json b/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json
index e42616d9..dc8260d0 100644
--- a/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json
+++ b/src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Feast_of_Xuria_aX6NyxkNzu0LcJpt.json b/src/packs/items/consumables/consumable_Feast_of_Xuria_aX6NyxkNzu0LcJpt.json
index f8c5df25..4b4c8236 100644
--- a/src/packs/items/consumables/consumable_Feast_of_Xuria_aX6NyxkNzu0LcJpt.json
+++ b/src/packs/items/consumables/consumable_Feast_of_Xuria_aX6NyxkNzu0LcJpt.json
@@ -134,6 +134,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json b/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json
index 0808974e..023edb88 100644
--- a/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json
+++ b/src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json b/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json
index 375c582f..b76ff1f9 100644
--- a/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json
+++ b/src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json b/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
index b553ae3f..b208c3ac 100644
--- a/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
+++ b/src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json b/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json
index c3007370..5563b561 100644
--- a/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json
+++ b/src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Health_Potion_Aruc2NLutWuVIjP1.json b/src/packs/items/consumables/consumable_Health_Potion_Aruc2NLutWuVIjP1.json
index e758f622..c600d102 100644
--- a/src/packs/items/consumables/consumable_Health_Potion_Aruc2NLutWuVIjP1.json
+++ b/src/packs/items/consumables/consumable_Health_Potion_Aruc2NLutWuVIjP1.json
@@ -84,6 +84,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json b/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json
index 9bc338a0..8488df03 100644
--- a/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json
+++ b/src/packs/items/consumables/consumable_Homet_s_Secret_Potion_VSwa1LpQ9PjZKsWF.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Hopehold_Flare_EhaQCPJ8oiqpRIwB.json b/src/packs/items/consumables/consumable_Hopehold_Flare_EhaQCPJ8oiqpRIwB.json
index 467807de..6cb963a8 100644
--- a/src/packs/items/consumables/consumable_Hopehold_Flare_EhaQCPJ8oiqpRIwB.json
+++ b/src/packs/items/consumables/consumable_Hopehold_Flare_EhaQCPJ8oiqpRIwB.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Improved_Arcane_Shard_nQTo6mNoPTEVBtkm.json b/src/packs/items/consumables/consumable_Improved_Arcane_Shard_nQTo6mNoPTEVBtkm.json
index ed28725b..09ba52dc 100644
--- a/src/packs/items/consumables/consumable_Improved_Arcane_Shard_nQTo6mNoPTEVBtkm.json
+++ b/src/packs/items/consumables/consumable_Improved_Arcane_Shard_nQTo6mNoPTEVBtkm.json
@@ -91,6 +91,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json b/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
index 04eb4610..240e2bd3 100644
--- a/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
+++ b/src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Jar_of_Lost_Voices_yUol6M5b8jsbk9za.json b/src/packs/items/consumables/consumable_Jar_of_Lost_Voices_yUol6M5b8jsbk9za.json
index 9342a8bb..7a9a8193 100644
--- a/src/packs/items/consumables/consumable_Jar_of_Lost_Voices_yUol6M5b8jsbk9za.json
+++ b/src/packs/items/consumables/consumable_Jar_of_Lost_Voices_yUol6M5b8jsbk9za.json
@@ -71,6 +71,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Jumping_Root_c2putn9apuurJhWX.json b/src/packs/items/consumables/consumable_Jumping_Root_c2putn9apuurJhWX.json
index 4feb7534..9f9939a8 100644
--- a/src/packs/items/consumables/consumable_Jumping_Root_c2putn9apuurJhWX.json
+++ b/src/packs/items/consumables/consumable_Jumping_Root_c2putn9apuurJhWX.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Knowledge_Stone_nL9IALzm9BNi5oSt.json b/src/packs/items/consumables/consumable_Knowledge_Stone_nL9IALzm9BNi5oSt.json
index 3509f784..398d12f5 100644
--- a/src/packs/items/consumables/consumable_Knowledge_Stone_nL9IALzm9BNi5oSt.json
+++ b/src/packs/items/consumables/consumable_Knowledge_Stone_nL9IALzm9BNi5oSt.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Major_Arcane_Shard_AA7bmiwv00lshPrC.json b/src/packs/items/consumables/consumable_Major_Arcane_Shard_AA7bmiwv00lshPrC.json
index 0d0fb72c..1cc164a2 100644
--- a/src/packs/items/consumables/consumable_Major_Arcane_Shard_AA7bmiwv00lshPrC.json
+++ b/src/packs/items/consumables/consumable_Major_Arcane_Shard_AA7bmiwv00lshPrC.json
@@ -89,6 +89,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json b/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json
index 620f4e54..05e4fe5d 100644
--- a/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json
+++ b/src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json b/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json
index c9eb6fe5..12f5bf1d 100644
--- a/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json
+++ b/src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json b/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json
index 61940ce5..84a18028 100644
--- a/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json
+++ b/src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json b/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json
index b96f7c68..782e543c 100644
--- a/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json
+++ b/src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json b/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json
index 25e6f5a3..a827a738 100644
--- a/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json
+++ b/src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Health_Potion_cM7pHe8bBAxSZ2xR.json b/src/packs/items/consumables/consumable_Major_Health_Potion_cM7pHe8bBAxSZ2xR.json
index be2514e5..3e83a73c 100644
--- a/src/packs/items/consumables/consumable_Major_Health_Potion_cM7pHe8bBAxSZ2xR.json
+++ b/src/packs/items/consumables/consumable_Major_Health_Potion_cM7pHe8bBAxSZ2xR.json
@@ -84,6 +84,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Stamina_Potion_I4cQ03xbxnc81EGa.json b/src/packs/items/consumables/consumable_Major_Stamina_Potion_I4cQ03xbxnc81EGa.json
index 09f1cf84..a7cd987e 100644
--- a/src/packs/items/consumables/consumable_Major_Stamina_Potion_I4cQ03xbxnc81EGa.json
+++ b/src/packs/items/consumables/consumable_Major_Stamina_Potion_I4cQ03xbxnc81EGa.json
@@ -84,6 +84,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json b/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json
index 744c9a4c..60cd96b2 100644
--- a/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json
+++ b/src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Minor_Health_Potion_tPfKtKRRjv8qdSqy.json b/src/packs/items/consumables/consumable_Minor_Health_Potion_tPfKtKRRjv8qdSqy.json
index cdee9f54..5dc8ca28 100644
--- a/src/packs/items/consumables/consumable_Minor_Health_Potion_tPfKtKRRjv8qdSqy.json
+++ b/src/packs/items/consumables/consumable_Minor_Health_Potion_tPfKtKRRjv8qdSqy.json
@@ -84,6 +84,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Minor_Stamina_Potion_b6vGSPFWOlzZZDLO.json b/src/packs/items/consumables/consumable_Minor_Stamina_Potion_b6vGSPFWOlzZZDLO.json
index 19f9196a..81b000f7 100644
--- a/src/packs/items/consumables/consumable_Minor_Stamina_Potion_b6vGSPFWOlzZZDLO.json
+++ b/src/packs/items/consumables/consumable_Minor_Stamina_Potion_b6vGSPFWOlzZZDLO.json
@@ -84,6 +84,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Mirror_of_Marigold_UFQVwgYOUZ88UxcH.json b/src/packs/items/consumables/consumable_Mirror_of_Marigold_UFQVwgYOUZ88UxcH.json
index 5e555811..7c80bc78 100644
--- a/src/packs/items/consumables/consumable_Mirror_of_Marigold_UFQVwgYOUZ88UxcH.json
+++ b/src/packs/items/consumables/consumable_Mirror_of_Marigold_UFQVwgYOUZ88UxcH.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json b/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
index 27d43ab5..4afc72ba 100644
--- a/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
+++ b/src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json b/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
index 6263c648..5c5f4325 100644
--- a/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
+++ b/src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json b/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
index 130b475e..be940eab 100644
--- a/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
+++ b/src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json b/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json
index f2726829..c7fa2bbb 100644
--- a/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json
+++ b/src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json b/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
index 33c083af..82e4d4b9 100644
--- a/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
+++ b/src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Replication_Parchment_yJkwz4AP6yhGo8Vj.json b/src/packs/items/consumables/consumable_Replication_Parchment_yJkwz4AP6yhGo8Vj.json
index 08d6bb19..7e07b702 100644
--- a/src/packs/items/consumables/consumable_Replication_Parchment_yJkwz4AP6yhGo8Vj.json
+++ b/src/packs/items/consumables/consumable_Replication_Parchment_yJkwz4AP6yhGo8Vj.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json b/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json
index f98d28e9..08af29cc 100644
--- a/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json
+++ b/src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Sleeping_Sap_XZavUVlHEvE2srEt.json b/src/packs/items/consumables/consumable_Sleeping_Sap_XZavUVlHEvE2srEt.json
index 469b903a..b627695a 100644
--- a/src/packs/items/consumables/consumable_Sleeping_Sap_XZavUVlHEvE2srEt.json
+++ b/src/packs/items/consumables/consumable_Sleeping_Sap_XZavUVlHEvE2srEt.json
@@ -85,6 +85,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Snap_Powder_cg6VtQ0eVZjDdcK0.json b/src/packs/items/consumables/consumable_Snap_Powder_cg6VtQ0eVZjDdcK0.json
index 1cba71ed..cdc760ff 100644
--- a/src/packs/items/consumables/consumable_Snap_Powder_cg6VtQ0eVZjDdcK0.json
+++ b/src/packs/items/consumables/consumable_Snap_Powder_cg6VtQ0eVZjDdcK0.json
@@ -85,6 +85,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Stamina_Potion_hf3k1POoVSooJyN2.json b/src/packs/items/consumables/consumable_Stamina_Potion_hf3k1POoVSooJyN2.json
index eab8fe39..d278c6fe 100644
--- a/src/packs/items/consumables/consumable_Stamina_Potion_hf3k1POoVSooJyN2.json
+++ b/src/packs/items/consumables/consumable_Stamina_Potion_hf3k1POoVSooJyN2.json
@@ -84,6 +84,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Stardrop_y4c1jrlHrf0wBWOq.json b/src/packs/items/consumables/consumable_Stardrop_y4c1jrlHrf0wBWOq.json
index ab86cd67..b4c16c8d 100644
--- a/src/packs/items/consumables/consumable_Stardrop_y4c1jrlHrf0wBWOq.json
+++ b/src/packs/items/consumables/consumable_Stardrop_y4c1jrlHrf0wBWOq.json
@@ -71,6 +71,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json b/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json
index 11a35830..dd8a354b 100644
--- a/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json
+++ b/src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Sun_Tree_Sap_kwexUzdM9wm1Qums.json b/src/packs/items/consumables/consumable_Sun_Tree_Sap_kwexUzdM9wm1Qums.json
index ad061f93..f79704f4 100644
--- a/src/packs/items/consumables/consumable_Sun_Tree_Sap_kwexUzdM9wm1Qums.json
+++ b/src/packs/items/consumables/consumable_Sun_Tree_Sap_kwexUzdM9wm1Qums.json
@@ -64,6 +64,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Sweet_Moss_GrDrRqWgv7gvl9vn.json b/src/packs/items/consumables/consumable_Sweet_Moss_GrDrRqWgv7gvl9vn.json
index 9e1c27a1..e366ddbe 100644
--- a/src/packs/items/consumables/consumable_Sweet_Moss_GrDrRqWgv7gvl9vn.json
+++ b/src/packs/items/consumables/consumable_Sweet_Moss_GrDrRqWgv7gvl9vn.json
@@ -159,6 +159,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 62,
diff --git a/src/packs/items/consumables/consumable_Unstable_Arcane_Shard_mUepnLbkvFk0ha4Z.json b/src/packs/items/consumables/consumable_Unstable_Arcane_Shard_mUepnLbkvFk0ha4Z.json
index c64ac8d4..8194d7b2 100644
--- a/src/packs/items/consumables/consumable_Unstable_Arcane_Shard_mUepnLbkvFk0ha4Z.json
+++ b/src/packs/items/consumables/consumable_Unstable_Arcane_Shard_mUepnLbkvFk0ha4Z.json
@@ -91,6 +91,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Varik_Leaves_hvy5BkG3F6iOIXTx.json b/src/packs/items/consumables/consumable_Varik_Leaves_hvy5BkG3F6iOIXTx.json
index 6cfb3429..cec9395e 100644
--- a/src/packs/items/consumables/consumable_Varik_Leaves_hvy5BkG3F6iOIXTx.json
+++ b/src/packs/items/consumables/consumable_Varik_Leaves_hvy5BkG3F6iOIXTx.json
@@ -85,6 +85,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Vial_of_Darksmoke_Nwv5ydGf0MWnzq1n.json b/src/packs/items/consumables/consumable_Vial_of_Darksmoke_Nwv5ydGf0MWnzq1n.json
index e5c16f31..4959dc10 100644
--- a/src/packs/items/consumables/consumable_Vial_of_Darksmoke_Nwv5ydGf0MWnzq1n.json
+++ b/src/packs/items/consumables/consumable_Vial_of_Darksmoke_Nwv5ydGf0MWnzq1n.json
@@ -40,6 +40,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json b/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
index 2abd677d..b849d989 100644
--- a/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
+++ b/src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 60,
diff --git a/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json b/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json
index 632432c8..eb3aeb5c 100644
--- a/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json
+++ b/src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json
@@ -45,6 +45,7 @@
}
},
"consumeOnUse": true,
+ "destroyOnEmpty": true,
"attribution": {
"source": "Daggerheart SRD",
"page": 61,
diff --git a/templates/sheets/items/consumable/settings.hbs b/templates/sheets/items/consumable/settings.hbs
index 71bb2a83..7cc75f6f 100644
--- a/templates/sheets/items/consumable/settings.hbs
+++ b/templates/sheets/items/consumable/settings.hbs
@@ -10,5 +10,8 @@
{{localize "DAGGERHEART.ITEMS.Consumable.consumeOnUse"}}
{{formField systemFields.consumeOnUse value=source.system.consumeOnUse}}
+
+ {{localize "DAGGERHEART.ITEMS.Consumable.destroyOnEmpty"}}
+ {{formField systemFields.destroyOnEmpty value=source.system.destroyOnEmpty}}
\ No newline at end of file