diff --git a/lang/en.json b/lang/en.json
index a78ed588..27943860 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2294,6 +2294,8 @@
"DomainCard": {
"type": "Type",
"recallCost": "Recall Cost",
+ "vaultActive": "Active In Vault",
+ "loadoutIgnore": "Doesn't Count For Loadout",
"foundationTitle": "Foundation",
"specializationTitle": "Specialization",
"masteryTitle": "Mastery"
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 594269be..48cf624e 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/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
+ });
}
/**
diff --git a/module/data/item/domainCard.mjs b/module/data/item/domainCard.mjs
index 92d8828c..a818a78f 100644
--- a/module/data/item/domainCard.mjs
+++ b/module/data/item/domainCard.mjs
@@ -29,7 +29,17 @@ 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
+ })
};
}
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index 2297ea27..2bc81ae8 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -20,7 +20,7 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
}
if (this.parent?.type === 'domainCard') {
- return this.parent.system.inVault;
+ return this.parent.system.inVault && !this.parent.system.vaultActive;
}
return super.isSuppressed;
diff --git a/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json b/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
index ab74e805..571a3fb4 100644
--- a/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
+++ b/src/packs/domains/domainCard_Get_Back_Up_BFWN2cObMdlk9uVz.json
@@ -18,7 +18,7 @@
},
"flags": {},
"_id": "BFWN2cObMdlk9uVz",
- "sort": 3400000,
+ "sort": 3500000,
"effects": [
{
"name": "Get Back Up",
diff --git a/src/packs/domains/domainCard_Notorious_IqxzvvjZiYbgx21A.json b/src/packs/domains/domainCard_Notorious_IqxzvvjZiYbgx21A.json
index dfb581e7..2e5f5ffd 100644
--- a/src/packs/domains/domainCard_Notorious_IqxzvvjZiYbgx21A.json
+++ b/src/packs/domains/domainCard_Notorious_IqxzvvjZiYbgx21A.json
@@ -44,7 +44,8 @@
"source": "Daggerheart SRD",
"page": 127,
"artist": ""
- }
+ },
+ "loadoutIgnore": true
},
"flags": {},
"_id": "IqxzvvjZiYbgx21A",
diff --git a/src/packs/domains/domainCard_Salvation_Beam_4uAFGp3LxiC07woC.json b/src/packs/domains/domainCard_Salvation_Beam_4uAFGp3LxiC07woC.json
index d637f611..c7aeb02f 100644
--- a/src/packs/domains/domainCard_Salvation_Beam_4uAFGp3LxiC07woC.json
+++ b/src/packs/domains/domainCard_Salvation_Beam_4uAFGp3LxiC07woC.json
@@ -95,7 +95,7 @@
},
"flags": {},
"_id": "4uAFGp3LxiC07woC",
- "sort": 3400000,
+ "sort": 3500000,
"effects": [],
"ownership": {
"default": 0
diff --git a/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json b/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
index 729aa251..ec47c9f9 100644
--- a/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
+++ b/src/packs/domains/domainCard_Vitality_sWUlSPOJEaXyQLCj.json
@@ -51,7 +51,8 @@
"source": "Daggerheart SRD",
"page": 121,
"artist": ""
- }
+ },
+ "vaultActive": true
},
"flags": {},
"_id": "sWUlSPOJEaXyQLCj",
diff --git a/src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json b/src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json
index 613aa993..126323da 100644
--- a/src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json
+++ b/src/packs/domains/folders_Level_10_7pKKYgRQAKlQAksV.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "7pKKYgRQAKlQAksV",
"description": "",
- "sort": 1000000,
+ "sort": 950000,
"flags": {},
"_key": "!folders!7pKKYgRQAKlQAksV"
}
diff --git a/src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json b/src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json
index 095ff6fb..2d9c78f9 100644
--- a/src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json
+++ b/src/packs/domains/folders_Level_1_9Xc6KzNyjDtTGZkp.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "9Xc6KzNyjDtTGZkp",
"description": "",
- "sort": 100000,
+ "sort": 700000,
"flags": {},
"_key": "!folders!9Xc6KzNyjDtTGZkp"
}
diff --git a/src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json b/src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json
index b242e121..68cc5f04 100644
--- a/src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json
+++ b/src/packs/domains/folders_Level_2_o7t2fsAmRxKLoHrO.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "o7t2fsAmRxKLoHrO",
"description": "",
- "sort": 200000,
+ "sort": 800000,
"flags": {},
"_key": "!folders!o7t2fsAmRxKLoHrO"
}
diff --git a/src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json b/src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json
index 3a4b0055..e04c6f09 100644
--- a/src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json
+++ b/src/packs/domains/folders_Level_3_wWL9mV6i2EGX5xHS.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "wWL9mV6i2EGX5xHS",
"description": "",
- "sort": 300000,
+ "sort": 850000,
"flags": {},
"_key": "!folders!wWL9mV6i2EGX5xHS"
}
diff --git a/src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json b/src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json
index ab0ba963..2b70a495 100644
--- a/src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json
+++ b/src/packs/domains/folders_Level_4_yalAnCU3SndrYImF.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "yalAnCU3SndrYImF",
"description": "",
- "sort": 400000,
+ "sort": 900000,
"flags": {},
"_key": "!folders!yalAnCU3SndrYImF"
}
diff --git a/src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json b/src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json
index 0a821a2d..5bde56f3 100644
--- a/src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json
+++ b/src/packs/domains/folders_Level_5_Emnx4o1DWGTVKoAg.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "Emnx4o1DWGTVKoAg",
"description": "",
- "sort": 500000,
+ "sort": 901563,
"flags": {},
"_key": "!folders!Emnx4o1DWGTVKoAg"
}
diff --git a/src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json b/src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json
index 5a58c052..e20ae6b5 100644
--- a/src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json
+++ b/src/packs/domains/folders_Level_6_EiP5dLozOFZKIeWN.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "EiP5dLozOFZKIeWN",
"description": "",
- "sort": 600000,
+ "sort": 903125,
"flags": {},
"_key": "!folders!EiP5dLozOFZKIeWN"
}
diff --git a/src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json b/src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json
index 233e3756..e53c0e2a 100644
--- a/src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json
+++ b/src/packs/domains/folders_Level_7_HAGbPLHwm0UozDeG.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "HAGbPLHwm0UozDeG",
"description": "",
- "sort": 700000,
+ "sort": 906250,
"flags": {},
"_key": "!folders!HAGbPLHwm0UozDeG"
}
diff --git a/src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json b/src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json
index 2b125f0d..9a0ad8d9 100644
--- a/src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json
+++ b/src/packs/domains/folders_Level_8_me7ywrVh38j6T8Sm.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "me7ywrVh38j6T8Sm",
"description": "",
- "sort": 800000,
+ "sort": 912500,
"flags": {},
"_key": "!folders!me7ywrVh38j6T8Sm"
}
diff --git a/src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json b/src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json
index c7984fb9..3547b169 100644
--- a/src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json
+++ b/src/packs/domains/folders_Level_9_QYdeGsmVYIF34kZR.json
@@ -6,7 +6,7 @@
"sorting": "a",
"_id": "QYdeGsmVYIF34kZR",
"description": "",
- "sort": 900000,
+ "sort": 925000,
"flags": {},
"_key": "!folders!QYdeGsmVYIF34kZR"
}
diff --git a/templates/sheets/items/domainCard/settings.hbs b/templates/sheets/items/domainCard/settings.hbs
index f3d05a2a..4071708e 100644
--- a/templates/sheets/items/domainCard/settings.hbs
+++ b/templates/sheets/items/domainCard/settings.hbs
@@ -14,6 +14,10 @@
{{formField systemFields.level value=source.system.level data-dtype="Number"}}
{{localize "DAGGERHEART.ITEMS.DomainCard.recallCost"}}
{{formField systemFields.recallCost value=source.system.recallCost data-dtype="Number"}}
+ {{localize "DAGGERHEART.ITEMS.DomainCard.vaultActive"}}
+ {{formField systemFields.vaultActive value=source.system.vaultActive}}
+ {{localize "DAGGERHEART.ITEMS.DomainCard.loadoutIgnore"}}
+ {{formField systemFields.loadoutIgnore value=source.system.loadoutIgnore}}
{{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}