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

Fixed so that features get their actions and effects

Browse source
This commit is contained in:
WBHarry 2025-07-29 22:20:12 +02:00
parent 2608c4a5ae
commit 5df1d908a9
2 changed files with 48 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -397,14 +397,16 @@ export default class DhCharacter extends BaseDataActor {
} else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.class.id) {
classFeatures.push(item);
} else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.subclass.id) {
const subclassState = this.class.subclass.system.featureState;
const subType = item.system.subType;
if (
subType === CONFIG.DH.ITEM.featureSubTypes.foundation ||
(subType === CONFIG.DH.ITEM.featureSubTypes.specialization && subclassState >= 2) ||
(subType === CONFIG.DH.ITEM.featureSubTypes.mastery && subclassState >= 3)
) {
subclassFeatures.push(item);
if (this.class.subclass) {
const subclassState = this.class.subclass.system.featureState;
const subType = item.system.subType;
if (
subType === CONFIG.DH.ITEM.featureSubTypes.foundation ||
(subType === CONFIG.DH.ITEM.featureSubTypes.specialization && subclassState >= 2) ||
(subType === CONFIG.DH.ITEM.featureSubTypes.mastery && subclassState >= 3)
) {
subclassFeatures.push(item);
}
}
} else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.companion.id) {
companionFeatures.push(item);

55
module/data/item/base.mjs
View file

@ -122,26 +122,47 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
this.updateSource({ actions: [action] });
}
}
_onCreate(data, _, userId) {
if (userId !== game.user.id) return;
if (this.actor && this.actor.type === 'character' && this.features) {
/* Actions won't get created during createEmbeddedDocuments because they need the parent to be the newly created feature.
If this can be fixed somehow, we can just create all at the same time instead of one by one.
*/
for (let listFeature of this.features) {
const feature = listFeature.item ?? listFeature;
const docs = await this.actor.createEmbeddedDocuments('Item', [
{
...feature,
effects: feature.effects.map(x => x.toObject()),
system: {
...feature.system,
originItemType: this.parent.type,
originId: data._id,
identifier: feature.identifier,
subType: feature.item ? feature.type : undefined
}
}
]);
if (!this.actor || this.actor.type !== 'character' || !this.features) return;
const actions = feature.system.actions.reduce((acc, oldAction) => {
const cls = game.system.api.models.actions.actionsTypes[oldAction.type];
const action = new cls(
{
...oldAction.toObject(),
...cls.getSourceConfig(docs[0])
},
{
parent: docs[0]
}
);
this.actor.createEmbeddedDocuments(
'Item',
this.features.map(feature => ({
...(feature.item ?? feature),
system: {
...(feature.item?.system ?? feature.system),
originItemType: this.parent.type,
originId: data._id,
identifier: feature.identifier,
subType: feature.item ? feature.type : undefined
}
}))
);
acc[action.id] = action.toObject();
return acc;
}, {});
await docs[0].updateSource({ 'system.actions': actions });
}
}
}
async _preDelete() {