diff --git a/assets/icons/documents/items/ArcaneWheelchair.webp b/assets/icons/documents/items/ArcaneWheelchair.webp
new file mode 100644
index 00000000..ae8e0e37
Binary files /dev/null and b/assets/icons/documents/items/ArcaneWheelchair.webp differ
diff --git a/assets/icons/documents/items/HeavyWheelchair.webp b/assets/icons/documents/items/HeavyWheelchair.webp
new file mode 100644
index 00000000..e82071ee
Binary files /dev/null and b/assets/icons/documents/items/HeavyWheelchair.webp differ
diff --git a/assets/icons/documents/items/LightWheelchair.webp b/assets/icons/documents/items/LightWheelchair.webp
new file mode 100644
index 00000000..f7efca16
Binary files /dev/null and b/assets/icons/documents/items/LightWheelchair.webp differ
diff --git a/lang/en.json b/lang/en.json
index 349200f7..d182a77c 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -272,7 +272,8 @@
"combatStarted": "Active",
"giveSpotlight": "Give The Spotlight",
"requestingSpotlight": "Requesting The Spotlight",
- "requestSpotlight": "Request The Spotlight"
+ "requestSpotlight": "Request The Spotlight",
+ "openCountdowns": "Countdowns"
},
"ContextMenu": {
"disableEffect": "Disable Effect",
@@ -1763,6 +1764,7 @@
"weapon": "Range Increase: Weapon"
},
"RefreshType": {
+ "scene": "Scene",
"session": "Session",
"shortrest": "Short Rest",
"longrest": "Long Rest"
@@ -1898,6 +1900,7 @@
"difficulty": "Difficulty",
"downtime": "Downtime",
"dropActorsHere": "Drop Actors here",
+ "dropFeaturesHere": "Drop Features here",
"duality": "Duality",
"dualityRoll": "Duality Roll",
"enabled": "Enabled",
diff --git a/module/applications/levelup/characterLevelup.mjs b/module/applications/levelup/characterLevelup.mjs
index de28f241..0ae136c4 100644
--- a/module/applications/levelup/characterLevelup.mjs
+++ b/module/applications/levelup/characterLevelup.mjs
@@ -51,7 +51,7 @@ export default class DhCharacterLevelUp extends LevelUpBase {
.filter(exp => exp.data.length > 0)
.flatMap(exp =>
exp.data.map(data => {
- const experience = Object.keys(this.actor.system.experiences).find(x => x === data);
+ const experience = Object.keys(this.actor.system.experiences)[data];
return this.actor.system.experiences[experience].name;
})
);
diff --git a/module/applications/levelup/companionLevelup.mjs b/module/applications/levelup/companionLevelup.mjs
index 2fcc42a0..c94d7d2b 100644
--- a/module/applications/levelup/companionLevelup.mjs
+++ b/module/applications/levelup/companionLevelup.mjs
@@ -39,7 +39,7 @@ export default class DhCompanionLevelUp extends BaseLevelUp {
.filter(exp => exp.data.length > 0)
.flatMap(exp =>
exp.data.map(data => {
- const experience = Object.keys(this.actor.system.experiences).find(x => x === data);
+ const experience = Object.keys(this.actor.system.experiences)[data];
return this.actor.system.experiences[experience].name;
})
);
diff --git a/module/applications/sheets-configs/adversary-settings.mjs b/module/applications/sheets-configs/adversary-settings.mjs
index 57deea25..bcc8b1c9 100644
--- a/module/applications/sheets-configs/adversary-settings.mjs
+++ b/module/applications/sheets-configs/adversary-settings.mjs
@@ -98,11 +98,17 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
async _onDrop(event) {
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
- if (data.fromInternal) return;
-
+
const item = await fromUuid(data.uuid);
- if (item.type === 'feature') {
- await this.actor.createEmbeddedDocuments('Item', [item]);
+ if (item?.type === 'feature') {
+ if (data.fromInternal && item.parent?.uuid === this.actor.uuid) {
+ return;
+ }
+
+ const itemData = item.toObject();
+ delete itemData._id;
+
+ await this.actor.createEmbeddedDocuments('Item', [itemData]);
}
}
}
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 315ae3cb..18a5ac91 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -129,6 +129,7 @@ export default function DHApplicationMixin(Base) {
const docs = [];
for (const docData of this.relatedDocs) {
+ if (!docData) continue;
const doc = await foundry.utils.fromUuid(docData.uuid);
docs.push(doc);
}
diff --git a/module/applications/sheets/api/base-item.mjs b/module/applications/sheets/api/base-item.mjs
index 6bd91ae8..a9d3237d 100644
--- a/module/applications/sheets/api/base-item.mjs
+++ b/module/applications/sheets/api/base-item.mjs
@@ -181,12 +181,18 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
static async #deleteFeature(_, element) {
const target = element.closest('[data-item-uuid]');
const feature = await getDocFromElement(target);
- if (!feature) return ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.featureIsMissing'));
- await this.document.update({
- 'system.features': this.document.system.features
- .filter(x => target.dataset.type !== x.type || x.item.uuid !== feature.uuid)
- .map(x => ({ ...x, item: x.item.uuid }))
- });
+ if (!feature) {
+ await this.document.update({
+ 'system.features': this.document.system.features
+ .filter(x => x.item)
+ .map(x => ({ ...x, item: x.item.uuid }))
+ });
+ } else
+ await this.document.update({
+ 'system.features': this.document.system.features
+ .filter(x => target.dataset.type !== x.type || x.item.uuid !== feature.uuid)
+ .map(x => ({ ...x, item: x.item.uuid }))
+ });
}
/**
@@ -259,21 +265,45 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
if (data.fromInternal) return;
const target = event.target.closest('fieldset.drop-section');
- const item = await fromUuid(data.uuid);
+ let item = await fromUuid(data.uuid);
if (item?.type === 'feature') {
+ const cls = foundry.documents.Item.implementation;
+
+ if (this.document.parent?.type === 'character') {
+ const itemData = item.toObject();
+ item = await cls.create(
+ {
+ ...itemData,
+ system: {
+ ...itemData.system,
+ originItemType: this.document.type,
+ originId: this.document.id,
+ identifier: this.document.system.isMulticlass ? 'multiclass' : null
+ }
+ },
+ { parent: this.document.parent }
+ );
+ }
+
if (target.dataset.type) {
- await this.document.update({
- 'system.features': [...this.document.system.features, { type: target.dataset.type, item }].map(
- x => ({
- ...x,
- item: x.item?.uuid
- })
- )
- });
+ await this.document.update(
+ {
+ 'system.features': [...this.document.system.features, { type: target.dataset.type, item }].map(
+ x => ({
+ ...x,
+ item: x.item?.uuid
+ })
+ )
+ },
+ { parent: this.document.parent?.type === 'character' ? this.document.parent : undefined }
+ );
} else {
- await this.document.update({
- 'system.features': [...this.document.system.features, item].map(x => x.uuid)
- });
+ await this.document.update(
+ {
+ 'system.features': [...this.document.system.features, item].map(x => x.uuid)
+ },
+ { parent: this.document.parent?.type === 'character' ? this.document.parent : undefined }
+ );
}
}
}
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 80ca1983..ee0b6671 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -533,6 +533,10 @@ export const getDiceSoNicePresets = async (hopeFaces, fearFaces, advantageFaces
};
export const refreshTypes = {
+ scene: {
+ id: 'session',
+ label: 'DAGGERHEART.GENERAL.RefreshType.scene'
+ },
session: {
id: 'session',
label: 'DAGGERHEART.GENERAL.RefreshType.session'
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index c40e7e5d..c5e250a4 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -351,6 +351,17 @@ export default class DhCharacter extends BaseDataActor {
return [...classDomains, ...multiclassDomains];
}
+ get domainData() {
+ const allDomainData = CONFIG.DH.DOMAIN.allDomains();
+ return this.domains.map(key => {
+ const domain = allDomainData[key];
+ return {
+ ...domain,
+ label: game.i18n.localize(domain.label)
+ };
+ });
+ }
+
get domainCards() {
const domainCards = this.parent.items.filter(x => x.type === 'domainCard');
const loadout = domainCards.filter(x => !x.system.inVault);
diff --git a/module/data/item/class.mjs b/module/data/item/class.mjs
index cee17613..45e8b4ab 100644
--- a/module/data/item/class.mjs
+++ b/module/data/item/class.mjs
@@ -60,17 +60,6 @@ export default class DHClass extends BaseDataItem {
/* -------------------------------------------- */
- get domainData() {
- const allDomainData = CONFIG.DH.DOMAIN.allDomains();
- return this.domains.map(key => {
- const domain = allDomainData[key];
- return {
- ...domain,
- label: game.i18n.localize(domain.label)
- };
- });
- }
-
get hopeFeatures() {
return this.features.filter(x => x.type === CONFIG.DH.ITEM.featureSubTypes.hope).map(x => x.item);
}
diff --git a/module/data/item/subclass.mjs b/module/data/item/subclass.mjs
index ce52fdc6..221785b3 100644
--- a/module/data/item/subclass.mjs
+++ b/module/data/item/subclass.mjs
@@ -21,7 +21,7 @@ export default class DHSubclass extends BaseDataItem {
integer: false,
nullable: true,
initial: null,
- label: "DAGGERHEART.ITEMS.Subclass.spellcastingTrait"
+ label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait'
}),
features: new ItemLinkFields(),
featureState: new fields.NumberField({ required: true, initial: 1, min: 1 }),
@@ -50,7 +50,8 @@ export default class DHSubclass extends BaseDataItem {
async _preCreate(data, options, user) {
if (this.actor?.type === 'character') {
- const dataUuid = data.uuid ?? data._stats?.compendiumSource ?? `Item.${data._id}`;
+ const dataUuid =
+ (data.uuid ?? data.folder) ? `Compendium.daggerheart.subclasses.Item.${data._id}` : `Item.${data._id}`;
if (this.actor.system.class.subclass) {
if (this.actor.system.multiclass.subclass) {
ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.subclassesAlreadyPresent'));
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 8fc9b74a..c75db559 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -84,6 +84,8 @@ export default class DhpActor extends Actor {
await this.update({ 'system.levelData.level.changed': Math.min(newLevel, maxLevel) });
} else {
+ const levelupAuto = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).levelupAuto;
+
const usedLevel = Math.max(newLevel, 1);
if (newLevel < 1) {
ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.tooLowLevel'));
@@ -95,79 +97,90 @@ export default class DhpActor extends Actor {
return acc;
}, {});
- const features = [];
- const domainCards = [];
- const experiences = [];
- const subclassFeatureState = { class: null, multiclass: null };
- let multiclass = null;
- Object.keys(this.system.levelData.levelups)
- .filter(x => x > usedLevel)
- .forEach(levelKey => {
- const level = this.system.levelData.levelups[levelKey];
- const achievementCards = level.achievements.domainCards.map(x => x.itemUuid);
- const advancementCards = level.selections.filter(x => x.type === 'domainCard').map(x => x.itemUuid);
- domainCards.push(...achievementCards, ...advancementCards);
- experiences.push(...Object.keys(level.achievements.experiences));
- features.push(...level.selections.flatMap(x => x.features));
+ if (levelupAuto) {
+ const features = [];
+ const domainCards = [];
+ const experiences = [];
+ const subclassFeatureState = { class: null, multiclass: null };
+ let multiclass = null;
+ Object.keys(this.system.levelData.levelups)
+ .filter(x => x > usedLevel)
+ .forEach(levelKey => {
+ const level = this.system.levelData.levelups[levelKey];
+ const achievementCards = level.achievements.domainCards.map(x => x.itemUuid);
+ const advancementCards = level.selections
+ .filter(x => x.type === 'domainCard')
+ .map(x => x.itemUuid);
+ domainCards.push(...achievementCards, ...advancementCards);
+ experiences.push(...Object.keys(level.achievements.experiences));
+ features.push(...level.selections.flatMap(x => x.features));
- const subclass = level.selections.find(x => x.type === 'subclass');
- if (subclass) {
- const path = subclass.secondaryData.isMulticlass === 'true' ? 'multiclass' : 'class';
- const subclassState = Number(subclass.secondaryData.featureState) - 1;
- subclassFeatureState[path] = subclassFeatureState[path]
- ? Math.min(subclassState, subclassFeatureState[path])
- : subclassState;
- }
+ const subclass = level.selections.find(x => x.type === 'subclass');
+ if (subclass) {
+ const path = subclass.secondaryData.isMulticlass === 'true' ? 'multiclass' : 'class';
+ const subclassState = Number(subclass.secondaryData.featureState) - 1;
+ subclassFeatureState[path] = subclassFeatureState[path]
+ ? Math.min(subclassState, subclassFeatureState[path])
+ : subclassState;
+ }
- multiclass = level.selections.find(x => x.type === 'multiclass');
- });
+ multiclass = level.selections.find(x => x.type === 'multiclass');
+ });
- for (let feature of features) {
- if (feature.onPartner && !this.system.partner) continue;
+ for (let feature of features) {
+ if (feature.onPartner && !this.system.partner) continue;
- const document = feature.onPartner ? this.system.partner : this;
- document.items.get(feature.id)?.delete();
- }
-
- if (experiences.length > 0) {
- const getUpdate = () => ({
- 'system.experiences': experiences.reduce((acc, key) => {
- acc[`-=${key}`] = null;
- return acc;
- }, {})
- });
- this.update(getUpdate());
- if (this.system.companion) {
- this.system.companion.update(getUpdate());
+ const document = feature.onPartner ? this.system.partner : this;
+ document.items.get(feature.id)?.delete();
}
- }
- if (subclassFeatureState.class) {
- this.system.class.subclass.update({ 'system.featureState': subclassFeatureState.class });
- }
-
- if (subclassFeatureState.multiclass) {
- this.system.multiclass.subclass.update({ 'system.featureState': subclassFeatureState.multiclass });
- }
-
- if (multiclass) {
- const multiclassSubclass = this.items.find(x => x.type === 'subclass' && x.system.isMulticlass);
- const multiclassItem = this.items.find(x => x.uuid === multiclass.itemUuid);
-
- multiclassSubclass.delete();
- multiclassItem.delete();
-
- this.update({
- 'system.multiclass': {
- value: null,
- subclass: null
+ if (experiences.length > 0) {
+ const getUpdate = () => ({
+ 'system.experiences': experiences.reduce((acc, key) => {
+ acc[`-=${key}`] = null;
+ return acc;
+ }, {})
+ });
+ this.update(getUpdate());
+ if (this.system.companion) {
+ this.system.companion.update(getUpdate());
}
- });
- }
+ }
- for (let domainCard of domainCards) {
- const itemCard = this.items.find(x => x.uuid === domainCard);
- itemCard.delete();
+ if (subclassFeatureState.class) {
+ this.system.class.subclass.update({ 'system.featureState': subclassFeatureState.class });
+ }
+
+ if (subclassFeatureState.multiclass) {
+ this.system.multiclass.subclass.update({ 'system.featureState': subclassFeatureState.multiclass });
+ }
+
+ if (multiclass) {
+ const multiclassItem = this.items.find(x => x.uuid === multiclass.itemUuid);
+ const multiclassFeatures = this.items.filter(
+ x => x.system.originItemType === 'class' && x.system.identifier === 'multiclass'
+ );
+ const subclassFeatures = this.items.filter(
+ x => x.system.originItemType === 'subclass' && x.system.identifier === 'multiclass'
+ );
+
+ this.deleteEmbeddedDocuments(
+ 'Item',
+ [multiclassItem, ...multiclassFeatures, ...subclassFeatures].map(x => x.id)
+ );
+
+ this.update({
+ 'system.multiclass': {
+ value: null,
+ subclass: null
+ }
+ });
+ }
+
+ for (let domainCard of domainCards) {
+ const itemCard = this.items.find(x => x.uuid === domainCard);
+ itemCard.delete();
+ }
}
await this.update({
@@ -315,6 +328,7 @@ export default class DhpActor extends Actor {
...multiclassData,
system: {
...multiclassData.system,
+ features: multiclassData.system.features.filter(x => x.type !== 'hope'),
domains: [multiclass.secondaryData.domain],
isMulticlass: true
}
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 3ade8c4a..2b10e251 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -69,6 +69,11 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
break;
}
}
+
+ if(!game.user.isGM && !this.isAuthor && !this.speakerActor?.isOwner) {
+ const buttons = html.querySelectorAll(".ability-card-footer > .ability-use-button");
+ buttons.forEach(b => b.remove());
+ }
}
addChatListeners(html) {
diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs
index deb62659..171255e2 100644
--- a/module/helpers/handlebarsHelper.mjs
+++ b/module/helpers/handlebarsHelper.mjs
@@ -60,7 +60,7 @@ export default class RegisterHandlebarsHelpers {
static rollParsed(value, actor, item, numerical) {
const isNumerical = typeof numerical === 'boolean' ? numerical : false;
- const result = itemAbleRollParse(value, actor.getRollData(), item);
+ const result = itemAbleRollParse(value, actor?.getRollData() ?? {}, item);
return isNumerical ? (!result ? 0 : Number(result)) : result;
}
@@ -69,7 +69,7 @@ export default class RegisterHandlebarsHelpers {
}
static empty(object) {
- if(!(typeof object === 'object')) return true;
+ if (!(typeof object === 'object')) return true;
return Object.keys(object).length === 0;
}
}
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 3dc1f7ed..63507782 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -85,13 +85,12 @@ export const chunkify = (array, chunkSize, mappingFunc) => {
export const tagifyElement = (element, baseOptions, onChange, tagifyOptions = {}) => {
const { maxTags } = tagifyOptions;
- const options =
- typeof baseOptions === 'object'
- ? Object.keys(baseOptions).map(optionKey => ({
- ...baseOptions[optionKey],
- id: optionKey
- }))
- : baseOptions;
+ const options = Array.isArray(baseOptions)
+ ? baseOptions
+ : Object.keys(baseOptions).map(optionKey => ({
+ ...baseOptions[optionKey],
+ id: optionKey
+ }));
const tagifyElement = new Tagify(element, {
tagTextProp: 'name',
diff --git a/src/packs/classes/feature_Prayer_Dice_Xd7RYhfTxIj9aWI2.json b/src/packs/classes/feature_Prayer_Dice_Xd7RYhfTxIj9aWI2.json
index 7705d9d6..8203a246 100644
--- a/src/packs/classes/feature_Prayer_Dice_Xd7RYhfTxIj9aWI2.json
+++ b/src/packs/classes/feature_Prayer_Dice_Xd7RYhfTxIj9aWI2.json
@@ -9,7 +9,7 @@
"resource": {
"type": "diceValue",
"value": 0,
- "max": "2",
+ "max": "@system.traits.strength.value",
"icon": "",
"recovery": "session"
},
@@ -28,12 +28,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
- "systemVersion": "0.0.1",
+ "systemVersion": "1.0.0",
"createdTime": 1754352649696,
- "modifiedTime": 1754352712334,
- "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+ "modifiedTime": 1754845640002,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_key": "!items!Xd7RYhfTxIj9aWI2"
}
diff --git a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
index c5edd49f..0abfe057 100644
--- a/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
+++ b/src/packs/items/weapons/weapon_Advanced_Arcane_Frame_Wheelchair_la3sAWgnvadc4NvP.json
@@ -2,7 +2,7 @@
"folder": "TyqMEXhSkjOUq5SA",
"name": "Advanced Arcane-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/ArcaneWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -161,8 +161,8 @@
"systemId": "daggerheart",
"systemVersion": "1.0.0",
"createdTime": 1753836715885,
- "modifiedTime": 1754815300375,
- "lastModifiedBy": "MQSznptE5yLT7kj8"
+ "modifiedTime": 1754845968271,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "la3sAWgnvadc4NvP",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json b/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json
index 34383448..f8257028 100644
--- a/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json
+++ b/src/packs/items/weapons/weapon_Advanced_Heavy_Frame_Wheelchair_eT2Qwb0RdrLX2hH1.json
@@ -2,7 +2,7 @@
"folder": "TyqMEXhSkjOUq5SA",
"name": "Advanced Heavy-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/HeavyWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -148,12 +148,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836675558,
- "modifiedTime": 1753836795905,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754845996869,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "eT2Qwb0RdrLX2hH1",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Advanced_Light_Frame_Wheelchair_BuMfupnCzHbziQ8o.json b/src/packs/items/weapons/weapon_Advanced_Light_Frame_Wheelchair_BuMfupnCzHbziQ8o.json
index add61418..324af2b1 100644
--- a/src/packs/items/weapons/weapon_Advanced_Light_Frame_Wheelchair_BuMfupnCzHbziQ8o.json
+++ b/src/packs/items/weapons/weapon_Advanced_Light_Frame_Wheelchair_BuMfupnCzHbziQ8o.json
@@ -2,7 +2,7 @@
"folder": "TyqMEXhSkjOUq5SA",
"name": "Advanced Light-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/LightWheelchair.webp",
"system": {
"description": "",
"actions": {
@@ -141,12 +141,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836614032,
- "modifiedTime": 1753836802197,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754846020904,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "BuMfupnCzHbziQ8o",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
index 49e052b7..3dd7d463 100644
--- a/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
+++ b/src/packs/items/weapons/weapon_Arcane_Frame_Wheelchair_XRChepscgr75Uug7.json
@@ -3,7 +3,7 @@
"name": "Arcane-Frame Wheelchair",
"type": "weapon",
"_id": "XRChepscgr75Uug7",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/ArcaneWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -163,8 +163,8 @@
"systemId": "daggerheart",
"systemVersion": "1.0.0",
"createdTime": 1753836689082,
- "modifiedTime": 1754815278220,
- "lastModifiedBy": "MQSznptE5yLT7kj8"
+ "modifiedTime": 1754845945327,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_key": "!items!XRChepscgr75Uug7"
}
diff --git a/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json b/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json
index 92131406..b4c48925 100644
--- a/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json
+++ b/src/packs/items/weapons/weapon_Heavy_Frame_Wheelchair_XjPQjhRCH08VUIbr.json
@@ -3,7 +3,7 @@
"name": "Heavy-Frame Wheelchair",
"type": "weapon",
"_id": "XjPQjhRCH08VUIbr",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/HeavyWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -152,12 +152,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836652314,
- "modifiedTime": 1753836667128,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754845988869,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_key": "!items!XjPQjhRCH08VUIbr"
}
diff --git a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
index e28a9c44..69744aab 100644
--- a/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
+++ b/src/packs/items/weapons/weapon_Improved_Arcane_Frame_Wheelchair_N9P695V5KKlJbAY5.json
@@ -2,7 +2,7 @@
"folder": "fFuMdvpD1F3UshmM",
"name": "Improved Arcane-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/ArcaneWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -161,8 +161,8 @@
"systemId": "daggerheart",
"systemVersion": "1.0.0",
"createdTime": 1753836714712,
- "modifiedTime": 1754815290653,
- "lastModifiedBy": "MQSznptE5yLT7kj8"
+ "modifiedTime": 1754845960700,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "N9P695V5KKlJbAY5",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json b/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json
index 41abaff0..70531b7c 100644
--- a/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json
+++ b/src/packs/items/weapons/weapon_Improved_Heavy_Frame_Wheelchair_L5KeCtrs768PmYWW.json
@@ -2,7 +2,7 @@
"folder": "fFuMdvpD1F3UshmM",
"name": "Improved Heavy-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/HeavyWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -148,12 +148,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836674233,
- "modifiedTime": 1753836769685,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754845992757,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "L5KeCtrs768PmYWW",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Improved_Light_Frame_Wheelchair_ZJsetdHKV77ygtCE.json b/src/packs/items/weapons/weapon_Improved_Light_Frame_Wheelchair_ZJsetdHKV77ygtCE.json
index c750bac9..737e2c55 100644
--- a/src/packs/items/weapons/weapon_Improved_Light_Frame_Wheelchair_ZJsetdHKV77ygtCE.json
+++ b/src/packs/items/weapons/weapon_Improved_Light_Frame_Wheelchair_ZJsetdHKV77ygtCE.json
@@ -2,7 +2,7 @@
"folder": "fFuMdvpD1F3UshmM",
"name": "Improved Light-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/LightWheelchair.webp",
"system": {
"description": "",
"actions": {
@@ -141,12 +141,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836612291,
- "modifiedTime": 1753836778961,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754846018260,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "ZJsetdHKV77ygtCE",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
index a431d0c6..b402692f 100644
--- a/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
+++ b/src/packs/items/weapons/weapon_Legendary_Arcane_Frame_Wheelchair_gA2tiET9VHGhwMoO.json
@@ -2,7 +2,7 @@
"folder": "beilKE5ZPAihKg3O",
"name": "Legendary Arcane-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/ArcaneWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -161,8 +161,8 @@
"systemId": "daggerheart",
"systemVersion": "1.0.0",
"createdTime": 1753836717240,
- "modifiedTime": 1754815308726,
- "lastModifiedBy": "MQSznptE5yLT7kj8"
+ "modifiedTime": 1754845972571,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "gA2tiET9VHGhwMoO",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json b/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json
index ade62012..d337d32f 100644
--- a/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json
+++ b/src/packs/items/weapons/weapon_Legendary_Heavy_Frame_Wheelchair_S6nB0CNlzdU05o5U.json
@@ -2,7 +2,7 @@
"folder": "beilKE5ZPAihKg3O",
"name": "Legendary Heavy-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/HeavyWheelchair.webp",
"system": {
"description": "",
"actions": {},
@@ -148,12 +148,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836676831,
- "modifiedTime": 1753836820180,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754846000470,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "S6nB0CNlzdU05o5U",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Legendary_Light_Frame_Wheelchair_Xt8tVSn5Fu6ly6LF.json b/src/packs/items/weapons/weapon_Legendary_Light_Frame_Wheelchair_Xt8tVSn5Fu6ly6LF.json
index 5b704d6c..622fcf12 100644
--- a/src/packs/items/weapons/weapon_Legendary_Light_Frame_Wheelchair_Xt8tVSn5Fu6ly6LF.json
+++ b/src/packs/items/weapons/weapon_Legendary_Light_Frame_Wheelchair_Xt8tVSn5Fu6ly6LF.json
@@ -2,7 +2,7 @@
"folder": "beilKE5ZPAihKg3O",
"name": "Legendary Light-Frame Wheelchair",
"type": "weapon",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/LightWheelchair.webp",
"system": {
"description": "",
"actions": {
@@ -141,12 +141,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836615437,
- "modifiedTime": 1753836826572,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754846023338,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_id": "Xt8tVSn5Fu6ly6LF",
"sort": 0,
diff --git a/src/packs/items/weapons/weapon_Light_Frame_Wheelchair_iaGnlUkShBgdeMo0.json b/src/packs/items/weapons/weapon_Light_Frame_Wheelchair_iaGnlUkShBgdeMo0.json
index 543a0f23..9bb97d2b 100644
--- a/src/packs/items/weapons/weapon_Light_Frame_Wheelchair_iaGnlUkShBgdeMo0.json
+++ b/src/packs/items/weapons/weapon_Light_Frame_Wheelchair_iaGnlUkShBgdeMo0.json
@@ -3,7 +3,7 @@
"name": "Light-Frame Wheelchair",
"type": "weapon",
"_id": "iaGnlUkShBgdeMo0",
- "img": "icons/svg/item-bag.svg",
+ "img": "systems/daggerheart/assets/icons/documents/items/LightWheelchair.webp",
"system": {
"description": "",
"actions": {
@@ -143,12 +143,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.347",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1753836579296,
- "modifiedTime": 1753836587147,
- "lastModifiedBy": "FecEtPuoQh6MpjQ0"
+ "modifiedTime": 1754846015528,
+ "lastModifiedBy": "H02dtt2xvVJvYESk"
},
"_key": "!items!iaGnlUkShBgdeMo0"
}
diff --git a/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json b/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json
index 6620d62c..af31907f 100644
--- a/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json
+++ b/src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json
@@ -132,7 +132,7 @@
"image": {},
"text": {
"format": 1,
- "content": "This product includes materials from the Daggerheart System Reference Document 1.0, © Critical Role, LLC. under the terms of the Darrington Press Community Gaming (DPCGL) License. More information can be found at https://www.daggerheart.com . There are no previous modifications by others.
The Foundryborne Team
The Foundryborne Team consists of:
@harryfuralle
@cptn_cosmo
@molilo
@joaquinp98
@dapoulp
@ikraik
@irktheimp
@jacobwojo
@vyrth
@.ontaro
@saatsin
@david.xyz
@lazjen
With Art from:
And special thanks to our hard working community testers:
We would also like to thank the FoundryVTT team for their support in publishing this system.
And, of course, special thanks to the teams at Critical Role and Darrington Press for making such a wonderful game and updating the license to allow a FoundryVTT version of the system.
The Foundryborne Community
Without our amazing community this project would not have been possible.
You kept us going with both direct contributions and just endless support!
We thank you with all our hearts.
Come join us!
"
+ "content": "This product includes materials from the Daggerheart System Reference Document 1.0, © Critical Role, LLC. under the terms of the Darrington Press Community Gaming (DPCGL) License. More information can be found at https://www.daggerheart.com . There are no previous modifications by others.
The Foundryborne Team
The Foundryborne Team consists of:
@harryfuralle
@cptn_cosmo
@molilo
@joaquinp98
@dapoulp
@ikraik
@irktheimp
@jacobwojo
@vyrth
@.ontaro
@saatsin
@david.xyz
@lazjen
With Art from:
@molilo (Foundryborne User Interface & Domain Card Placeholder Artwork)
@UsernameIsInUse (Foundryborne Logo, Website Design, Duality Roll Icon
@CyrensMaps (Combat Wheelchair Icons)
And special thanks to our hard working community testers:
We would also like to thank the FoundryVTT team for their support in publishing this system, as well as providing countless Icons to be used in many places.
And, of course, special thanks to the teams at Critical Role and Darrington Press for making such a wonderful game and updating the license to allow a FoundryVTT version of the system.
The Foundryborne Community
Without our amazing community this project would not have been possible.
You kept us going with both direct contributions and just endless support!
We thank you with all our hearts.
Come join us!
"
},
"video": {
"controls": true,
@@ -153,8 +153,8 @@
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1754225939902,
- "modifiedTime": 1754668980876,
- "lastModifiedBy": "Cf0YKwnZ1OHBZWl8"
+ "modifiedTime": 1754847043391,
+ "lastModifiedBy": "9GFCfEY8m5Co2mHo"
},
"_key": "!journal.pages!g7NhKvwltwafmMyR.dP6xSKEld4TSqHhK"
}
diff --git a/styles/less/sheets-settings/adversary-settings/features.less b/styles/less/sheets-settings/adversary-settings/features.less
index 037a08ea..29c9874e 100644
--- a/styles/less/sheets-settings/adversary-settings/features.less
+++ b/styles/less/sheets-settings/adversary-settings/features.less
@@ -14,8 +14,14 @@
margin-bottom: 12px;
}
- .feature-list {
+ .feature-list,
+ .features-dragger {
display: flex;
+ width: 100%;
+ font-family: @font-body;
+ }
+
+ .feature-list {
flex-direction: column;
gap: 10px;
@@ -45,5 +51,16 @@
}
}
}
+
+ .features-dragger {
+ align-items: center;
+ justify-content: center;
+ box-sizing: border-box;
+ height: 40px;
+ margin-top: 10px;
+ border: 1px dashed light-dark(@dark-blue-50, @beige-50);
+ border-radius: 3px;
+ color: light-dark(@dark-blue-50, @beige-50);
+ }
}
}
diff --git a/styles/less/ui/combat-sidebar/encounter-controls.less b/styles/less/ui/combat-sidebar/encounter-controls.less
index 58deaae8..fd0c1aee 100644
--- a/styles/less/ui/combat-sidebar/encounter-controls.less
+++ b/styles/less/ui/combat-sidebar/encounter-controls.less
@@ -2,43 +2,14 @@
.encounter-controls.combat {
justify-content: space-between;
- .encounter-fear-controls {
+ .encounter-title {
+ text-align: left;
+ }
+
+ .inner-controls {
display: flex;
align-items: center;
- gap: 8px;
-
- .encounter-fear-dice-container {
- display: flex;
- gap: 2px;
-
- .encounter-control-fear-container {
- display: flex;
- position: relative;
- align-items: center;
- justify-content: center;
- color: black;
-
- .dice {
- height: 22px;
- width: 22px;
- }
-
- .encounter-control-fear {
- position: absolute;
- font-size: 16px;
- }
-
- .encounter-control-counter {
- position: absolute;
- right: -10px;
- color: var(--color-text-secondary);
- }
- }
- }
-
- .encounter-countdowns {
- color: var(--content-link-icon-color);
- }
+ gap: 4px;
}
.control-buttons {
diff --git a/templates/sheets-settings/adversary-settings/attack.hbs b/templates/sheets-settings/adversary-settings/attack.hbs
index a51128a1..f7d38f1e 100644
--- a/templates/sheets-settings/adversary-settings/attack.hbs
+++ b/templates/sheets-settings/adversary-settings/attack.hbs
@@ -5,19 +5,19 @@
>
{{localize "DAGGERHEART.GENERAL.basics"}}
- {{formGroup systemFields.attack.fields.img value=document.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
- {{formGroup systemFields.attack.fields.name value=document.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
+ {{formGroup systemFields.attack.fields.img value=document._source.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
+ {{formGroup systemFields.attack.fields.name value=document._source.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
{{localize "DAGGERHEART.GENERAL.attack"}}
- {{formField systemFields.attack.fields.roll.fields.bonus value=document.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackBonus" name="system.attack.roll.bonus" localize=true}}
- {{formField systemFields.attack.fields.range value=document.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
+ {{formField systemFields.attack.fields.roll.fields.bonus value=document._source.system.attack.roll.bonus label="DAGGERHEART.ACTIONS.Settings.attackBonus" name="system.attack.roll.bonus" localize=true}}
+ {{formField systemFields.attack.fields.range value=document._source.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
{{#if systemFields.attack.fields.target.fields}}
- {{ formField systemFields.attack.fields.target.fields.type value=document.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true }}
- {{#if (and document.system.attack.target.type (not (eq document.system.attack.target.type 'self')))}}
- {{ formField systemFields.attack.fields.target.fields.amount value=document.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
+ {{ formField systemFields.attack.fields.target.fields.type value=document._source.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true }}
+ {{#if (and document._source.system.attack.target.type (not (eq document._source.system.attack.target.type 'self')))}}
+ {{ formField systemFields.attack.fields.target.fields.amount value=document._source.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
{{/if}}
{{/if}}
- {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=systemFields.attack.fields.damage.fields.parts.element.fields source=document.system.attack.damage path="system.attack." horde=(eq document.system.type 'horde')}}
+ {{> 'systems/daggerheart/templates/actionTypes/damage.hbs' fields=systemFields.attack.fields.damage.fields.parts.element.fields source=document.system.attack.damage path="system.attack." horde=(eq document._source.system.type 'horde')}}
\ No newline at end of file
diff --git a/templates/sheets-settings/adversary-settings/details.hbs b/templates/sheets-settings/adversary-settings/details.hbs
index e3ecf859..194c7f0c 100644
--- a/templates/sheets-settings/adversary-settings/details.hbs
+++ b/templates/sheets-settings/adversary-settings/details.hbs
@@ -6,33 +6,33 @@
{{localize 'DAGGERHEART.GENERAL.basics'}}
- {{formGroup systemFields.tier value=document.system.tier localize=true}}
- {{formGroup systemFields.type value=document.system.type localize=true}}
- {{#if (eq document.system.type 'horde')}}
- {{formGroup systemFields.hordeHp value=document.system.hordeHp label=(localize "DAGGERHEART.ACTORS.Adversary.horderHp")}}
+ {{formGroup systemFields.tier value=document._source.system.tier localize=true}}
+ {{formGroup systemFields.type value=document._source.system.type localize=true}}
+ {{#if (eq document._source.system.type 'horde')}}
+ {{formGroup systemFields.hordeHp value=document._source.system.hordeHp label=(localize "DAGGERHEART.ACTORS.Adversary.horderHp")}}
{{/if}}
- {{formGroup systemFields.difficulty value=document.system.difficulty localize=true}}
+ {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
- {{formField systemFields.description value=document.system.description label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.description.label")}}
- {{formField systemFields.motivesAndTactics value=document.system.motivesAndTactics label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label")}}
+ {{formField systemFields.description value=document._source.system.description label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.description.label")}}
+ {{formField systemFields.motivesAndTactics value=document._source.system.motivesAndTactics label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label")}}
{{localize "DAGGERHEART.GENERAL.HitPoints.plural"}}
- {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
- {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document.system.resources.hitPoints.max}}
+ {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document._source.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
+ {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document._source.system.resources.hitPoints.max}}
{{localize "DAGGERHEART.GENERAL.stress"}}
- {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}}
- {{formGroup systemFields.resources.fields.stress.fields.max value=document.system.resources.stress.max}}
+ {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}}
+ {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max}}
{{localize "DAGGERHEART.GENERAL.DamageThresholds.title"}}
- {{formGroup systemFields.damageThresholds.fields.major value=document.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
- {{formGroup systemFields.damageThresholds.fields.severe value=document.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
+ {{formGroup systemFields.damageThresholds.fields.major value=document._source.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
+ {{formGroup systemFields.damageThresholds.fields.severe value=document._source.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
\ No newline at end of file
diff --git a/templates/sheets-settings/adversary-settings/experiences.hbs b/templates/sheets-settings/adversary-settings/experiences.hbs
index 942fb238..a2c2b6de 100644
--- a/templates/sheets-settings/adversary-settings/experiences.hbs
+++ b/templates/sheets-settings/adversary-settings/experiences.hbs
@@ -10,7 +10,7 @@
{{localize tabs.experiences.label}}
- {{#each document.system.experiences as |experience key|}}
+ {{#each document._source.system.experiences as |experience key|}}
diff --git a/templates/sheets-settings/adversary-settings/features.hbs b/templates/sheets-settings/adversary-settings/features.hbs
index a287c2a8..b26fa10c 100644
--- a/templates/sheets-settings/adversary-settings/features.hbs
+++ b/templates/sheets-settings/adversary-settings/features.hbs
@@ -10,7 +10,7 @@
{{localize tabs.features.label}}
{{#each document.system.features as |feature|}}
-
+
{{feature.name}}
@@ -22,5 +22,8 @@
{{/each}}
+
+ {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
+
\ No newline at end of file
diff --git a/templates/sheets-settings/companion-settings/attack.hbs b/templates/sheets-settings/companion-settings/attack.hbs
index bebe40b3..0ec43d35 100644
--- a/templates/sheets-settings/companion-settings/attack.hbs
+++ b/templates/sheets-settings/companion-settings/attack.hbs
@@ -5,16 +5,16 @@
>
{{localize "DAGGERHEART.GENERAL.basics"}}
- {{formGroup systemFields.attack.fields.img value=document.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
- {{formGroup systemFields.attack.fields.name value=document.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
+ {{formGroup systemFields.attack.fields.img value=document._source.system.attack.img label="DAGGERHEART.GENERAL.imagePath" name="system.attack.img" localize=true}}
+ {{formGroup systemFields.attack.fields.name value=document._source.system.attack.name label="DAGGERHEART.ACTIONS.Settings.attackName" name="system.attack.name" localize=true}}
{{localize "DAGGERHEART.GENERAL.attack"}}
- {{formField systemFields.attack.fields.range value=document.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
+ {{formField systemFields.attack.fields.range value=document._source.system.attack.range label="DAGGERHEART.GENERAL.range" name="system.attack.range" localize=true}}
{{#if systemFields.attack.fields.target.fields}}
- {{ formField systemFields.attack.fields.target.fields.type value=document.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true}}
- {{#if (and document.system.attack.target.type (not (eq document.system.attack.target.type 'self')))}}
- {{ formField systemFields.attack.fields.target.fields.amount value=document.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
+ {{ formField systemFields.attack.fields.target.fields.type value=document._source.system.attack.target.type label="DAGGERHEART.GENERAL.Target.single" name="system.attack.target.type" localize=true}}
+ {{#if (and document._source.system.attack.target.type (not (eq document._source.system.attack.target.type 'self')))}}
+ {{ formField systemFields.attack.fields.target.fields.amount value=document._source.system.attack.target.amount label="DAGGERHEART.GENERAL.amount" name="system.attack.target.amount" localize=true}}
{{/if}}
{{/if}}
diff --git a/templates/sheets-settings/companion-settings/details.hbs b/templates/sheets-settings/companion-settings/details.hbs
index 4f1825d8..e4293443 100644
--- a/templates/sheets-settings/companion-settings/details.hbs
+++ b/templates/sheets-settings/companion-settings/details.hbs
@@ -6,18 +6,18 @@
{{localize 'DAGGERHEART.GENERAL.basics'}}
- {{formGroup systemFields.evasion value=document.system.evasion localize=true}}
- {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.currentStress.label' localize=true}}
- {{formGroup systemFields.resources.fields.stress.fields.max value=document.system.resources.stress.max label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.maxStress.label' localize=true}}
+ {{formGroup systemFields.evasion value=document._source.system.evasion localize=true}}
+ {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.currentStress.label' localize=true}}
+ {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.maxStress.label' localize=true}}
-
{{localize "DAGGERHEART.GENERAL.levelUp"}}
+
{{localize "DAGGERHEART.GENERAL.levelUp"}}
\ No newline at end of file
diff --git a/templates/sheets-settings/environment-settings/details.hbs b/templates/sheets-settings/environment-settings/details.hbs
index 1f8c45f2..ecb47ca8 100644
--- a/templates/sheets-settings/environment-settings/details.hbs
+++ b/templates/sheets-settings/environment-settings/details.hbs
@@ -6,11 +6,11 @@
{{localize 'DAGGERHEART.GENERAL.basics'}}
- {{formGroup systemFields.tier value=document.system.tier localize=true}}
- {{formGroup systemFields.type value=document.system.type localize=true}}
- {{formGroup systemFields.difficulty value=document.system.difficulty localize=true}}
+ {{formGroup systemFields.tier value=document._source.system.tier localize=true}}
+ {{formGroup systemFields.type value=document._source.system.type localize=true}}
+ {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
- {{formField systemFields.description value=document.system.description label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.description.label")}}
- {{formField systemFields.impulses value=document.system.impulses label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.impulses.label")}}
+ {{formField systemFields.description value=document._source.system.description label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.description.label")}}
+ {{formField systemFields.impulses value=document._source.system.impulses label=(localize "DAGGERHEART.ACTORS.Environment.FIELDS.impulses.label")}}
\ No newline at end of file
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index 7f598f55..9f2d56a1 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -87,7 +87,7 @@
{{#if document.system.class.value}}
- {{#each document.system.class.value.system.domainData as |data|}}
+ {{#each document.system.domainData as |data|}}
diff --git a/templates/ui/combatTracker/combatTrackerHeader.hbs b/templates/ui/combatTracker/combatTrackerHeader.hbs
index de666168..9ecff9e6 100644
--- a/templates/ui/combatTracker/combatTrackerHeader.hbs
+++ b/templates/ui/combatTracker/combatTrackerHeader.hbs
@@ -51,19 +51,6 @@
{{/if}}
- {{#if hasCombat}}
-
-
-
-
-
-
-
{{fear}}
-
-
-
- {{/if}}
-
{{!-- Combat Status --}}
{{#if combats.length}}
@@ -78,14 +65,16 @@
{{!-- Combat Controls --}}
- {{#if hasCombat}}
-
- {{/if}}
-
+
+ {{#if hasCombat}}
+
{{localize "DAGGERHEART.APPLICATIONS.CombatTracker.openCountdowns"}}
+
+ {{/if}}
+