diff --git a/lang/en.json b/lang/en.json
index a63f25dd..99daf69b 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -130,7 +130,8 @@
"RangeDependance": {
"hint": "Settings for an optional distance at which this effect should activate",
"title": "Range Dependant"
- }
+ },
+ "immuneStatusText": "Immunity: {status}"
},
"ACTORS": {
"Adversary": {
@@ -396,7 +397,8 @@
"stressReduction": "Reduce By Stress",
"title": "Damage Reduction",
"unncessaryStress": "You don't need to expend stress",
- "usedMarks": "Used Marks"
+ "usedMarks": "Used Marks",
+ "reduceSeverity": "Severity Reduced By {nr}"
},
"DeathMove": {
"selectMove": "Select Move",
@@ -464,6 +466,9 @@
"title": "Select Image",
"selectImage": "Select Image"
},
+ "ItemTransfer": {
+ "transfer": "Transfer"
+ },
"Levelup": {
"actions": {
"creatureComfort": {
@@ -1031,7 +1036,8 @@
},
"ItemResourceType": {
"simple": "Simple",
- "diceValue": "Dice Value"
+ "diceValue": "Dice Value",
+ "die": "Die"
},
"Range": {
"self": {
@@ -2445,7 +2451,8 @@
"texture": "Texture",
"colorset": "Theme",
"material": "Material",
- "system": "Dice Preset"
+ "system": "Dice Preset",
+ "font": "Font"
}
},
"variantRules": {
@@ -2526,7 +2533,8 @@
"abilityCheckTitle": "{ability} Check"
},
"effectSummary": {
- "title": "Effects Applied"
+ "title": "Effects Applied",
+ "immunityTo": "Immunity: {immunities}"
},
"featureTitle": "Class Feature",
"groupRoll": {
@@ -2650,7 +2658,7 @@
"cardTooHighLevel": "The card is too high level!",
"duplicateCard": "You cannot select the same card more than once.",
"duplicateCharacter": "This actor is already registered in the party members list.",
- "onlyCharactersInPartySheet": "You can only drag characters, companions and adverasries to the party sheet.",
+ "onlyCharactersInPartySheet": "You can only drag characters, companions and adversaries to the party sheet.",
"notPrimary": "The weapon is not a primary weapon!",
"notSecondary": "The weapon is not a secondary weapon!",
"itemTooHighTier": "The item must be from Tier1",
@@ -2724,7 +2732,8 @@
"rightClickExtand": "Right-Click to extand",
"companionPartnerLevelBlock": "The companion needs an assigned partner to level up.",
"configureAttribution": "Configure Attribution",
- "deleteItem": "Delete Item"
+ "deleteItem": "Delete Item",
+ "immune": "Immune"
}
}
}
diff --git a/module/applications/dialogs/_module.mjs b/module/applications/dialogs/_module.mjs
index 43faa68a..92038c41 100644
--- a/module/applications/dialogs/_module.mjs
+++ b/module/applications/dialogs/_module.mjs
@@ -6,6 +6,7 @@ export { default as DamageReductionDialog } from './damageReductionDialog.mjs';
export { default as DeathMove } from './deathMove.mjs';
export { default as Downtime } from './downtime.mjs';
export { default as ImageSelectDialog } from './imageSelectDialog.mjs';
+export { default as ItemTransferDialog } from './itemTransfer.mjs';
export { default as MulticlassChoiceDialog } from './multiclassChoiceDialog.mjs';
export { default as OwnershipSelection } from './ownershipSelection.mjs';
export { default as RerollDamageDialog } from './rerollDamageDialog.mjs';
diff --git a/module/applications/dialogs/actionSelectionDialog.mjs b/module/applications/dialogs/actionSelectionDialog.mjs
index 786b5329..c421a577 100644
--- a/module/applications/dialogs/actionSelectionDialog.mjs
+++ b/module/applications/dialogs/actionSelectionDialog.mjs
@@ -57,7 +57,11 @@ export default class ActionSelectionDialog extends HandlebarsApplicationMixin(Ap
/** @inheritDoc */
async _prepareContext(options) {
- const actions = this.#item.system.actionsList,
+ const actions = this.#item.system.actionsList.map(action => ({
+ ...action.toObject(),
+ id: action.id,
+ img: action.baseAction ? action.parent.parent.img : action.img
+ })),
itemName = this.#item.name;
return {
...(await super._prepareContext(options)),
diff --git a/module/applications/dialogs/damageReductionDialog.mjs b/module/applications/dialogs/damageReductionDialog.mjs
index b64149c0..cd0a5cf7 100644
--- a/module/applications/dialogs/damageReductionDialog.mjs
+++ b/module/applications/dialogs/damageReductionDialog.mjs
@@ -10,6 +10,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
this.reject = reject;
this.actor = actor;
this.damage = damage;
+ this.damageType = damageType;
this.rulesDefault = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.Automation
@@ -57,6 +58,11 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
null
);
+ this.reduceSeverity = this.damageType.reduce((value, curr) => {
+ return Math.max(this.actor.system.rules.damageReduction.reduceSeverity[curr], value);
+ }, 0);
+ this.actor.system.rules.damageReduction.reduceSeverity[this.damageType];
+
this.thresholdImmunities = Object.keys(actor.system.rules.damageReduction.thresholdImmunities).reduce(
(acc, key) => {
if (actor.system.rules.damageReduction.thresholdImmunities[key])
@@ -111,7 +117,9 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
CONFIG.DH.GENERAL.ruleChoice.onWithToggle.id,
CONFIG.DH.GENERAL.ruleChoice.offWithToggle.id
].includes(this.rulesDefault);
- context.thresholdImmunities = this.thresholdImmunities;
+ context.reduceSeverity = this.reduceSeverity;
+ context.thresholdImmunities =
+ Object.keys(this.thresholdImmunities).length > 0 ? this.thresholdImmunities : null;
const { selectedArmorMarks, selectedStressMarks, stressReductions, currentMarks, currentDamage } =
this.getDamageInfo();
@@ -173,6 +181,9 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
this.damage - armorMarkReduction - selectedStressMarks.length - stressReductions.length,
0
);
+ if (this.reduceSeverity) {
+ currentDamage = Math.max(currentDamage - this.reduceSeverity, 0);
+ }
if (this.thresholdImmunities[currentDamage]) currentDamage = 0;
diff --git a/module/applications/dialogs/itemTransfer.mjs b/module/applications/dialogs/itemTransfer.mjs
new file mode 100644
index 00000000..aba43d27
--- /dev/null
+++ b/module/applications/dialogs/itemTransfer.mjs
@@ -0,0 +1,70 @@
+const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
+
+export default class ItemTransferDialog extends HandlebarsApplicationMixin(ApplicationV2) {
+ constructor(item) {
+ super({});
+
+ this.item = item;
+ this.quantity = item.system.quantity;
+ }
+
+ get title() {
+ return this.item.name;
+ }
+
+ static DEFAULT_OPTIONS = {
+ tag: 'form',
+ classes: ['daggerheart', 'dh-style', 'dialog', 'item-transfer'],
+ position: { width: 300, height: 'auto' },
+ window: { icon: 'fa-solid fa-hand-holding-hand' },
+ actions: {
+ finish: ItemTransferDialog.#finish
+ },
+ form: { handler: this.updateData, submitOnChange: true, closeOnSubmit: false }
+ };
+
+ static PARTS = {
+ main: { template: 'systems/daggerheart/templates/dialogs/item-transfer.hbs' }
+ };
+
+ _attachPartListeners(partId, htmlElement, options) {
+ super._attachPartListeners(partId, htmlElement, options);
+
+ htmlElement.querySelector('.number-display').addEventListener('change', event => {
+ this.quantity = isNaN(event.target.value) ? this.quantity : Number(event.target.value);
+ this.render();
+ });
+ }
+
+ async _prepareContext(_options) {
+ const context = await super._prepareContext(_options);
+ context.item = this.item;
+ context.quantity = this.quantity;
+
+ return context;
+ }
+
+ static async updateData(_event, _element, formData) {
+ const { quantity } = foundry.utils.expandObject(formData.object);
+ this.quantity = quantity;
+ this.render();
+ }
+
+ static async #finish() {
+ this.close({ submitted: true });
+ }
+
+ close(options = {}) {
+ if (!options.submitted) this.quantity = null;
+
+ super.close();
+ }
+
+ static async configure(item) {
+ return new Promise(resolve => {
+ const app = new this(item);
+ app.addEventListener('close', () => resolve(app.quantity), { once: true });
+ app.render({ force: true });
+ });
+ }
+}
diff --git a/module/applications/hud/tokenHUD.mjs b/module/applications/hud/tokenHUD.mjs
index a5fd719f..8898ff0b 100644
--- a/module/applications/hud/tokenHUD.mjs
+++ b/module/applications/hud/tokenHUD.mjs
@@ -33,7 +33,10 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
: context.canToggleCombat;
context.systemStatusEffects = Object.keys(context.statusEffects).reduce((acc, key) => {
const effect = context.statusEffects[key];
- if (effect.systemEffect) acc[key] = effect;
+ if (effect.systemEffect) {
+ const disabled = !effect.isActive && this.actor.system.rules.conditionImmunities[key];
+ acc[key] = { ...effect, disabled };
+ }
return acc;
}, {});
diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs
index 5950f961..9eb0cfbf 100644
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@@ -144,6 +144,7 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
context.diceSoNiceSystems = Object.fromEntries(
[...game.dice3d.DiceFactory.systems].map(([k, v]) => [k, v.name])
);
+ context.diceSoNiceFonts = game.dice3d.exports.Utils.prepareFontList();
foundry.utils.mergeObject(
context.dsnTabs,
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 85267944..c4962b18 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -8,7 +8,6 @@ import { getDocFromElement, getDocFromElementSync } from '../../../helpers/utils
/**@typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction */
-const { TextEditor } = foundry.applications.ux;
export default class CharacterSheet extends DHBaseActorSheet {
/**@inheritdoc */
static DEFAULT_OPTIONS = {
@@ -31,6 +30,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
toggleEquipItem: CharacterSheet.#toggleEquipItem,
toggleResourceDice: CharacterSheet.#toggleResourceDice,
handleResourceDice: CharacterSheet.#handleResourceDice,
+ advanceResourceDie: CharacterSheet.#advanceResourceDie,
cancelBeastform: CharacterSheet.#cancelBeastform,
useDowntime: this.useDowntime
},
@@ -148,6 +148,10 @@ export default class CharacterSheet extends DHBaseActorSheet {
htmlElement.querySelectorAll('.armor-marks-input').forEach(element => {
element.addEventListener('change', this.updateArmorMarks.bind(this));
});
+
+ htmlElement.querySelectorAll('.item-resource.die').forEach(element => {
+ element.addEventListener('contextmenu', this.lowerResourceDie.bind(this));
+ });
}
/** @inheritdoc */
@@ -858,6 +862,27 @@ export default class CharacterSheet extends DHBaseActorSheet {
});
}
+ /** */
+ static #advanceResourceDie(_, target) {
+ this.updateResourceDie(target, true);
+ }
+
+ lowerResourceDie(event) {
+ event.preventDefault();
+ event.stopPropagation();
+ this.updateResourceDie(event.target, false);
+ }
+
+ async updateResourceDie(target, advance) {
+ const item = await getDocFromElement(target);
+ if (!item) return;
+
+ const advancedValue = item.system.resource.value + (advance ? 1 : -1);
+ await item.update({
+ 'system.resource.value': Math.min(advancedValue, Number(item.system.resource.dieFaces.split('d')[1]))
+ });
+ }
+
/**
*
*/
@@ -881,6 +906,8 @@ export default class CharacterSheet extends DHBaseActorSheet {
const item = await getDocFromElement(event.target);
const dragData = {
+ originActor: this.document.uuid,
+ originId: item.id,
type: item.documentName,
uuid: item.uuid
};
@@ -894,9 +921,12 @@ export default class CharacterSheet extends DHBaseActorSheet {
// Prevent event bubbling to avoid duplicate handling
event.preventDefault();
event.stopPropagation();
+ const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
- super._onDrop(event);
- this._onDropItem(event, TextEditor.getDragEventData(event));
+ const { cancel } = await super._onDrop(event);
+ if (cancel) return;
+
+ this._onDropItem(event, data);
}
async _onDropItem(event, data) {
@@ -907,6 +937,14 @@ export default class CharacterSheet extends DHBaseActorSheet {
itemData.system.inVault = true;
}
+ const typesThatReplace = ['ancestry', 'community'];
+ if (typesThatReplace.includes(item.type)) {
+ await this.document.deleteEmbeddedDocuments(
+ 'Item',
+ this.document.items.filter(x => x.type === item.type).map(x => x.id)
+ );
+ }
+
if (item.type === 'beastform') {
if (this.document.effects.find(x => x.type === 'beastform')) {
return ui.notifications.warn(
diff --git a/module/applications/sheets/actors/environment.mjs b/module/applications/sheets/actors/environment.mjs
index e5630ad6..afc338e1 100644
--- a/module/applications/sheets/actors/environment.mjs
+++ b/module/applications/sheets/actors/environment.mjs
@@ -25,7 +25,7 @@ export default class DhpEnvironment extends DHBaseActorSheet {
toggleResourceDice: DhpEnvironment.#toggleResourceDice,
handleResourceDice: DhpEnvironment.#handleResourceDice
},
- dragDrop: [{ dragSelector: '.action-section .inventory-item', dropSelector: null }]
+ dragDrop: [{ dragSelector: '.inventory-item', dropSelector: null }]
};
/**@override */
diff --git a/module/applications/sheets/actors/party.mjs b/module/applications/sheets/actors/party.mjs
index 9b48a797..8a0b756d 100644
--- a/module/applications/sheets/actors/party.mjs
+++ b/module/applications/sheets/actors/party.mjs
@@ -7,7 +7,6 @@ import { socketEvent } from '../../../systemRegistration/socket.mjs';
import GroupRollDialog from '../../dialogs/group-roll-dialog.mjs';
import DhpActor from '../../../documents/actor.mjs';
import DHItem from '../../../documents/item.mjs';
-import DhParty from '../../../data/actor/party.mjs';
export default class Party extends DHBaseActorSheet {
constructor(options) {
@@ -21,7 +20,7 @@ export default class Party extends DHBaseActorSheet {
classes: ['party'],
position: {
width: 550,
- height: 900,
+ height: 900
},
window: {
resizable: true
@@ -41,7 +40,7 @@ export default class Party extends DHBaseActorSheet {
selectRefreshable: DaggerheartMenu.selectRefreshable,
refreshActors: DaggerheartMenu.refreshActors
},
- dragDrop: [{ dragSelector: '.actors-section .inventory-item', dropSelector: null }]
+ dragDrop: [{ dragSelector: '[data-item-id][draggable="true"]', dropSelector: null }]
};
/**@override */
@@ -439,23 +438,28 @@ export default class Party extends DHBaseActorSheet {
}
/* -------------------------------------------- */
-
async _onDragStart(event) {
- const item = event.currentTarget.closest('.inventory-item');
+ const item = await getDocFromElement(event.target);
+ const dragData = {
+ originActor: this.document.uuid,
+ originId: item.id,
+ type: item.documentName,
+ uuid: item.uuid
+ };
- if (item) {
- const adversaryData = { type: 'Actor', uuid: item.dataset.itemUuid };
- event.dataTransfer.setData('text/plain', JSON.stringify(adversaryData));
- event.dataTransfer.setDragImage(item, 60, 0);
- }
+ event.dataTransfer.setData('text/plain', JSON.stringify(dragData));
+ super._onDragStart(event);
}
async _onDrop(event) {
// Prevent event bubbling to avoid duplicate handling
event.preventDefault();
event.stopPropagation();
-
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
+
+ const { cancel } = await super._onDrop(event);
+ if (cancel) return;
+
const document = await foundry.utils.fromUuid(data.uuid);
if (document instanceof DhpActor && Party.ALLOWED_ACTOR_TYPES.includes(document.type)) {
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index e1226416..e11d841d 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -1,3 +1,4 @@
+import { itemIsIdentical } from '../../../helpers/utils.mjs';
import DHBaseActorSettings from './actor-setting.mjs';
import DHApplicationMixin from './application-mixin.mjs';
@@ -217,6 +218,70 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
/* Application Drag/Drop */
/* -------------------------------------------- */
+ async _onDrop(event) {
+ const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
+ if (data.originActor === this.document.uuid) return { cancel: true };
+
+ /* Handling transfer of inventoryItems */
+ let cancel = false;
+ const physicalActorTypes = ['character', 'party'];
+ if (physicalActorTypes.includes(this.document.type)) {
+ const originActor = data.originActor ? await foundry.utils.fromUuid(data.originActor) : null;
+ if (data.originId && originActor && physicalActorTypes.includes(originActor.type)) {
+ const dropDocument = await foundry.utils.fromUuid(data.uuid);
+
+ if (dropDocument.system.metadata.isInventoryItem) {
+ cancel = true;
+ if (dropDocument.system.metadata.isQuantifiable) {
+ const actorItem = originActor.items.get(data.originId);
+ const quantityTransfered =
+ actorItem.system.quantity === 1
+ ? 1
+ : await game.system.api.applications.dialogs.ItemTransferDialog.configure(dropDocument);
+
+ if (quantityTransfered) {
+ if (quantityTransfered === actorItem.system.quantity) {
+ await originActor.deleteEmbeddedDocuments('Item', [data.originId]);
+ } else {
+ cancel = true;
+ await actorItem.update({
+ 'system.quantity': actorItem.system.quantity - quantityTransfered
+ });
+ }
+
+ const existingItem = this.document.items.find(x => itemIsIdentical(x, dropDocument));
+ if (existingItem) {
+ cancel = true;
+ await existingItem.update({
+ 'system.quantity': existingItem.system.quantity + quantityTransfered
+ });
+ } else {
+ const createData = dropDocument.toObject();
+ await this.document.createEmbeddedDocuments('Item', [
+ {
+ ...createData,
+ system: {
+ ...createData.system,
+ quantity: quantityTransfered
+ }
+ }
+ ]);
+ }
+ } else {
+ cancel = true;
+ }
+ } else {
+ await originActor.deleteEmbeddedDocuments('Item', [data.originId], { render: false });
+ const createData = dropDocument.toObject();
+ await this.document.createEmbeddedDocuments('Item', [createData]);
+ }
+ }
+ }
+ }
+
+ return { cancel };
+ }
+
/**
* On dragStart on the item.
* @param {DragEvent} event - The drag event
diff --git a/module/applications/sheets/api/base-item.mjs b/module/applications/sheets/api/base-item.mjs
index 21ccbbf1..42ed9426 100644
--- a/module/applications/sheets/api/base-item.mjs
+++ b/module/applications/sheets/api/base-item.mjs
@@ -33,9 +33,9 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
removeResource: DHBaseItemSheet.#removeResource
},
dragDrop: [
- { dragSelector: null, dropSelector: '.tab.features .drop-section' },
+ { dragSelector: null, dropSelector: '.drop-section' },
{ dragSelector: '.feature-item', dropSelector: null },
- { dragSelector: '.action-item', dropSelector: null }
+ { dragSelector: '.inventory-item', dropSelector: null }
],
contextMenus: [
{
@@ -199,18 +199,32 @@ 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) {
await this.document.update({
'system.features': this.document.system.features
.filter(x => x.item)
.map(x => ({ ...x, item: x.item.uuid }))
});
- } else
+ } else {
+ const confirmed = await foundry.applications.api.DialogV2.confirm({
+ window: {
+ title: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.title', {
+ type: game.i18n.localize('TYPES.Item.feature'),
+ name: feature.name
+ })
+ },
+ content: game.i18n.format('DAGGERHEART.APPLICATIONS.DeleteConfirmation.text', { name: feature.name })
+ });
+
+ if (!confirmed) return;
+
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 }))
});
+ }
}
/**
@@ -242,37 +256,30 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
* @param {DragEvent} event - The drag event
*/
async _onDragStart(event) {
+ /* Can prolly be improved a lot, but I don't wanna >_< */
const featureItem = event.currentTarget.closest('.feature-item');
+ const inventoryItem = event.currentTarget.closest('.inventory-item');
+ const lineItem = event.currentTarget.closest('.item-line');
+ const dragItemData = featureItem ?? inventoryItem ?? lineItem;
- if (featureItem) {
- const feature = this.document.system.features.find(x => x?.id === featureItem.id);
- if (!feature) {
+ const dragItem = await foundry.utils.fromUuid(dragItemData.dataset.itemUuid);
+ if (dragItem) {
+ if (!dragItem) {
ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.featureIsMissing'));
return;
}
- const featureData = { type: 'Item', data: { ...feature.toObject(), _id: null }, fromInternal: true };
- event.dataTransfer.setData('text/plain', JSON.stringify(featureData));
- event.dataTransfer.setDragImage(featureItem.querySelector('img'), 60, 0);
- } else {
- const actionItem = event.currentTarget.closest('.action-item');
- if (actionItem) {
- const action = this.document.system.actions[actionItem.dataset.index];
- if (!action) {
- ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.actionIsMissing'));
- return;
- }
-
- const actionData = {
- type: 'Action',
- data: { ...action.toObject(), id: action.id, itemUuid: this.document.uuid },
- fromInternal: true
+ let dragData = {};
+ if (dragItemData.dataset.type === 'effect')
+ dragData = {
+ type: 'ActiveEffect',
+ fromInternal: this.document.uuid,
+ data: { ...dragItem, uuid: dragItem.uuid, id: dragItem.id }
};
- event.dataTransfer.setData('text/plain', JSON.stringify(actionData));
- event.dataTransfer.setDragImage(actionItem.querySelector('img'), 60, 0);
- } else {
- super._onDragStart(event);
- }
+ else dragData = { type: 'Item', uuid: dragItem.uuid, id: dragItem.id, fromInternal: this.document.id };
+
+ event.dataTransfer.setData('text/plain', JSON.stringify(dragData));
+ event.dataTransfer.setDragImage(dragItemData.querySelector('img'), 60, 0);
}
}
@@ -284,7 +291,7 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
super._onDrop(event);
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
- if (data.fromInternal) return;
+ if (data.fromInternal === this.document.id) return;
const target = event.target.closest('fieldset.drop-section');
let item = await fromUuid(data.uuid);
diff --git a/module/applications/sheets/items/class.mjs b/module/applications/sheets/items/class.mjs
index e7e00c42..05bb0229 100644
--- a/module/applications/sheets/items/class.mjs
+++ b/module/applications/sheets/items/class.mjs
@@ -125,8 +125,8 @@ export default class ClassSheet extends DHBaseItemSheet {
async _onDrop(event) {
event.stopPropagation();
const data = TextEditor.getDragEventData(event);
- const item = data.data ?? (await fromUuid(data.uuid));
- const itemType = data.data ? data.type : item.type;
+ const item = await fromUuid(data.uuid);
+ const itemType = data.type === 'ActiveEffect' ? data.type : item.type;
const target = event.target.closest('fieldset.drop-section');
if (itemType === 'subclass') {
if (item.system.linkedClass) {
diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs
index d7d3d25f..f9f7036c 100644
--- a/module/applications/ui/countdowns.mjs
+++ b/module/applications/ui/countdowns.mjs
@@ -184,9 +184,9 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
const countdown = settings.countdowns[target.id];
const newMax =
countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.increasing.id
- ? countdown.progress.max + 1
+ ? Number(countdown.progress.max) + 1
: countdown.progress.looping === CONFIG.DH.GENERAL.countdownLoopingTypes.decreasing.id
- ? Math.max(countdown.progress.max - 1, 0)
+ ? Math.max(Number(countdown.progress.max) - 1, 0)
: countdown.progress.max;
await settings.updateSource({
[`countdowns.${target.id}.progress`]: {
diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs
index 09b3b192..367e7682 100644
--- a/module/canvas/placeables/token.mjs
+++ b/module/canvas/placeables/token.mjs
@@ -24,7 +24,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
acc.push({
name: game.i18n.localize(statusData.name),
statuses: [status],
- img: statusData.icon,
+ img: statusData.icon ?? statusData.img,
tint: effect.tint
});
}
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index 544d6b2d..0dd7c587 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -1519,6 +1519,10 @@ export const itemResourceTypes = {
diceValue: {
id: 'diceValue',
label: 'DAGGERHEART.CONFIG.ItemResourceType.diceValue'
+ },
+ die: {
+ id: 'die',
+ label: 'DAGGERHEART.CONFIG.ItemResourceType.die'
}
};
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index 6960de11..93de0a2d 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -22,6 +22,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
_id: new fields.DocumentIdField({ initial: () => foundry.utils.randomID() }),
systemPath: new fields.StringField({ required: true, initial: 'actions' }),
type: new fields.StringField({ initial: undefined, readonly: true, required: true }),
+ baseAction: new fields.BooleanField({ initial: false }),
name: new fields.StringField({ initial: undefined }),
description: new fields.HTMLField(),
img: new fields.FilePathField({ initial: undefined, categories: ['IMAGE'], base64: false }),
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index 0e74e0c8..5e25202c 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -57,6 +57,13 @@ export default class DhpAdversary extends BaseDataActor {
hitPoints: resourceField(0, 0, 'DAGGERHEART.GENERAL.HitPoints.plural', true),
stress: resourceField(0, 0, 'DAGGERHEART.GENERAL.stress', true)
}),
+ rules: new fields.SchemaField({
+ conditionImmunities: new fields.SchemaField({
+ hidden: new fields.BooleanField({ initial: false }),
+ restrained: new fields.BooleanField({ initial: false }),
+ vulnerable: new fields.BooleanField({ initial: false })
+ })
+ }),
attack: new ActionField({
initial: {
name: 'Attack',
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 645a50da..638da365 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -250,6 +250,10 @@ export default class DhCharacter extends BaseDataActor {
thresholdImmunities: new fields.SchemaField({
minor: new fields.BooleanField({ initial: false })
}),
+ reduceSeverity: new fields.SchemaField({
+ magical: new fields.NumberField({ initial: 0, min: 0 }),
+ physical: new fields.NumberField({ initial: 0, min: 0 })
+ }),
disabledArmor: new fields.BooleanField({ intial: false })
}),
attack: new fields.SchemaField({
@@ -279,6 +283,11 @@ export default class DhCharacter extends BaseDataActor {
})
})
}),
+ conditionImmunities: new fields.SchemaField({
+ hidden: new fields.BooleanField({ initial: false }),
+ restrained: new fields.BooleanField({ initial: false }),
+ vulnerable: new fields.BooleanField({ initial: false })
+ }),
runeWard: new fields.BooleanField({ initial: false }),
burden: new fields.SchemaField({
ignore: new fields.BooleanField()
diff --git a/module/data/actor/companion.mjs b/module/data/actor/companion.mjs
index 48572460..a66cd028 100644
--- a/module/data/actor/companion.mjs
+++ b/module/data/actor/companion.mjs
@@ -51,6 +51,13 @@ export default class DhCompanion extends BaseDataActor {
}
}
),
+ rules: new fields.SchemaField({
+ conditionImmunities: new fields.SchemaField({
+ hidden: new fields.BooleanField({ initial: false }),
+ restrained: new fields.BooleanField({ initial: false }),
+ vulnerable: new fields.BooleanField({ initial: false })
+ })
+ }),
attack: new ActionField({
initial: {
name: 'Attack',
diff --git a/module/data/fields/action/effectsField.mjs b/module/data/fields/action/effectsField.mjs
index 887607ba..d9658736 100644
--- a/module/data/fields/action/effectsField.mjs
+++ b/module/data/fields/action/effectsField.mjs
@@ -47,15 +47,30 @@ export default class EffectsField extends fields.ArrayField {
static async applyEffects(targets) {
if (!this.effects?.length || !targets?.length) return;
+ const conditions = CONFIG.DH.GENERAL.conditions();
let effects = this.effects;
const messageTargets = [];
targets.forEach(async baseToken => {
if (this.hasSave && token.saved.success === true) effects = this.effects.filter(e => e.onSave === true);
if (!effects.length) return;
- const token = canvas.tokens.get(baseToken.id);
+ const token =
+ canvas.tokens.get(baseToken.id) ?? foundry.utils.fromUuidSync(baseToken.actorId).prototypeToken;
if (!token) return;
- messageTargets.push(token.document);
+
+ const messageToken = token.document ?? token;
+ const conditionImmunities = messageToken.actor.system.rules.conditionImmunities ?? {};
+ messageTargets.push({
+ token: messageToken,
+ conditionImmunities: Object.values(conditionImmunities).some(x => x)
+ ? game.i18n.format('DAGGERHEART.UI.Chat.effectSummary.immunityTo', {
+ immunities: Object.keys(conditionImmunities)
+ .filter(x => conditionImmunities[x])
+ .map(x => game.i18n.localize(conditions[x].name))
+ .join(', ')
+ })
+ : null
+ });
effects.forEach(async e => {
const effect = this.item.effects.get(e._id);
diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs
index 6c37f153..8661f500 100644
--- a/module/data/fields/actionField.mjs
+++ b/module/data/fields/actionField.mjs
@@ -258,7 +258,11 @@ export function ActionMixin(Base) {
const systemData = {
title: game.i18n.localize('DAGGERHEART.CONFIG.ActionType.action'),
origin: origin,
- action: { name: this.name, img: this.img, tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10'] },
+ action: {
+ name: this.name,
+ img: this.baseAction ? this.parent.parent.img : this.img,
+ tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10']
+ },
itemOrigin: this.item,
description: this.description || (this.item instanceof Item ? this.item.system.description : '')
};
diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs
index b2d937b5..295cc0c5 100644
--- a/module/data/item/weapon.mjs
+++ b/module/data/item/weapon.mjs
@@ -51,6 +51,8 @@ export default class DHWeapon extends AttachableItem {
name: 'Attack',
img: 'icons/skills/melee/blood-slash-foam-red.webp',
_id: foundry.utils.randomID(),
+ baseAction: true,
+ chatDisplay: false,
systemPath: 'attack',
type: 'attack',
range: 'melee',
diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs
index 7a5c730a..2b8d3b27 100644
--- a/module/data/settings/Appearance.mjs
+++ b/module/data/settings/Appearance.mjs
@@ -14,7 +14,8 @@ export default class DhAppearance extends foundry.abstract.DataModel {
texture: new StringField({ initial: 'astralsea', required: true, blank: false }),
colorset: new StringField({ initial: 'inspired', required: true, blank: false }),
material: new StringField({ initial: 'metal', required: true, blank: false }),
- system: new StringField({ initial: 'standard', required: true, blank: false })
+ system: new StringField({ initial: 'standard', required: true, blank: false }),
+ font: new StringField({ initial: 'auto', required: true, blank: false })
});
return {
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index b2896513..1724ec13 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -57,6 +57,27 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
update.img = 'icons/magic/life/heart-cross-blue.webp';
}
+ const immuneStatuses =
+ data.statuses?.filter(
+ status =>
+ this.parent.system.rules?.conditionImmunities &&
+ this.parent.system.rules.conditionImmunities[status]
+ ) ?? [];
+ if (immuneStatuses.length > 0) {
+ update.statuses = data.statuses.filter(x => !immuneStatuses.includes(x));
+ const conditions = CONFIG.DH.GENERAL.conditions();
+ const scrollingTexts = immuneStatuses.map(status => ({
+ text: game.i18n.format('DAGGERHEART.ACTIVEEFFECT.immuneStatusText', {
+ status: game.i18n.localize(conditions[status].name)
+ })
+ }));
+ if (update.statuses.length > 0) {
+ setTimeout(() => scrollingTexts, 500);
+ } else {
+ this.parent.queueScrollText(scrollingTexts);
+ }
+ }
+
if (Object.keys(update).length > 0) {
await this.updateSource(update);
}
@@ -76,7 +97,10 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
change.value = change.value.replaceAll(/origin\.@/gi, '@');
try {
const effect = foundry.utils.fromUuidSync(change.effect.origin);
- const doc = effect.parent?.parent;
+ const doc =
+ effect.parent?.parent instanceof game.system.api.documents.DhpActor
+ ? effect.parent
+ : effect.parent.parent;
if (doc) parseModel = doc;
} catch (_) {}
}
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index f1bec45c..c0ca20f9 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -437,3 +437,11 @@ export function shuffleArray(array) {
return array;
}
+
+export function itemIsIdentical(a, b) {
+ const compendiumSource = a._stats.compendiumSource === b._stats.compendiumSource;
+ const name = a.name === b.name;
+ const description = a.system.description === b.system.description;
+
+ return compendiumSource && name & description;
+}
diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs
index 2b87dda1..32e047fd 100644
--- a/module/systemRegistration/handlebars.mjs
+++ b/module/systemRegistration/handlebars.mjs
@@ -12,7 +12,10 @@ export const preloadHandlebarsTemplates = async function () {
'systems/daggerheart/templates/sheets/global/partials/action-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/item-resource.hbs',
- 'systems/daggerheart/templates/sheets/global/partials/resource-section.hbs',
+ 'systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs',
+ 'systems/daggerheart/templates/sheets/global/partials/resource-section/simple.hbs',
+ 'systems/daggerheart/templates/sheets/global/partials/resource-section/dice-value.hbs',
+ 'systems/daggerheart/templates/sheets/global/partials/resource-section/die.hbs',
'systems/daggerheart/templates/sheets/global/partials/resource-bar.hbs',
'systems/daggerheart/templates/components/card-preview.hbs',
'systems/daggerheart/templates/levelup/parts/selectable-card-preview.hbs',
diff --git a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
index dc8f4013..8be83035 100644
--- a/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
+++ b/src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json
@@ -401,7 +401,7 @@
"description": "You are Restrained until you break free with a successful Strength Roll.
",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
index 446aee22..c63ced47 100644
--- a/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
+++ b/src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json
@@ -239,7 +239,59 @@
},
"_id": "m6uPm4vujrUjSFPw",
"img": "icons/magic/air/fog-gas-smoke-blue-gray.webp",
- "effects": [],
+ "effects": [
+ {
+ "name": "Levitation",
+ "type": "base",
+ "system": {
+ "rangeDependence": {
+ "enabled": false,
+ "type": "withinRange",
+ "target": "hostile",
+ "range": "melee"
+ }
+ },
+ "_id": "k6iaQVfMZhrpwYQj",
+ "img": "icons/magic/air/fog-gas-smoke-blue-gray.webp",
+ "changes": [
+ {
+ "key": "system.rules.conditionImmunities.restrained",
+ "mode": 5,
+ "value": "1",
+ "priority": null
+ }
+ ],
+ "disabled": false,
+ "duration": {
+ "startTime": null,
+ "combat": null,
+ "seconds": null,
+ "rounds": null,
+ "turns": null,
+ "startRound": null,
+ "startTurn": null
+ },
+ "description": "The Skull levitates several feet off the ground and can’t be Restrained .
",
+ "origin": null,
+ "tint": "#ffffff",
+ "transfer": true,
+ "statuses": [],
+ "sort": 0,
+ "flags": {},
+ "_stats": {
+ "compendiumSource": null,
+ "duplicateSource": null,
+ "exportSource": null,
+ "coreVersion": "13.351",
+ "systemId": "daggerheart",
+ "systemVersion": "1.2.4",
+ "createdTime": 1763845938979,
+ "modifiedTime": 1763846023794,
+ "lastModifiedBy": "Q4RzhhaPfvLUzzbw"
+ },
+ "_key": "!actors.items.effects!jDmHqGvzg5wjgmxE.m6uPm4vujrUjSFPw.k6iaQVfMZhrpwYQj"
+ }
+ ],
"folder": null,
"sort": 0,
"ownership": {
diff --git a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
index 091b862c..156b1908 100644
--- a/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
+++ b/src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json
@@ -580,7 +580,7 @@
"description": "You are Restrained in smoky chains until you break free with a successful Strength or Instinct Roll. A target Restrained by this feature must spend a Hope to make an action roll.
",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
index d14eff69..5f97abe1 100644
--- a/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
+++ b/src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json
@@ -439,7 +439,7 @@
"description": "You are Restrained until the Defender takes Severe damage.
",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
index 5c09cd95..05bf04de 100644
--- a/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
+++ b/src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json
@@ -385,7 +385,7 @@
"description": "You are Restrained until you break free with a successful Finesse or Strength Roll.
",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
index f400054b..0a027340 100644
--- a/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
+++ b/src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json
@@ -624,7 +624,7 @@
"description": "",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
index ed8cf539..378fffd2 100644
--- a/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
+++ b/src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json
@@ -355,7 +355,14 @@
"range": "melee"
}
},
- "changes": [],
+ "changes": [
+ {
+ "key": "system.rules.conditionImmunities.hidden",
+ "mode": 5,
+ "value": "1",
+ "priority": null
+ }
+ ],
"disabled": false,
"duration": {
"startTime": null,
@@ -366,7 +373,7 @@
"startRound": null,
"startTurn": null
},
- "description": " You Glow until the end of the scene and can’t become Hidden . Attack rolls made against you have advantage.
",
+ "description": "You Glow until the end of the scene and can’t become Hidden . Attack rolls made against you have advantage.
",
"tint": "#ffffff",
"statuses": [],
"sort": 0,
@@ -375,12 +382,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
- "coreVersion": "13.346",
+ "coreVersion": "13.351",
"systemId": "daggerheart",
"systemVersion": "0.0.1",
"createdTime": 1754079525282,
- "modifiedTime": 1754079558712,
- "lastModifiedBy": "MQSznptE5yLT7kj8"
+ "modifiedTime": 1763847816177,
+ "lastModifiedBy": "Q4RzhhaPfvLUzzbw"
},
"_key": "!actors.items.effects!8mJYMpbLTb8qIOrr.NepVGKOo1lHYjA1F.bYBrgiSwHwYfQyjn"
}
diff --git a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
index 32282950..1085e0eb 100644
--- a/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
+++ b/src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json
@@ -426,7 +426,7 @@
"description": "You are Restrained and Vulnerable until you break free with a successful Strength Roll or the Kraken takes Major or greater damage. While Restrained and Vulnerable in this way, you must mark a Stress when you make an action roll.
",
"tint": "#ffffff",
"statuses": [
- "restrain",
+ "restrained",
"vulnerable"
],
"sort": 0,
diff --git a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
index 7d16e606..df42ee06 100644
--- a/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
+++ b/src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json
@@ -432,7 +432,7 @@
"description": "You are Restrained and Vulnerable until you break free, ending both conditions, with a successful Finesse or Strength Roll (13).
[[/dr trait=finesse difficulty=13]]
",
"tint": "#ffffff",
"statuses": [
- "restrain",
+ "restrained",
"vulnerable"
],
"sort": 0,
diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
index e28a4227..21b89ab1 100644
--- a/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
+++ b/src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json
@@ -361,7 +361,7 @@
"description": "You are Restrained within the Gaoler until freed with a successful Strength Roll (18). While Restrained , you can only attack the Gaoler.
",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
index 5449bf90..12894c19 100644
--- a/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
+++ b/src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json
@@ -399,7 +399,7 @@
"description": "You are Restrained until you're freed with a successful Strength Roll. When a creature makes an action roll against the cage, they must mark a Stress.
",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json b/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
index c768b09f..2c40d0af 100644
--- a/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
+++ b/src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json
@@ -5,9 +5,46 @@
"_id": "PnD2UCgzIlwX6cY3",
"img": "icons/magic/defensive/shield-barrier-glowing-blue.webp",
"system": {
- "description": "(Note: This needs to be manually implemented. Unstoppable die feature is not implemented as of this time)
You reduce the severity of physical damage by one threshold (Severe to Major, Major to Minor, Minor to None).
You add the current value of the Unstoppable Die to your damage roll.
You can’t be Restrained or Vulnerable.
Tip: If your Unstoppable Die is a d4 and the 4 is currently facing up, you remove the die the next time you would increase it. However, if your Unstoppable Die has increased to a d6 and the 4 is currently facing up, you’ll turn it to 5 the next time you would increase it. In this case, you’ll remove the die after you would need to increase it higher than 6.
Once per long rest, you can become Unstoppable. You gain an Unstoppable Die. At level 1, your Unstoppable Die is a d4. Place it on your character sheet in the space provided, starting with the 1 value facing up. After you make a damage roll that deals 1 or more Hit Points to a target, increase the Unstoppable Die value by one. When the die’s value would exceed its maximum value or when the scene ends, remove the die and drop out of Unstoppable. At level 5, your Unstoppable Die increases to a d6. While Unstoppable, you gain the following benefits:
You reduce the severity of physical damage by one threshold (Severe to Major, Major to Minor, Minor to None).
You add the current value of the Unstoppable Die to your damage roll.
You can’t be Restrained or Vulnerable.
Tip: If your Unstoppable Die is a d4 and the 4 is currently facing up, you remove the die the next time you would increase it. However, if your Unstoppable Die has increased to a d6 and the 4 is currently facing up, you’ll turn it to 5 the next time you would increase it. In this case, you’ll remove the die after you would need to increase it higher than 6.
Once per long rest, you can become Unstoppable. You gain an Unstoppable Die. At level 1, your Unstoppable Die is a d4. Place it on your character sheet in the space provided, starting with the 1 value facing up. After you make a damage roll that deals 1 or more Hit Points to a target, increase the Unstoppable Die value by one. When the die’s value would exceed its maximum value or when the scene ends, remove the die and drop out of Unstoppable. At level 5, your Unstoppable Die increases to a d6. While Unstoppable, you gain the following benefits:
You reduce the severity of physical damage by one threshold (Severe to Major, Major to Minor, Minor to None).
You add the current value of the Unstoppable Die to your damage roll.
You can’t be Restrained or Vulnerable.
Tip: If your Unstoppable Die is a d4 and the 4 is currently facing up, you remove the die the next time you would increase it. However, if your Unstoppable Die has increased to a d6 and the 4 is currently facing up, you’ll turn it to 5 the next time you would increase it. In this case, you’ll remove the die after you would need to increase it higher than 6.
When you succeed on an attack or Spellcast Roll, gain a +10 bonus to the damage roll.
When you deal enough damage to defeat a creature within Close range, you absorb them and clear an Armor Slot.
You can’t be Restrained .
Before you make an action roll, you must spend a Hope . If you can’t, you revert to your normal form.
When you succeed on an attack or Spellcast Roll, gain a +10 bonus to the damage roll.
When you deal enough damage to defeat a creature within Close range, you absorb them and clear an Armor Slot.
You can’t be Restrained .
Before you make an action roll, you must spend a Hope . If you can’t, you revert to your normal form.
Restrained lasts until you’re freed with a successful Finesse or Strength roll or by dealing at least 6 damage to the vines.
",
"tint": "#ffffff",
"statuses": [
- "restrain"
+ "restrained"
],
"sort": 0,
"flags": {},
diff --git a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
index 0abe95cf..a8ed164a 100644
--- a/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
+++ b/src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json
@@ -313,7 +313,7 @@
"description": "Restrained and Vulnerable until you break free, clearing both conditions, with a successful Finesse or Strength Roll or by dealing 10 damage to the vines. When the target makes a roll to escape, they take 1d8+4 physical damage and lose a Hope.
What painful memories do the vines bring to the surface as they pierce flesh?
-
-
{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.thresholdImmunities"}}
+ {{#if reduceSeverity}}
+
+
+
{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.reduceSeverity" nr=reduceSeverity}}
+
+
+ {{/if}}
+
+ {{#if thresholdImmunities}}
+
+
+
{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.thresholdImmunities"}}
+
-
{{/if}}
{{#each thresholdImmunities as | immunity key |}}
diff --git a/templates/dialogs/item-transfer.hbs b/templates/dialogs/item-transfer.hbs
new file mode 100644
index 00000000..2b9fa19c
--- /dev/null
+++ b/templates/dialogs/item-transfer.hbs
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/templates/hud/tokenHUD.hbs b/templates/hud/tokenHUD.hbs
index 0ea047c5..aaf2f5f9 100644
--- a/templates/hud/tokenHUD.hbs
+++ b/templates/hud/tokenHUD.hbs
@@ -46,7 +46,12 @@
{{#each systemStatusEffects as |status|}}
-
+
+
+ {{#if status.disabled}}
+
/
+ {{/if}}
+
{{/each}}
{{#if genericStatusEffects}}
{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.genericEffects"}}
diff --git a/templates/settings/appearance-settings/diceSoNice.hbs b/templates/settings/appearance-settings/diceSoNice.hbs
index 6321332d..6c89fd2f 100644
--- a/templates/settings/appearance-settings/diceSoNice.hbs
+++ b/templates/settings/appearance-settings/diceSoNice.hbs
@@ -53,13 +53,17 @@
{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.material"}}
{{formInput fields.material value=values.material choices=@root.diceSoNiceMaterials localize=true}}
-
+
+
+ {{localize "Preview"}}
+
+
+
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index a6cd30f0..cd9626e3 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -56,7 +56,7 @@ Parameters:
{{!-- Simple Resource --}}
- {{#if (and (not hideResources) (eq item.system.resource.type 'simple'))}}
+ {{#if (and (not hideResources) (not (eq item.system.resource.type 'diceValue')))}}
{{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
{{/if}}
{{#if (and (not hideResources) (gte item.system.quantity 0))}}
diff --git a/templates/sheets/global/partials/item-resource.hbs b/templates/sheets/global/partials/item-resource.hbs
index b29c818e..def153ea 100644
--- a/templates/sheets/global/partials/item-resource.hbs
+++ b/templates/sheets/global/partials/item-resource.hbs
@@ -3,7 +3,7 @@
{{#times (rollParsed item.system.resource.max item.parent item numerical=true)}}
{{#with (ifThen (lookup ../item.system.resource.diceStates this) (lookup ../item.system.resource.diceStates this) this) as | state |}}
@@ -18,4 +18,11 @@
{{/times}}
+
+
{{#if item.system.resource.value}}{{item.system.resource.value}}{{/if}}
+
+
{{/if}}
\ No newline at end of file
diff --git a/templates/sheets/global/partials/resource-section.hbs b/templates/sheets/global/partials/resource-section.hbs
deleted file mode 100644
index 07830261..00000000
--- a/templates/sheets/global/partials/resource-section.hbs
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- {{localize "DAGGERHEART.GENERAL.Resource.single"}}
- {{#unless source.system.resource}}
-
-
- {{#if source.system.resource}}
-
- {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
- {{formGroup systemFields.resource.fields.recovery value=source.system.resource.recovery localize=true}}
-
- {{#if (eq source.system.resource.type 'simple')}}
- {{formGroup systemFields.resource.fields.progression value=source.system.resource.progression localize=true}}
- {{/if}}
-
-
-
- {{#if (eq source.system.resource.type 'simple')}}
- {{formGroup systemFields.resource.fields.value value=source.system.resource.value localize=true}}
- {{formGroup systemFields.resource.fields.max value=source.system.resource.max localize=true}}
- {{else}}
- {{formGroup systemFields.resource.fields.dieFaces value=source.system.resource.dieFaces localize=true blank=false}}
- {{formGroup systemFields.resource.fields.max value=source.system.resource.max label="DAGGERHEART.GENERAL.amount" localize=true}}
- {{/if}}
-
-
- {{#if (eq source.system.resource.type 'simple')}}{{formGroup systemFields.resource.fields.icon value=source.system.resource.icon localize=true placeholder="fa-solid fa-hashtag"}}{{/if}}
- {{/if}}
-
\ No newline at end of file
diff --git a/templates/sheets/global/partials/resource-section/dice-value.hbs b/templates/sheets/global/partials/resource-section/dice-value.hbs
new file mode 100644
index 00000000..ff293b42
--- /dev/null
+++ b/templates/sheets/global/partials/resource-section/dice-value.hbs
@@ -0,0 +1,11 @@
+
+
+ {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
+ {{formGroup systemFields.resource.fields.recovery value=source.system.resource.recovery localize=true}}
+
+
+
+ {{formGroup systemFields.resource.fields.dieFaces value=source.system.resource.dieFaces localize=true blank=false}}
+ {{formGroup systemFields.resource.fields.max value=source.system.resource.max label="DAGGERHEART.GENERAL.amount" localize=true}}
+
+
\ No newline at end of file
diff --git a/templates/sheets/global/partials/resource-section/die.hbs b/templates/sheets/global/partials/resource-section/die.hbs
new file mode 100644
index 00000000..ca84d631
--- /dev/null
+++ b/templates/sheets/global/partials/resource-section/die.hbs
@@ -0,0 +1,6 @@
+
+
+ {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
+ {{formGroup systemFields.resource.fields.dieFaces value=source.system.resource.dieFaces localize=true blank=false}}
+
+
\ No newline at end of file
diff --git a/templates/sheets/global/partials/resource-section/resource-section.hbs b/templates/sheets/global/partials/resource-section/resource-section.hbs
new file mode 100644
index 00000000..b175fc5a
--- /dev/null
+++ b/templates/sheets/global/partials/resource-section/resource-section.hbs
@@ -0,0 +1,20 @@
+
+
+ {{localize "DAGGERHEART.GENERAL.Resource.single"}}
+ {{#unless source.system.resource}}
+
+
+ {{#if source.system.resource}}
+ {{#if (eq source.system.resource.type 'simple')}}
+ {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/simple.hbs"}}
+ {{else if (eq source.system.resource.type 'diceValue')}}
+ {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/dice-value.hbs"}}
+ {{else}}
+ {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/die.hbs"}}
+ {{/if}}
+ {{/if}}
+
\ No newline at end of file
diff --git a/templates/sheets/global/partials/resource-section/simple.hbs b/templates/sheets/global/partials/resource-section/simple.hbs
new file mode 100644
index 00000000..683a7ba4
--- /dev/null
+++ b/templates/sheets/global/partials/resource-section/simple.hbs
@@ -0,0 +1,14 @@
+
+
+ {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
+ {{formGroup systemFields.resource.fields.recovery value=source.system.resource.recovery localize=true}}
+ {{formGroup systemFields.resource.fields.progression value=source.system.resource.progression localize=true}}
+
+
+
+ {{formGroup systemFields.resource.fields.value value=source.system.resource.value localize=true}}
+ {{formGroup systemFields.resource.fields.max value=source.system.resource.max localize=true}}
+
+
+ {{formGroup systemFields.resource.fields.icon value=source.system.resource.icon localize=true placeholder="fa-solid fa-hashtag"}}
+
\ No newline at end of file
diff --git a/templates/sheets/items/ancestry/features.hbs b/templates/sheets/items/ancestry/features.hbs
index f758f80a..427e6258 100644
--- a/templates/sheets/items/ancestry/features.hbs
+++ b/templates/sheets/items/ancestry/features.hbs
@@ -14,6 +14,7 @@
data-action="editDoc"
data-item-uuid="{{document.system.primaryFeature.uuid}}"
data-type="primary"
+ id="{{document.system.primaryFeature._id}}"
>
{{document.system.primaryFeature.name}}
@@ -36,6 +37,7 @@
data-action="editDoc"
data-item-uuid="{{document.system.secondaryFeature.uuid}}"
data-type="secondary"
+ id="{{document.system.secondaryFeature._id}}"
>
{{document.system.secondaryFeature.name}}
diff --git a/templates/sheets/items/class/settings.hbs b/templates/sheets/items/class/settings.hbs
index 8e8254ee..b224ec1f 100644
--- a/templates/sheets/items/class/settings.hbs
+++ b/templates/sheets/items/class/settings.hbs
@@ -32,7 +32,7 @@
+
{{localize "DAGGERHEART.ITEMS.Class.guide.suggestedEquipment"}}
{{localize "DAGGERHEART.ITEMS.Class.guide.suggestedPrimaryWeaponTitle"}}
@@ -86,7 +86,7 @@
-
+
{{localize "DAGGERHEART.GENERAL.inventory"}}
{{localize "DAGGERHEART.GENERAL.take"}}
diff --git a/templates/sheets/items/domainCard/settings.hbs b/templates/sheets/items/domainCard/settings.hbs
index ae20624d..f3d05a2a 100644
--- a/templates/sheets/items/domainCard/settings.hbs
+++ b/templates/sheets/items/domainCard/settings.hbs
@@ -16,5 +16,5 @@
{{formField systemFields.recallCost value=source.system.recallCost data-dtype="Number"}}
- {{> "systems/daggerheart/templates/sheets/global/partials/resource-section.hbs" }}
+ {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
\ No newline at end of file
diff --git a/templates/sheets/items/feature/settings.hbs b/templates/sheets/items/feature/settings.hbs
index 24e6f8ef..c2ecb3fe 100644
--- a/templates/sheets/items/feature/settings.hbs
+++ b/templates/sheets/items/feature/settings.hbs
@@ -3,5 +3,5 @@
data-tab='{{tabs.settings.id}}'
data-group='{{tabs.settings.group}}'
>
- {{> "systems/daggerheart/templates/sheets/global/partials/resource-section.hbs" }}
+ {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
\ No newline at end of file
diff --git a/templates/ui/chat/effectSummary.hbs b/templates/ui/chat/effectSummary.hbs
index a856b4d2..1c237e25 100644
--- a/templates/ui/chat/effectSummary.hbs
+++ b/templates/ui/chat/effectSummary.hbs
@@ -23,9 +23,14 @@
{{#each targets}}
-
-
-
{{this.name}}
+
+
+
+
{{this.token.name}}
+
+ {{#if this.conditionImmunities}}
+
{{this.conditionImmunities}}
+ {{/if}}
{{/each}}
+