cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-22 18:39:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merged with main

Browse source
This commit is contained in:
WBHarry 2026-06-21 00:17:50 +02:00
commit 25a64b1332
17 changed files with 104 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

8
module/applications/dialogs/groupRollDialog.mjs
View file

@ -486,13 +486,13 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
const resourceMap = new ResourceUpdateMap(actor);
if (totalRoll.isCritical) {
resourceMap.addResources([
{ key: 'stress', value: -1, total: 1 },
{ key: 'hope', value: 1, total: 1 }
{ key: 'stress', value: -1 },
{ key: 'hope', value: 1 }
]);
} else if (totalRoll.withHope) {
resourceMap.addResources([{ key: 'hope', value: 1, total: 1 }]);
resourceMap.addResources([{ key: 'hope', value: 1 }]);
} else {
resourceMap.addResources([{ key: 'fear', value: 1, total: 1 }]);
resourceMap.addResources([{ key: 'fear', value: 1 }]);
}
resourceMap.updateResources();

11
module/applications/dialogs/tagTeamDialog.mjs
View file

@ -767,7 +767,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
/* Handle resource updates from the finished TagTeamRoll */
const tagTeamData = this.party.system.tagTeam;
const fearUpdate = { key: 'fear', value: null, total: null, enabled: true };
const fearUpdate = { key: 'fear', value: null, enabled: true };
if (shouldUseHopeFearAutomation({ gmAsPlayer: true })) {
for (let memberId in tagTeamData.members) {
@ -779,14 +779,13 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
? 1 - tagTeamData.initiator.cost
: -tagTeamData.initiator.cost
: 1;
resourceUpdates.push({ key: 'hope', value: value, total: -value, enabled: true });
resourceUpdates.push({ key: 'hope', value: value, enabled: true });
} else if (rollGivesHope) {
resourceUpdates.push({ key: 'hope', value: 1, total: -1, enabled: true });
resourceUpdates.push({ key: 'hope', value: 1, enabled: true });
}
if (finalRoll.isCritical) resourceUpdates.push({ key: 'stress', value: -1, total: 1, enabled: true });
if (finalRoll.isCritical) resourceUpdates.push({ key: 'stress', value: -1, enabled: true });
if (finalRoll.withFear) {
fearUpdate.value = fearUpdate.value === null ? 1 : fearUpdate.value + 1;
fearUpdate.total = fearUpdate.total === null ? -1 : fearUpdate.total - 1;
}
game.actors.get(memberId).modifyResource(resourceUpdates);
@ -795,7 +794,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
/* Even with Hope/Fear automation off, the hope cost of performing the TagTeamRoll can still optionally be subtracted */
else if (tagTeamData.initiator.cost) {
const initiatingActor = game.actors.get(tagTeamData.initiator.memberId);
initiatingActor.modifyResource([{ key: 'hope', value: -tagTeamData.initiator.cost, total: tagTeamData.initiator.cost, enabled: true }]);
initiatingActor.modifyResource([{ key: 'hope', value: -tagTeamData.initiator.cost, enabled: true }]);
}
if (fearUpdate.value) {

30
module/applications/sheets-configs/adversary-settings.mjs
View file

@ -54,7 +54,7 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
async _prepareContext(options) {
const context = await super._prepareContext(options);
const featureForms = ['passive', 'action', 'reaction'];
const featureForms = Object.keys(CONFIG.DH.ITEM.featureForm);
context.features = context.document.system.features.sort((a, b) =>
a.system.featureForm !== b.system.featureForm
? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
@ -97,32 +97,4 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
await this.actor.update({ [`system.experiences.${target.dataset.experience}`]: _del });
}
async _onDragStart(event) {
const featureItem = event.currentTarget.closest('.feature-item');
if (featureItem) {
const feature = this.actor.items.get(featureItem.id);
const featureData = { type: 'Item', uuid: feature.uuid, fromInternal: true };
event.dataTransfer.setData('text/plain', JSON.stringify(featureData));
event.dataTransfer.setDragImage(featureItem.querySelector('img'), 60, 0);
}
}
async _onDrop(event) {
event.stopPropagation();
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
const item = await fromUuid(data.uuid);
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]);
}
}
}

35
module/applications/sheets-configs/environment-settings.mjs
View file

@ -15,7 +15,7 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
dragDrop: [
{ dragSelector: null, dropSelector: '.category-container' },
{ dragSelector: null, dropSelector: '.tab.features' },
{ dragSelector: '.feature-item', dropSelector: null }
{ dragSelector: '.feature-item, .inventory-item[data-type="adversary"]', dropSelector: null }
]
};
@ -110,33 +110,30 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
}
async _onDragStart(event) {
const featureItem = event.currentTarget.closest('.feature-item');
if (featureItem) {
const feature = this.actor.items.get(featureItem.id);
const featureData = { type: 'Item', uuid: feature.uuid, fromInternal: true };
event.dataTransfer.setData('text/plain', JSON.stringify(featureData));
event.dataTransfer.setDragImage(featureItem.querySelector('img'), 60, 0);
const element = event.currentTarget.closest('.inventory-item[data-type=adversary]');
if (element) {
const adversaryData = { type: 'Actor', uuid: element.dataset.itemUuid };
event.dataTransfer.setData('text/plain', JSON.stringify(adversaryData));
event.dataTransfer.setDragImage(element, 60, 0);
} else {
return super._onDragStart(event);
}
}
async _onDrop(event) {
event.stopPropagation();
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
const item = await fromUuid(data.uuid);
if (data.fromInternal && item?.parent?.uuid === this.actor.uuid) return;
if (item.type === 'adversary' && event.target.closest('.category-container')) {
const doc = await fromUuid(data.uuid);
if (doc?.type === 'adversary' && event.target.closest('.category-container')) {
const target = event.target.closest('.category-container');
const path = `system.potentialAdversaries.${target.dataset.potentialAdversary}.adversaries`;
const current = foundry.utils.getProperty(this.actor, path).map(x => x.uuid);
await this.actor.update({
[path]: [...current, item.uuid]
});
this.render();
} else if (item.type === 'feature' && event.target.closest('.tab.features')) {
await this.actor.createEmbeddedDocuments('Item', [item]);
this.render();
if (!current.includes(doc.uuid)) {
await this.actor.update({ [path]: [...current, doc.uuid] });
}
return;
}
return super._onDrop(event);
}
}

30
module/applications/sheets-configs/npc-settings.mjs
View file

@ -52,34 +52,4 @@ export default class DHNPCSettings extends DHBaseActorSettings {
return context;
}
/* -------------------------------------------- */
async _onDragStart(event) {
const featureItem = event.currentTarget.closest('.feature-item');
if (featureItem) {
const feature = this.actor.items.get(featureItem.id);
const featureData = { type: 'Item', uuid: feature.uuid, fromInternal: true };
event.dataTransfer.setData('text/plain', JSON.stringify(featureData));
event.dataTransfer.setDragImage(featureItem.querySelector('img'), 60, 0);
}
}
async _onDrop(event) {
event.stopPropagation();
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
const item = await fromUuid(data.uuid);
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]);
}
}
}

2
module/applications/sheets/actors/adversary.mjs
View file

@ -103,7 +103,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
context.resources.stress.emptyPips =
context.resources.stress.max < maxResource ? maxResource - context.resources.stress.max : 0;
const featureForms = ['passive', 'action', 'reaction'];
const featureForms = Object.keys(CONFIG.DH.ITEM.featureForm);
context.features = this.document.system.features.sort((a, b) =>
a.system.featureForm !== b.system.featureForm
? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)

2
module/applications/sheets/actors/character.mjs
View file

@ -809,7 +809,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
/* This could be avoided by baking config.costs into config.resourceUpdates. Didn't feel like messing with it at the time */
const costResources =
result.costs?.filter(x => x.enabled).map(cost => ({ ...cost, value: -cost.value, total: -cost.total })) ||
result.costs?.filter(x => x.enabled).map(cost => ({ ...cost, value: -cost.value })) ||
{};
result.resourceUpdates.addResources(costResources);
await result.resourceUpdates.updateResources();

1
module/applications/sheets/actors/environment.mjs
View file

@ -78,7 +78,6 @@ export default class DhpEnvironment extends DHBaseActorSheet {
switch (partId) {
case 'header':
await this._prepareHeaderContext(context, options);
break;
case 'features':
await this._prepareFeaturesContext(context, options);

37
module/applications/sheets/api/actor-setting.mjs
View file

@ -1,13 +1,15 @@
import DHApplicationMixin from './application-mixin.mjs';
const { DocumentSheetV2 } = foundry.applications.api;
const { ActorSheetV2 } = foundry.applications.sheets;
/**@typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction */
/**
* @typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction
*/
/**
* Base settings sheet for Daggerheart actors.
* @extends {DHApplicationMixin<DocumentSheetV2>}
* @extends {DHApplicationMixin<ActorSheetV2>}
*/
export default class DHBaseActorSettings extends DHApplicationMixin(DocumentSheetV2) {
export default class DHBaseActorSettings extends DHApplicationMixin(ActorSheetV2) {
/**@inheritdoc */
static DEFAULT_OPTIONS = {
classes: ['dialog'],
@ -34,7 +36,7 @@ export default class DHBaseActorSettings extends DHApplicationMixin(DocumentShee
return options;
}
/**@returns {foundry.documents.Actor} */
/** @returns {foundry.documents.Actor} */
get actor() {
return this.document;
}
@ -73,4 +75,29 @@ export default class DHBaseActorSettings extends DHApplicationMixin(DocumentShee
return context;
}
async _onDragStart(event) {
const featureItemEl = event.currentTarget.closest('.feature-item');
const feature = this.actor.items.get(featureItemEl?.dataset.itemId);
if (feature && event.target.closest('.tab.features')) {
const featureData = { ...feature.toDragData(), fromInternal: true };
event.dataTransfer.setData('text/plain', JSON.stringify(featureData));
event.dataTransfer.setDragImage(featureItemEl.querySelector('img'), 60, 0);
}
}
async _onDrop(event) {
event.stopPropagation();
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
const item = await fromUuid(data.uuid);
if (item?.type === 'feature') {
if (data.fromInternal && item.parent?.uuid === this.actor.uuid) {
return super._onDrop(event);
}
const itemData = item.toObject();
delete itemData._id;
await this.actor.createEmbeddedDocuments('Item', [itemData]);
}
}
}

27
module/applications/sheets/api/application-mixin.mjs
View file

@ -381,12 +381,35 @@ export default function DHApplicationMixin(Base) {
* @protected
*/
_onDrop(event) {
// Fallback to super, but note that config sheets don't have this option
// We still need this to avoid setting apps having issues
// Potentially handle subclasses that dont descend from actor/item sheet.
event.stopPropagation();
return super._onDrop?.(event);
}
/** @inheritdoc */
_onSortItem(event, item) {
// If we are dragging a feature past its allowed feature form, put it in the front or in the back
const doc = this.actor.items.get(item.id);
const dropTargetEl = event.target.closest('[data-item-id]');
const dropTarget = this.actor.items.get(dropTargetEl?.dataset.itemId);
if (doc?.type === 'feature' && dropTarget?.type === 'feature' && doc.system.featureForm !== dropTarget.system.featureForm) {
const siblings = this.actor.itemTypes.feature
.filter(f => f.system.featureForm === doc.system.featureForm)
.sort((a, b) => a.sort - b.sort);
if (siblings.length > 1) {
const featureForms = Object.keys(CONFIG.DH.ITEM.featureForm);
const thisFeatureIdx = featureForms.indexOf(doc.system.featureForm);
const targetFeatureIdx = featureForms.indexOf(dropTarget.system.featureForm);
const target = targetFeatureIdx < thisFeatureIdx ? siblings[0] : siblings.at(-1);
const sortUpdates = foundry.utils.performIntegerSort(doc, { target, siblings });
const updateData = sortUpdates.map(u => ({ ...u.update, _id: u.target._id }));
return this.actor.updateEmbeddedDocuments('Item', updateData);
}
}
return super._onSortItem?.(event, item);
}
/* -------------------------------------------- */
/* Context Menu */
/* -------------------------------------------- */

3
module/data/action/baseAction.mjs
View file

@ -459,8 +459,7 @@ export class ResourceUpdateMap extends Map {
} else if (!existing?.clear) {
this.set(resource.key, {
...existing,
value: existing.value + (resource.value ?? 0),
total: existing.total + (resource.total ?? 0)
value: existing.value + (resource.value ?? 0)
});
}
}

7
module/data/actor/character.mjs
View file

@ -315,7 +315,12 @@ export default class DhCharacter extends DhCreature {
label: 'DAGGERHEART.ACTORS.Character.defaultDisadvantageDice'
})
})
})
}),
/** Accumulated armor score from all sources */
armorScore: new fields.SchemaField({
value: new fields.NumberField(),
max: new fields.NumberField()
}, { persisted: false })
};
}

12
module/dice/dualityRoll.mjs
View file

@ -332,15 +332,15 @@ export default class DualityRoll extends D20Roll {
const fear =
(config.roll.result.duality === -1 ? 1 : 0) - (config.rerolledRoll.result.duality === -1 ? 1 : 0);
if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true });
if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true });
if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true });
if (hope !== 0) updates.push({ key: 'hope', value: hope, enabled: true });
if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, enabled: true });
if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true });
}
} else {
if (config.roll.isCritical || config.roll.result.duality === 1)
updates.push({ key: 'hope', value: 1, total: -1, enabled: true });
if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, total: -1, enabled: true });
updates.push({ key: 'hope', value: 1, enabled: true });
if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, enabled: true });
if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, enabled: true });
}
if (updates.length) {

6
module/dice/helpers.mjs
View file

@ -9,9 +9,9 @@ export function updateResourcesForDualityReroll(oldDuality, newDuality, actor) {
const stress = (newDuality === 0 ? 1 : 0) - (oldDuality === 0 ? 1 : 0);
const fear = (newDuality === -1 ? 1 : 0) - (oldDuality === -1 ? 1 : 0);
if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true });
if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true });
if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true });
if (hope !== 0) updates.push({ key: 'hope', value: hope, enabled: true });
if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, enabled: true });
if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true });
const resourceUpdates = new ResourceUpdateMap(actor);
resourceUpdates.addResources(updates);