Support vaulting and unvaulting domain cards via dragdrop (#2070)
Some checks failed
Project CI / build (24.x) (push) Has been cancelled

This commit is contained in:
Carlos Fernandez 2026-07-08 14:57:10 -04:00 committed by GitHub
parent 6cd19ada8a
commit e55ef9fd9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 63 additions and 51 deletions

View file

@ -3233,7 +3233,7 @@
"beastformToManyAdvantages": "You cannot select any more advantages.", "beastformToManyAdvantages": "You cannot select any more advantages.",
"beastformToManyFeatures": "You cannot select any more features.", "beastformToManyFeatures": "You cannot select any more features.",
"beastformEquipWeapon": "You cannot use weapons while in a Beastform.", "beastformEquipWeapon": "You cannot use weapons while in a Beastform.",
"loadoutMaxReached": "You've reached maximum loadout. Move atleast one domain card to the vault, or increase the limit in homebrew settings if desired.", "loadoutMaxReached": "You've reached the maximum loadout size. To add more, move at least one domain card to the vault.",
"domainMaxReached": "You've reached the maximum domains for the class. Increase the limit in homebrew settings if desired.", "domainMaxReached": "You've reached the maximum domains for the class. Increase the limit in homebrew settings if desired.",
"insufficientResources": "You don't have enough resources to use that action.", "insufficientResources": "You don't have enough resources to use that action.",
"actionNoUsesRemaining": "That action doesn't have remaining uses.", "actionNoUsesRemaining": "That action doesn't have remaining uses.",

View file

@ -914,7 +914,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
const doc = await getDocFromElement(button); const doc = await getDocFromElement(button);
const { available } = this.document.system.loadoutSlot; const { available } = this.document.system.loadoutSlot;
if (doc.system.inVault && !available && !doc.system.loadoutIgnore) { if (doc.system.inVault && !available && !doc.system.loadoutIgnore) {
return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.loadoutMaxReached')); return ui.notifications.warn('DAGGERHEART.UI.Notifications.loadoutMaxReached', { localize: true });
} }
await doc?.update({ 'system.inVault': !doc.system.inVault }); await doc?.update({ 'system.inVault': !doc.system.inVault });
@ -1206,10 +1206,22 @@ export default class CharacterSheet extends DHBaseActorSheet {
if (!confirmed) return; if (!confirmed) return;
} }
if (this.document.uuid === item.parent?.uuid) { // Check for same actor drag/drop attempts
const isSameActor = this.document.uuid === item.parent?.uuid;
const loadoutFieldset = event.target.closest('[data-in-vault]');
const vaulting = loadoutFieldset?.dataset.inVault === 'true';
if (isSameActor && loadoutFieldset && item.type === 'domainCard' && vaulting !== item.system.inVault) {
// This is likely an attempt to vault or unvault an item
const { available } = this.document.system.loadoutSlot;
if (!vaulting && !available && !item.system.loadoutIgnore) {
return ui.notifications.warn('DAGGERHEART.UI.Notifications.loadoutMaxReached', { localize: true });
}
return item.update({ 'system.inVault': vaulting });
} else if (isSameActor) {
return super._onDropItem(event, item); return super._onDropItem(event, item);
} }
// Handle beastforms
if (item.type === 'beastform') { if (item.type === 'beastform') {
if (this.document.effects.find(x => x.type === 'beastform')) { if (this.document.effects.find(x => x.type === 'beastform')) {
return ui.notifications.warn( return ui.notifications.warn(

View file

@ -28,6 +28,7 @@
cardView=cardView cardView=cardView
collection=document.system.domainCards.loadout collection=document.system.domainCards.loadout
canCreate=@root.editable canCreate=@root.editable
inVault=false
}} }}
{{> 'daggerheart.inventory-items' {{> 'daggerheart.inventory-items'
title='DAGGERHEART.GENERAL.Tabs.vault' title='DAGGERHEART.GENERAL.Tabs.vault'

View file

@ -110,7 +110,7 @@
{{/each}} {{/each}}
</ul> </ul>
</div> </div>
<div class="loadout-section"> <div class="loadout-section" data-in-vault="false">
<div class="title"> <div class="title">
<side-line-div class="invert"></side-line-div> <side-line-div class="invert"></side-line-div>
<h3>{{localize "DAGGERHEART.GENERAL.loadout"}}</h3> <h3>{{localize "DAGGERHEART.GENERAL.loadout"}}</h3>
@ -118,11 +118,10 @@
</div> </div>
<ul class="items-sidebar-list"> <ul class="items-sidebar-list">
{{#each document.system.domainCards.loadout as |card|}} {{#each document.system.domainCards.loadout as |card|}}
{{> 'daggerheart.inventory-item-compact' {{> 'daggerheart.inventory-item-compact'
item=card item=card
type='domainCard' type='domainCard'
}} }}
{{/each}} {{/each}}
</ul> </ul>
</div> </div>

View file

@ -26,7 +26,7 @@ Parameters:
- showActions {boolean} : If true show feature's actions. - showActions {boolean} : If true show feature's actions.
--}} --}}
<fieldset class="{{#if isGlassy}}glassy{{/if}} drop-section"> <fieldset class="{{#if isGlassy}}glassy{{/if}} drop-section" {{#unless (isNullish inVault)}}data-in-vault="{{inVault}}"{{/unless}}>
<legend> <legend>
{{localize title}} {{localize title}}
{{#if canCreate}} {{#if canCreate}}