cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-16 13:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/Foundryborne/daggerheart

Browse source
This commit is contained in:
Dapoolp 2025-08-16 01:23:47 +02:00
commit 8dd01e434a
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
module/data/fields/actionField.mjs
View file

@ -82,7 +82,6 @@ export class ActionsField extends MappingField {
*/ */
export class ActionField extends foundry.data.fields.ObjectField { export class ActionField extends foundry.data.fields.ObjectField {
getModel(value) { getModel(value) {
if (value && !value.type) value.type = 'attack';
return game.system.api.models.actions.actionsTypes[value.type] ?? null; return game.system.api.models.actions.actionsTypes[value.type] ?? null;
} }

26
module/documents/actor.mjs
View file

@ -25,6 +25,14 @@ export default class DhpActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
/** @inheritDoc */
static migrateData(source) {
if(source.system?.attack && !source.system.attack.type) source.system.attack.type = "attack";
return super.migrateData(source);
}
/* -------------------------------------------- */
/**@inheritdoc */ /**@inheritdoc */
static getDefaultArtwork(actorData) { static getDefaultArtwork(actorData) {
const { type } = actorData; const { type } = actorData;
@ -563,10 +571,20 @@ export default class DhpActor extends Actor {
if (armorSlotResult) { if (armorSlotResult) {
const { modifiedDamage, armorSpent, stressSpent } = armorSlotResult; const { modifiedDamage, armorSpent, stressSpent } = armorSlotResult;
updates.find(u => u.key === 'hitPoints').value = modifiedDamage; updates.find(u => u.key === 'hitPoints').value = modifiedDamage;
updates.push( if(armorSpent) {
...(armorSpent ? [{ value: armorSpent, key: 'armor' }] : []), const armorUpdate = updates.find(u => u.key === 'armor');
...(stressSpent ? [{ value: stressSpent, key: 'stress' }] : []) if(armorUpdate)
); armorUpdate.value += armorSpent;
else
updates.push({ value: armorSpent, key: 'armor' });
}
if(stressSpent) {
const stressUpdate = updates.find(u => u.key === 'stress');
if(stressUpdate)
stressUpdate.value += stressSpent;
else
updates.push({ value: stressSpent, key: 'stress' });
}
} }
} }
} }