Merge 8ab795b6ba into 454507ba7b

module/applications/sheets/actors/character.mjs

@@ -33,7 +33,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
             advanceResourceDie: CharacterSheet.#advanceResourceDie,
             cancelBeastform: CharacterSheet.#cancelBeastform,
             useDowntime: this.useDowntime,
-            viewParty: CharacterSheet.#viewParty,
+            viewParty: CharacterSheet.#viewParty
         },
         window: {
             resizable: true,
@@ -338,15 +338,20 @@ export default class CharacterSheet extends DHBaseActorSheet {
                     }
                     const type = 'effect';
                     const cls = game.system.api.models.actions.actionsTypes[type];
-                    const action = new cls({
-                        ...cls.getSourceConfig(doc.system),
-                        type: type,
-                        chatDisplay: false,
-                        cost: [{
-                            key: 'stress',
-                            value: doc.system.recallCost
-                        }]
-                    }, { parent: doc.system });
+                    const action = new cls(
+                        {
+                            ...cls.getSourceConfig(doc.system),
+                            type: type,
+                            chatDisplay: false,
+                            cost: [
+                                {
+                                    key: 'stress',
+                                    value: doc.system.recallCost
+                                }
+                            ]
+                        },
+                        { parent: doc.system }
+                    );
                     const config = await action.use(event);
                     if (config) {
                         return doc.update({ 'system.inVault': false });
@@ -822,7 +827,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
     static async #toggleVault(_event, button) {
         const doc = await getDocFromElement(button);
         const { available } = this.document.system.loadoutSlot;
-        if (doc.system.inVault && !available) {
+        if (doc.system.inVault && !available && !doc.system.loadoutIgnore) {
             return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.loadoutMaxReached'));
         }
 
@@ -900,32 +905,32 @@ export default class CharacterSheet extends DHBaseActorSheet {
             return;
         }
 
-        const buttons = parties.map((p) => {
-            const button = document.createElement("button");
-            button.type = "button";
-            button.classList.add("plain");
-            const img = document.createElement("img");
+        const buttons = parties.map(p => {
+            const button = document.createElement('button');
+            button.type = 'button';
+            button.classList.add('plain');
+            const img = document.createElement('img');
             img.src = p.img;
             button.append(img);
-            const name = document.createElement("span");
+            const name = document.createElement('span');
             name.textContent = p.name;
             button.append(name);
-            button.addEventListener("click", () => {
+            button.addEventListener('click', () => {
                 p.sheet?.render({ force: true });
                 game.tooltip.dismissLockedTooltips();
             });
             return button;
         });
 
-        const html = document.createElement("div");
-        html.classList.add("party-list");
+        const html = document.createElement('div');
+        html.classList.add('party-list');
         html.append(...buttons);
-        
+
         game.tooltip.dismissLockedTooltips();
         game.tooltip.activate(target, {
             html,
-            locked: true,
-        })
+            locked: true
+        });
     }
 
     /**

module/applications/sheets/items/domainCard.mjs

@@ -39,6 +39,9 @@ export default class DomainCardSheet extends DHBaseItemSheet {
         const context = await super._prepareContext(options);
         context.domain = CONFIG.DH.DOMAIN.allDomains()[this.document.system.domain];
         context.domainChoices = CONFIG.DH.DOMAIN.orderedDomains();
+        context.domainTouchedPlaceholder = game.i18n.format('DAGGERHEART.ITEMS.DomainCard.domainTouchedPlaceholder', {
+            domain: game.i18n.localize(context.domain.label)
+        });
 
         return context;
     }

module/data/item/domainCard.mjs

@@ -29,7 +29,21 @@ export default class DHDomainCard extends BaseDataItem {
                 required: true,
                 initial: CONFIG.DH.DOMAIN.cardTypes.ability.id
             }),
-            inVault: new fields.BooleanField({ initial: false })
+            inVault: new fields.BooleanField({ initial: false }),
+            vaultActive: new fields.BooleanField({
+                required: true,
+                nullable: false,
+                initial: false
+            }),
+            loadoutIgnore: new fields.BooleanField({
+                required: true,
+                nullable: false,
+                initial: false
+            }),
+            domainTouched: new fields.NumberField({
+                nullable: true,
+                initial: null
+            })
         };
     }
 
@@ -38,6 +52,30 @@ export default class DHDomainCard extends BaseDataItem {
         return game.i18n.localize(allDomainData[this.domain].label);
     }
 
+    get vaultSupressed() {
+        return this.inVault && !this.vaultActive;
+    }
+
+    get domainTouchedSuppressed() {
+        if (!this.parent.system.domainTouched || this.parent.parent?.type !== 'character') return false;
+
+        const matchingDomainCards = this.parent.parent.items.filter(
+            item => !item.system.inVault && item.system.domain === this.parent.system.domain
+        ).length;
+        return matchingDomainCards < this.parent.system.domainTouched;
+    }
+
+    get cannotUse() {
+        if (this.domainTouchedSuppressed) {
+            return ui.notifications.warn(
+                game.i18n.format('DAGGERHEART.UI.Notifications.domainTouchRequirement', {
+                    nr: this.domainTouched,
+                    domain: game.i18n.localize(CONFIG.DH.DOMAIN.allDomains()[this.domain].label)
+                })
+            );
+        }
+    }
+
     /* -------------------------------------------- */
 
     /**@override */

module/documents/activeEffect.mjs

@@ -20,7 +20,10 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
         }
 
         if (this.parent?.type === 'domainCard') {
-            return this.parent.system.inVault;
+            const vaultSupressed = this.parent.system.vaultSupressed;
+            const domainTouchedSupressed = this.parent.system.domainTouchedSuppressed;
+
+            return vaultSupressed || domainTouchedSupressed;
         }
 
         return super.isSuppressed;

module/documents/item.mjs

@@ -31,7 +31,7 @@ export default class DHItem extends foundry.documents.Item {
     static async createDocuments(sources, operation) {
         // Ensure that items being created are valid to the actor its being added to
         const actor = operation.parent;
-        sources = actor?.system?.isItemValid ? sources.filter((s) => actor.system.isItemValid(s)) : sources;
+        sources = actor?.system?.isItemValid ? sources.filter(s => actor.system.isItemValid(s)) : sources;
         return super.createDocuments(sources, operation);
     }
 
@@ -146,6 +146,8 @@ export default class DHItem extends foundry.documents.Item {
     /* -------------------------------------------- */
 
     async use(event) {
+        if (this.system.cannotUse) return;
+
         const actions = new Set(this.system.actionsList);
         if (actions?.size) {
             let action = actions.first();