Merge branch 'main' into enhancement/merge-duality-chat-tpl

This commit is contained in:
Dapoolp 2025-06-14 11:21:52 +02:00
commit 91f8a2b2eb
6 changed files with 11 additions and 5 deletions

View file

@ -1,4 +1,5 @@
import BaseDataItem from './base.mjs'; import BaseDataItem from './base.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHArmor extends BaseDataItem { export default class DHArmor extends BaseDataItem {
/** @inheritDoc */ /** @inheritDoc */
@ -27,6 +28,7 @@ export default class DHArmor extends BaseDataItem {
major: new fields.NumberField({ integer: true, initial: 0 }), major: new fields.NumberField({ integer: true, initial: 0 }),
severe: new fields.NumberField({ integer: true, initial: 0 }) severe: new fields.NumberField({ integer: true, initial: 0 })
}), }),
actions: new fields.ArrayField(new ActionField())
}; };
} }

View file

@ -1,4 +1,5 @@
import BaseDataItem from "./base.mjs"; import BaseDataItem from "./base.mjs";
import ActionField from '../fields/actionField.mjs';
export default class DHConsumable extends BaseDataItem { export default class DHConsumable extends BaseDataItem {
/** @inheritDoc */ /** @inheritDoc */
@ -16,7 +17,8 @@ export default class DHConsumable extends BaseDataItem {
const fields = foundry.data.fields; const fields = foundry.data.fields;
return { return {
...super.defineSchema(), ...super.defineSchema(),
consumeOnUse: new fields.BooleanField({ initial: false }) consumeOnUse: new fields.BooleanField({ initial: false }),
actions: new fields.ArrayField(new ActionField())
}; };
} }
} }

View file

@ -1,5 +1,5 @@
import DHAction from '../action/action.mjs';
import BaseDataItem from './base.mjs'; import BaseDataItem from './base.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHDomainCard extends BaseDataItem { export default class DHDomainCard extends BaseDataItem {
/** @inheritDoc */ /** @inheritDoc */
@ -22,7 +22,7 @@ export default class DHDomainCard extends BaseDataItem {
type: new fields.StringField({ choices: SYSTEM.DOMAIN.cardTypes, required: true, blank: true }), type: new fields.StringField({ choices: SYSTEM.DOMAIN.cardTypes, required: true, blank: true }),
foundation: new fields.BooleanField({ initial: false }), foundation: new fields.BooleanField({ initial: false }),
inVault: new fields.BooleanField({ initial: false }), inVault: new fields.BooleanField({ initial: false }),
actions: new fields.ArrayField(new fields.EmbeddedDataField(DHAction)) actions: new fields.ArrayField(new ActionField())
}; };
} }

View file

@ -1,6 +1,7 @@
import { getTier } from '../../helpers/utils.mjs'; import { getTier } from '../../helpers/utils.mjs';
import DHAction from '../action/action.mjs'; import DHAction from '../action/action.mjs';
import BaseDataItem from './base.mjs'; import BaseDataItem from './base.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHFeature extends BaseDataItem { export default class DHFeature extends BaseDataItem {
/** @inheritDoc */ /** @inheritDoc */
@ -93,7 +94,7 @@ export default class DHFeature extends BaseDataItem {
}) })
}) })
), ),
actions: new fields.ArrayField(new fields.EmbeddedDataField(DHAction)) actions: new fields.ArrayField(new ActionField())
}; };
} }

View file

@ -1,4 +1,5 @@
import BaseDataItem from './base.mjs'; import BaseDataItem from './base.mjs';
import ActionField from '../fields/actionField.mjs';
export default class DHMiscellaneous extends BaseDataItem { export default class DHMiscellaneous extends BaseDataItem {
/** @inheritDoc */ /** @inheritDoc */
@ -16,6 +17,7 @@ export default class DHMiscellaneous extends BaseDataItem {
const fields = foundry.data.fields; const fields = foundry.data.fields;
return { return {
...super.defineSchema(), ...super.defineSchema(),
actions: new fields.ArrayField(new ActionField())
}; };
} }
} }

View file

@ -46,7 +46,6 @@ export default class DHWeapon extends BaseDataItem {
max: 1, max: 1,
validTypes: ['weapon'] validTypes: ['weapon']
}), }),
// actions: new fields.ArrayField(new fields.EmbeddedDataField(DHAttackAction))
actions: new fields.ArrayField(new ActionField()) actions: new fields.ArrayField(new ActionField())
}; };
} }