diff --git a/module/applications/dialogs/itemTransfer.mjs b/module/applications/dialogs/itemTransfer.mjs
index ad3cf103..42e3a727 100644
--- a/module/applications/dialogs/itemTransfer.mjs
+++ b/module/applications/dialogs/itemTransfer.mjs
@@ -38,13 +38,15 @@ export default class ItemTransferDialog extends HandlebarsApplicationMixin(Appli
originActor ??= item?.actor;
const homebrewKey = CONFIG.DH.SETTINGS.gameSettings.Homebrew;
const currencySetting = game.settings.get(CONFIG.DH.id, homebrewKey).currency?.[currency] ?? null;
+ const max = item?.system.quantity ?? originActor.system.gold[currency] ?? 0;
return {
originActor,
targetActor,
itemImage: item?.img,
currencyIcon: currencySetting?.icon,
- max: item?.system.quantity ?? originActor.system.gold[currency] ?? 0,
+ max,
+ initial: targetActor.system.metadata.quantifiable?.includes(item.type) ? max : 1,
title: item?.name ?? currencySetting?.label
};
}
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index f009267e..e23a4426 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -298,47 +298,79 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
);
}
- if (item.system.metadata.isQuantifiable) {
- const actorItem = originActor.items.get(data.originId);
- const quantityTransfered = await game.system.api.applications.dialogs.ItemTransferDialog.configure({
+ // Perform the actual transfer, showing a dialog when doing it
+ const availableQuantity = Math.max(1, item.system.quantity);
+ const actorItem = originActor.items.get(data.originId) ?? item;
+ if (availableQuantity > 1) {
+ const quantityTransferred = await game.system.api.applications.dialogs.ItemTransferDialog.configure({
item,
targetActor: this.document
});
-
- if (quantityTransfered) {
- const existingItem = this.document.items.find(x => itemIsIdentical(x, item));
- if (existingItem) {
- await existingItem.update({
- 'system.quantity': existingItem.system.quantity + quantityTransfered
- });
- } else {
- const createData = item.toObject();
- await this.document.createEmbeddedDocuments('Item', [
- {
- ...createData,
- system: {
- ...createData.system,
- quantity: quantityTransfered
- }
- }
- ]);
- }
-
- if (quantityTransfered === actorItem.system.quantity) {
- await originActor.deleteEmbeddedDocuments('Item', [data.originId]);
- } else {
- await actorItem.update({
- 'system.quantity': actorItem.system.quantity - quantityTransfered
- });
- }
- }
+ return this.#transferItem(actorItem, quantityTransferred);
} else {
- await this.document.createEmbeddedDocuments('Item', [item.toObject()]);
- await originActor.deleteEmbeddedDocuments('Item', [data.originId]);
+ return this.#transferItem(actorItem, availableQuantity);
}
}
}
+ /**
+ * Helper to perform the actual transfer of an item to this actor, including stack/unstack logic based on target quantifiability.
+ * Make sure item is the actor item before calling this method or there will be issues
+ */
+ async #transferItem(item, quantity) {
+ const originActor = item.actor;
+ const targetActor = this.document;
+ const allowStacking = targetActor.system.metadata.quantifiable?.includes(item.type);
+
+ const batch = [];
+
+ // First add/update the item to the target actor
+ const existing = allowStacking ? targetActor.items.find(x => itemIsIdentical(x, item)) : null;
+ if (existing) {
+ batch.push({
+ action: 'update',
+ documentName: 'Item',
+ parent: targetActor,
+ updates: [{ '_id': existing.id, 'system.quantity': existing.system.quantity + quantity }]
+ });
+ } else {
+ const itemsToCreate = [];
+ if (allowStacking) {
+ itemsToCreate.push(foundry.utils.mergeObject(item.toObject(true), { system: { quantity } }));
+ } else {
+ const createData = new Array(Math.max(1, quantity))
+ .fill(0)
+ .map(() => foundry.utils.mergeObject(item.toObject(), { system: { quantity: 1 } }));
+ itemsToCreate.push(...createData);
+ }
+ batch.push({
+ action: 'create',
+ documentName: 'Item',
+ parent: targetActor,
+ data: itemsToCreate
+ });
+ }
+
+ // Remove the item from the original actor (by either deleting it, or updating its quantity)
+ if (quantity >= item.system.quantity) {
+ batch.push({
+ action: 'delete',
+ documentName: 'Item',
+ parent: originActor,
+ ids: [item.id]
+ });
+ } else {
+ batch.push({
+ action: 'update',
+ documentName: 'Item',
+ parent: originActor,
+ updates: [{ '_id': item.id, 'system.quantity': item.system.quantity - quantity }]
+ });
+ }
+
+ return foundry.documents.modifyBatch(batch);
+ }
+
/**
* On dragStart on the item.
* @param {DragEvent} event - The drag event
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index e6bcd294..bf3d7bb8 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -19,7 +19,8 @@ export default class DhCharacter extends DhCreature {
type: 'character',
settingSheet: DHCharacterSettings,
isNPC: false,
- hasInventory: true
+ hasInventory: true,
+ quantifiable: ["loot", "consumable"]
});
}
diff --git a/module/data/actor/party.mjs b/module/data/actor/party.mjs
index 46635237..6ccf8852 100644
--- a/module/data/actor/party.mjs
+++ b/module/data/actor/party.mjs
@@ -8,7 +8,8 @@ export default class DhParty extends BaseDataActor {
/** @inheritdoc */
static get metadata() {
return foundry.utils.mergeObject(super.metadata, {
- hasInventory: true
+ hasInventory: true,
+ quantifiable: ["weapon", "armor", "loot", "consumable"]
});
}
diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs
index 21a11149..72718c5e 100644
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@@ -4,7 +4,6 @@
* @property {string} label - A localizable label used on application.
* @property {string} type - The system type that this data model represents.
* @property {boolean} hasDescription - Indicates whether items of this type have description field
- * @property {boolean} isQuantifiable - Indicates whether items of this type have quantity field
* @property {boolean} isInventoryItem- Indicates whether items of this type is a Inventory Item
*/
@@ -24,7 +23,6 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
type: 'base',
hasDescription: false,
hasResource: false,
- isQuantifiable: false,
isInventoryItem: false,
hasActions: false,
hasAttribution: true
@@ -83,7 +81,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
);
}
- if (this.metadata.isQuantifiable)
+ if (this.metadata.isInventoryItem)
schema.quantity = new fields.NumberField({ integer: true, initial: 1, min: 0, required: true });
if (this.metadata.hasActions) schema.actions = new ActionsField();
diff --git a/module/data/item/consumable.mjs b/module/data/item/consumable.mjs
index ab527967..e83a1a53 100644
--- a/module/data/item/consumable.mjs
+++ b/module/data/item/consumable.mjs
@@ -7,7 +7,6 @@ export default class DHConsumable extends BaseDataItem {
label: 'TYPES.Item.consumable',
type: 'consumable',
hasDescription: true,
- isQuantifiable: true,
isInventoryItem: true,
hasActions: true
});
diff --git a/module/data/item/loot.mjs b/module/data/item/loot.mjs
index cdb0855e..d4092934 100644
--- a/module/data/item/loot.mjs
+++ b/module/data/item/loot.mjs
@@ -7,7 +7,6 @@ export default class DHLoot extends BaseDataItem {
label: 'TYPES.Item.loot',
type: 'loot',
hasDescription: true,
- isQuantifiable: true,
isInventoryItem: true,
hasActions: true
});
diff --git a/templates/dialogs/item-transfer.hbs b/templates/dialogs/item-transfer.hbs
index 0e7df3dc..63972ed8 100644
--- a/templates/dialogs/item-transfer.hbs
+++ b/templates/dialogs/item-transfer.hbs
@@ -14,7 +14,7 @@
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs
index aad1cf7e..30812e17 100644
--- a/templates/sheets/actors/character/inventory.hbs
+++ b/templates/sheets/actors/character/inventory.hbs
@@ -39,6 +39,7 @@
collection=@root.inventory.consumables
isGlassy=true
canCreate=true
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.loot'
@@ -47,6 +48,7 @@
isGlassy=true
canCreate=true
showActions=true
+ isQuantifiable=true
}}
\ No newline at end of file
diff --git a/templates/sheets/actors/party/inventory.hbs b/templates/sheets/actors/party/inventory.hbs
index 8dd10154..74492c73 100644
--- a/templates/sheets/actors/party/inventory.hbs
+++ b/templates/sheets/actors/party/inventory.hbs
@@ -29,6 +29,7 @@
canCreate=true
hideResources=true
hideContextMenu=true
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.armor'
@@ -39,6 +40,7 @@
canCreate=true
hideResources=true
hideContextMenu=true
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.consumable'
@@ -48,6 +50,7 @@
isGlassy=true
canCreate=true
hideContextMenu=true
+ isQuantifiable=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.loot'
@@ -57,6 +60,7 @@
isGlassy=true
canCreate=true
hideContextMenu=true
+ isQuantifiable=true
}}
\ No newline at end of file
diff --git a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
index 31c8f7f5..5c6eae32 100644
--- a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
+++ b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
@@ -66,6 +66,7 @@ Parameters:
showLabels=../showLabels
isAction=../isAction
hideResources=../hideResources
+ isQuantifiable=../isQuantifiable
showActions=../showActions
}}
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 2129b969..25f1715c 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -63,10 +63,10 @@ Parameters:
{{#if (and (not hideResources) (not (eq item.system.resource.type 'diceValue')))}}
{{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
{{/if}}
- {{#if (and (not hideResources) (gte item.system.quantity 0))}}
-
-
-
+ {{#if (or isQuantifiable (or (eq item.system.quantity 0) (gt item.system.quantity 1)))}}
+
+
+
{{/if}}
{{!-- Controls --}}