This commit is contained in:
Dapoolp 2025-08-16 13:38:03 +02:00
parent 180c4d2a53
commit ed3c4a9da2
4 changed files with 27 additions and 3 deletions

View file

@ -3,7 +3,7 @@ import DHBaseAction from './baseAction.mjs';
export default class DHMacroAction extends DHBaseAction { export default class DHMacroAction extends DHBaseAction {
static extraSchemas = [...super.extraSchemas, 'macro']; static extraSchemas = [...super.extraSchemas, 'macro'];
async trigger(event, ...args) { /* async trigger(event, ...args) {
const fixUUID = !this.macro.includes('Macro.') ? `Macro.${this.macro}` : this.macro, const fixUUID = !this.macro.includes('Macro.') ? `Macro.${this.macro}` : this.macro,
macro = await fromUuid(fixUUID); macro = await fromUuid(fixUUID);
try { try {
@ -12,5 +12,5 @@ export default class DHMacroAction extends DHBaseAction {
} catch (error) { } catch (error) {
ui.notifications.error(error); ui.notifications.error(error);
} }
} } */
} }

View file

@ -1,6 +1,8 @@
const fields = foundry.data.fields; const fields = foundry.data.fields;
export default class EffectsField extends fields.ArrayField { export default class EffectsField extends fields.ArrayField {
static order = 100;
constructor(options = {}, context = {}) { constructor(options = {}, context = {}) {
const element = new fields.SchemaField({ const element = new fields.SchemaField({
_id: new fields.DocumentIdField(), _id: new fields.DocumentIdField(),
@ -8,4 +10,14 @@ export default class EffectsField extends fields.ArrayField {
}); });
super(element, options, context); super(element, options, context);
} }
static async execute(config) {
if(!this.hasRoll) {
const roll = new CONFIG.Dice.daggerheart.DHRoll('');
roll._evaluated = true;
await CONFIG.Dice.daggerheart.DHRoll.toMessage(roll, config);
} else {
return;
}
}
} }

View file

@ -1,7 +1,7 @@
const fields = foundry.data.fields; const fields = foundry.data.fields;
export default class MacroField extends fields.DocumentUUIDField { export default class MacroField extends fields.DocumentUUIDField {
static order = 100; static order = 200;
constructor(context = {}) { constructor(context = {}) {
super({ type: "Macro" }, context); super({ type: "Macro" }, context);

View file

@ -1,6 +1,8 @@
const fields = foundry.data.fields; const fields = foundry.data.fields;
export default class SaveField extends fields.SchemaField { export default class SaveField extends fields.SchemaField {
static order = 75;
constructor(options = {}, context = {}) { constructor(options = {}, context = {}) {
const saveFields = { const saveFields = {
trait: new fields.StringField({ trait: new fields.StringField({
@ -16,4 +18,14 @@ export default class SaveField extends fields.SchemaField {
}; };
super(saveFields, options, context); super(saveFields, options, context);
} }
static async execute(config) {
if(!this.hasRoll) {
const roll = new CONFIG.Dice.daggerheart.DHRoll('');
roll._evaluated = true;
await CONFIG.Dice.daggerheart.DHRoll.toMessage(roll, config);
} else {
return;
}
}
} }