From c95520c9d8ebbe74a48fe61501a0270efb84561f Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Tue, 27 Jan 2026 18:55:25 +0100
Subject: [PATCH] .

---
 .../sheets/api/application-mixin.mjs          | 34 ++++++++-----------
 module/documents/actor.mjs                    |  7 ++--
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 0c0de075..d379906a 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -532,17 +532,6 @@ export default function DHApplicationMixin(Base) {
                     callback: async target => (await getDocFromElement(target)).toChat(this.document.uuid)
                 });
 
-            if (deletable)
-                options.push({
-                    name: 'CONTROLS.CommonDelete',
-                    icon: 'fa-solid fa-trash',
-                    callback: async (target, event) => {
-                        const doc = await getDocFromElement(target);
-                        if (event.shiftKey) return doc.delete();
-                        else return doc.deleteDialog();
-                    }
-                });
-
             options.push({
                 name: 'Unfavorite',
                 icon: 'fa-regular fa-star',
@@ -553,15 +542,9 @@ export default function DHApplicationMixin(Base) {
                 },
                 callback: async (target, _event) => {
                     const doc = await getDocFromElement(target);
-                    if (doc.type === 'domainCard') {
-                        this.document.setFavoriteItem(doc, false);
-                    } else {
-                        this.document.update({
-                            'system.sidebarFavorites': this.document.system.sidebarFavorites.filter(
-                                x => x.id !== doc.id
-                            )
-                        });
-                    }
+                    this.document.update({
+                        'system.sidebarFavorites': this.document.system.sidebarFavorites.filter(x => x.id !== doc.id)
+                    });
                 }
             });
 
@@ -583,6 +566,17 @@ export default function DHApplicationMixin(Base) {
                 }
             });
 
+            if (deletable)
+                options.push({
+                    name: 'CONTROLS.CommonDelete',
+                    icon: 'fa-solid fa-trash',
+                    callback: async (target, event) => {
+                        const doc = await getDocFromElement(target);
+                        if (event.shiftKey) return doc.delete();
+                        else return doc.deleteDialog();
+                    }
+                });
+
             return options.map(option => ({
                 ...option,
                 icon: `<i class="${option.icon}"></i>`
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index c04d886b..9d2de96b 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -1001,8 +1001,9 @@ export default class DhpActor extends Actor {
             return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.loadoutMaxReached'));
         }
 
-        await card?.update({ 'system.inVault': !card.system.inVault }, { render });
-        return [{ item: card, add: !card.system.inVault }];
+        const toVault = options.toVault ?? !card.system.inVault;
+        await card?.update({ 'system.inVault': toVault }, { render });
+        return [{ item: card, add: !toVault }];
     }
 
     async unequipBeforeEquip(itemToEquip, options = { render: true }) {
@@ -1083,7 +1084,7 @@ export default class DhpActor extends Actor {
                 else favoritesToRemove.push(data.item);
             }
         } else if (item.type === 'domainCard') {
-            const changedData = await this.toggleDomainCardVault(item, { render: false });
+            const changedData = await this.toggleDomainCardVault(item, { render: false, toVault: !setFavorited });
             for (const data of changedData) {
                 if (data.add) favoritesToAdd.push(data.item);
                 else favoritesToRemove.push(data.item);