Added DestroyOnEmpty property

lang/en.json

@@ -2125,7 +2125,8 @@
                 }
             },
             "Consumable": {
-                "consumeOnUse": "Consume On Use"
+                "consumeOnUse": "Consume On Use",
+                "destroyOnEmpty": "Destroy On Empty"
             },
             "DomainCard": {
                 "type": "Type",

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 };
         }
     }
 

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;
-        }
-    }
 }

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':

src/packs/items/consumables/consumable_Acidpaste_cfVFmS8vT9dbq9s1.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Armor_Stitcher_VlbsCjvvLNfTzNXb.json

@@ -48,6 +48,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Attune_Potion_JGD3M9hBHtVAA8XP.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Blinding_Orb_eAXHdzA5qNPldOpn.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

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,

src/packs/items/consumables/consumable_Bolster_Potion_FOPQNqXbiVO0ilYL.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Bonding_Honey_PfQvqopXgvroBklL.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Bridge_Seed_RrIasiMCt6mqVTps.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Channelstone_IKMVQ6VwtapwoUim.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Charm_Potion_CVBbFfOY75YwyQsp.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

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,

src/packs/items/consumables/consumable_Control_Potion_eeBhZSGLjuNZuJuI.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Death_Tea_xDnJeF1grkmKck8Q.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Dragonbloom_Tea_wM18PWWW2Ami4fBG.json

@@ -89,6 +89,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Dripfang_Poison_eU8VpbWB2NHIL47n.json

@@ -71,6 +71,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Enlighten_Potion_aWHSO2AqDufi7nL4.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Feast_of_Xuria_aX6NyxkNzu0LcJpt.json

@@ -134,6 +134,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Featherbone_DpxEMpwfasEBpORU.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Gill_Salve_Nvbb9mze6o5D0AEg.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Grindletooth_Venom_8WkhvSzeOmLdnoLJ.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Growing_Potion_fl2f3ees8RFMze9t.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Health_Potion_Aruc2NLutWuVIjP1.json

@@ -84,6 +84,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

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,

src/packs/items/consumables/consumable_Hopehold_Flare_EhaQCPJ8oiqpRIwB.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Improved_Arcane_Shard_nQTo6mNoPTEVBtkm.json

@@ -91,6 +91,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Improved_Grindletooth_Venom_BqBWXXe9T07AMV4u.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

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,

src/packs/items/consumables/consumable_Jumping_Root_c2putn9apuurJhWX.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Knowledge_Stone_nL9IALzm9BNi5oSt.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Major_Arcane_Shard_AA7bmiwv00lshPrC.json

@@ -89,6 +89,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Attune_Potion_CCPFm5iXXwvyYYwR.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Bolster_Potion_mnyQDRtngWWQeRXF.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Charm_Potion_IJLAUlQymbSjzsri.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Control_Potion_80s1FLmTLtohZ5GH.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Enlighten_Potion_SDdv1G2veMLKrxcJ.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Health_Potion_cM7pHe8bBAxSZ2xR.json

@@ -84,6 +84,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Stamina_Potion_I4cQ03xbxnc81EGa.json

@@ -84,6 +84,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Major_Stride_Potion_yK6eEDUrsPbZA8G0.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Minor_Health_Potion_tPfKtKRRjv8qdSqy.json

@@ -84,6 +84,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Minor_Stamina_Potion_b6vGSPFWOlzZZDLO.json

@@ -84,6 +84,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Mirror_of_Marigold_UFQVwgYOUZ88UxcH.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Morphing_Clay_f1NHVSIHJJCIOaBl.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Mythic_Dust_Zsh2AvZr8EkGtLyw.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Ogre_Musk_qr1bosjFcUfuwq4B.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Potion_of_Stability_dvL8oaxpEF6jKvYN.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Redthorn_Saliva_s2Exl2XFuoOhtIov.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Replication_Parchment_yJkwz4AP6yhGo8Vj.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Shrinking_Potion_HGixKenQwhyRAYNk.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Sleeping_Sap_XZavUVlHEvE2srEt.json

@@ -85,6 +85,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Snap_Powder_cg6VtQ0eVZjDdcK0.json

@@ -85,6 +85,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Stamina_Potion_hf3k1POoVSooJyN2.json

@@ -84,6 +84,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Stardrop_y4c1jrlHrf0wBWOq.json

@@ -71,6 +71,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Stride_Potion_lNtcrkgFGOJNaroE.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Sun_Tree_Sap_kwexUzdM9wm1Qums.json

@@ -64,6 +64,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Sweet_Moss_GrDrRqWgv7gvl9vn.json

@@ -159,6 +159,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 62,

src/packs/items/consumables/consumable_Unstable_Arcane_Shard_mUepnLbkvFk0ha4Z.json

@@ -91,6 +91,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Varik_Leaves_hvy5BkG3F6iOIXTx.json

@@ -85,6 +85,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Vial_of_Darksmoke_Nwv5ydGf0MWnzq1n.json

@@ -40,6 +40,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

src/packs/items/consumables/consumable_Vial_of_Moondrip_VqEX5YwK5oL3r1t6.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 60,

src/packs/items/consumables/consumable_Wingsprout_n10vozlmosVR6lo4.json

@@ -45,6 +45,7 @@
       }
     },
     "consumeOnUse": true,
+    "destroyOnEmpty": true,
     "attribution": {
       "source": "Daggerheart SRD",
       "page": 61,

templates/sheets/items/consumable/settings.hbs

@@ -10,5 +10,8 @@
 
         <span>{{localize "DAGGERHEART.ITEMS.Consumable.consumeOnUse"}}</span>
         {{formField systemFields.consumeOnUse value=source.system.consumeOnUse}}
+
+        <span>{{localize "DAGGERHEART.ITEMS.Consumable.destroyOnEmpty"}}</span>
+        {{formField systemFields.destroyOnEmpty value=source.system.destroyOnEmpty}}
     </fieldset>
 </section>