cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-23 10:59:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Moved getWorldActor function to utils and updated logic

Browse source
This commit is contained in:
WBHarry 2026-06-30 11:50:39 +02:00
parent cf4c546ca2
commit cc2cf1205c
2 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
module/data/fields/action/summonField.mjs
View file

@ -1,4 +1,4 @@
import { itemAbleRollParse, triggerChatRollFx } from '../../../helpers/utils.mjs'; import { getWorldActor, itemAbleRollParse, triggerChatRollFx } from '../../../helpers/utils.mjs';
import FormulaField from '../formulaField.mjs'; import FormulaField from '../formulaField.mjs';
const fields = foundry.data.fields; const fields = foundry.data.fields;
@ -42,9 +42,9 @@ export default class DHSummonField extends fields.ArrayField {
const count = roll.total; const count = roll.total;
if (!roll.isDeterministic) rolls.push(roll); if (!roll.isDeterministic) rolls.push(roll);
const actor = await DHSummonField.getWorldActor(await foundry.utils.fromUuid(summon.actorUUID)); const actor = await getWorldActor(await foundry.utils.fromUuid(summon.actorUUID));
/* Extending summon data in memory so it's available in actionField.toChat. Think it's harmless, but ugly. Could maybe find a better way. */ /* Extending summon data in memory so it's available in actionField.toChat. Think it's harmless, but ugly. Could maybe find a better way. */
summon.actor = actor.toObject(); summon.actor = actor;
const countNumber = Number.parseInt(count); const countNumber = Number.parseInt(count);
for (let i = 0; i < countNumber; i++) { for (let i = 0; i < countNumber; i++) {
@ -62,26 +62,6 @@ export default class DHSummonField extends fields.ArrayField {
DHSummonField.handleSummon(summonData, this.actor); DHSummonField.handleSummon(summonData, this.actor);
} }
/* Check for any available instances of the actor present in the world if we're missing artwork in the compendium. If none exists, create one. */
static async getWorldActor(baseActor) {
const dataType = game.system.api.data.actors[`Dh${baseActor.type.capitalize()}`];
if (baseActor.inCompendium) {
const worldActorCopy = game.actors.find(x => x.name === baseActor.name);
if (
worldActorCopy && (
baseActor.img === worldActorCopy.img ||
(dataType && baseActor.img === dataType.DEFAULT_ICON)
)
) {
return worldActorCopy;
}
return await game.system.api.documents.DhpActor.create(baseActor.toObject());
}
return baseActor;
}
static async handleSummon(summonData, actionActor) { static async handleSummon(summonData, actionActor) {
await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: actionActor.token?.elevation }); await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: actionActor.token?.elevation });

21
module/helpers/utils.mjs
View file

@ -890,3 +890,24 @@ export function shouldUseHopeFearAutomation(options = { gmAsPlayer: true }) {
const { hopeFear } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation); const { hopeFear } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
return (!game.user.isGM || options.gmAsPlayer) ? hopeFear.players : hopeFear.gm; return (!game.user.isGM || options.gmAsPlayer) ? hopeFear.players : hopeFear.gm;
} }
export async function getWorldActor(baseActor) {
if (baseActor.inCompendium) {
const worldActorCopy =
game.actors.find(x => x._stats.compendiumSource === baseActor.uuid && x.name === baseActor.name);
if (worldActorCopy)
return worldActorCopy;
const baseActorData = baseActor.toObject();
return await game.system.api.documents.DhpActor.create({
...baseActorData,
_stats: {
...baseActorData._stats,
compendiumSource: baseActor.uuid
}
});
}
return baseActor.toObject();
}