Foundry/taf
1
0
Fork 0
Code Issues 13 Pull requests Releases 9 Wiki Activity Actions

Improve the chat message handling to make it so that the flavour can be properly updated if you include @active roll data

Browse source
This commit is contained in:
Oliver 2026-04-29 19:53:39 -06:00
parent 0fb10b7ae2
commit c090daa2aa
2 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
module/data/Item/attribute.mjs
View file

@ -136,12 +136,29 @@ export class AttributeItemData extends foundry.abstract.TypeDataModel {
// Provide the chat-specific context when required
if (macro.type === `chat`) {
Hooks.once(`taf.getRollData`, (data) => {
data.active = {
const extraContext = {
name: this.parent.name,
min: this.min,
value: this.value,
max: this.max,
};
Hooks.once(`taf.getRollData`, (data) => {
data.active = extraContext;
});
// Apply any roll data additions to the message flavour as well
// since that doesn't get formatted by the ChatLog
Hooks.once(`preCreateChatMessage`, (message) => {
if (message.flavor.includes(`@active`)) {
const flavor = message.flavor.replaceAll(
/@active\.(\w+)/g,
(fullMatch, key) => {
return extraContext[key] || fullMatch;
},
);
message.updateSource({ flavor, });
};
});
};

21
module/data/Item/generic.mjs
View file

@ -59,11 +59,28 @@ export class GenericItemData extends foundry.abstract.TypeDataModel {
// Provide the chat-specific context when required
if (macro.type === `chat`) {
Hooks.once(`taf.getRollData`, (data) => {
data.active = {
const extraContext = {
name: this.parent.name,
quantity: this.quantity,
equipped: this.equipped ? 1 : 0,
};
Hooks.once(`taf.getRollData`, (data) => {
data.active = extraContext;
});
// Apply any roll data additions to the message flavour as well
// since that doesn't get formatted by the ChatLog
Hooks.once(`preCreateChatMessage`, (message) => {
if (message.flavor.includes(`@active`)) {
const flavor = message.flavor.replaceAll(
/@active\.(\w+)/g,
(fullMatch, key) => {
return extraContext[key] || fullMatch;
},
);
message.updateSource({ flavor, });
};
});
};