cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-14 12:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix chatmessage to render the template in constructor. Update namespaces.

Browse source
This commit is contained in:
IrkTheImp 2025-05-29 20:42:25 -05:00
parent 4de3e94fd7
commit cc6c9a11bc
10 changed files with 117 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

23
module/applications/chatMessage.mjs
View file

@ -1,19 +1,28 @@
import DhpDualityRoll from '../data/dualityRoll.mjs'; import DhpDualityRoll from '../data/dualityRoll.mjs';
import { DualityRollColor } from '../data/settings/Appearance.mjs'; import { DualityRollColor } from '../data/settings/Appearance.mjs';
export default class DhpChatMesssage extends ChatMessage { export default class DhpChatMessage extends ChatMessage {
async renderHTML() { constructor(data, options) {
super(data, options);
if ( if (
this.type === 'dualityRoll' || data.type === 'dualityRoll' ||
this.type === 'adversaryRoll' || data.type === 'adversaryRoll' ||
this.type === 'damageRoll' || data.type === 'damageRoll' ||
this.type === 'abilityUse' data.type === 'abilityUse'
) { ) {
this.content = await foundry.applications.handlebars.renderTemplate(this.content, this.system); this.#templateInjection(data);
}
} }
async #templateInjection(data) {
return await foundry.applications.handlebars.renderTemplate(data.content, data.system);
}
async renderHTML() {
/* We can change to fully implementing the renderHTML function if needed, instead of augmenting it. */ /* We can change to fully implementing the renderHTML function if needed, instead of augmenting it. */
const html = await super.renderHTML(); const html = await super.renderHTML();
if ( if (
this.type === 'dualityRoll' && this.type === 'dualityRoll' &&
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme === game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme ===

7
module/applications/deathMove.mjs
View file

@ -47,12 +47,15 @@ export default class DhpDeathMove extends HandlebarsApplicationMixin(Application
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/deathMove.hbs', { content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/deathMove.hbs',
{
player: this.actor.name, player: this.actor.name,
title: game.i18n.localize(this.selectedMove.name), title: game.i18n.localize(this.selectedMove.name),
img: this.selectedMove.img, img: this.selectedMove.img,
description: game.i18n.localize(this.selectedMove.description) description: game.i18n.localize(this.selectedMove.description)
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());

7
module/applications/downtime.mjs
View file

@ -70,13 +70,16 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/downtime.hbs', { content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/downtime.hbs',
{
player: this.actor.name, player: this.actor.name,
title: game.i18n.localize(this.selectedActivity.name), title: game.i18n.localize(this.selectedActivity.name),
img: this.selectedActivity.img, img: this.selectedActivity.img,
description: game.i18n.localize(this.selectedActivity.description), description: game.i18n.localize(this.selectedActivity.description),
refreshedFeatures: refreshedFeatures refreshedFeatures: refreshedFeatures
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());

11
module/applications/sheets/environment.mjs
View file

@ -123,10 +123,15 @@ export default class DhpEnvironment extends DaggerheartSheet(DocumentSheetV2) {
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/ability-use.hbs', { content: await foundry.applications.handlebars.renderTemplate(
title: game.i18n.format('DAGGERHEART.Chat.EnvironmentTitle', { actionType: button.dataset.actionType }), 'systems/daggerheart/templates/chat/ability-use.hbs',
{
title: game.i18n.format('DAGGERHEART.Chat.EnvironmentTitle', {
actionType: button.dataset.actionType
}),
card: { name: item.name, img: item.img, description: item.system.description } card: { name: item.name, img: item.img, description: item.system.description }
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());

21
module/applications/sheets/pc.mjs
View file

@ -790,13 +790,16 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/ability-use.hbs', { content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs',
{
title: game.i18n.localize('DAGGERHEART.Chat.FeatureTitle'), title: game.i18n.localize('DAGGERHEART.Chat.FeatureTitle'),
card: { card: {
name: `${feature.name} - Roll Of ${feature.system.featureType.data.numbers[index].value}`, name: `${feature.name} - Roll Of ${feature.system.featureType.data.numbers[index].value}`,
img: feature.img img: feature.img
} }
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());
@ -905,10 +908,13 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/ability-use.hbs', { content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs',
{
title: game.i18n.localize('DAGGERHEART.Chat.FoundationCard.SubclassFeatureTitle'), title: game.i18n.localize('DAGGERHEART.Chat.FoundationCard.SubclassFeatureTitle'),
card: { name: title, img: item.img, description: ability.description } card: { name: title, img: item.img, description: ability.description }
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());
@ -921,10 +927,13 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/ability-use.hbs', { content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs',
{
title: game.i18n.localize('DAGGERHEART.Chat.FoundationCard.SubclassFeatureTitle'), title: game.i18n.localize('DAGGERHEART.Chat.FoundationCard.SubclassFeatureTitle'),
card: { name: item.name, img: item.img, description: item.system.description } card: { name: item.name, img: item.img, description: item.system.description }
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());

2
module/data/pc.mjs
View file

@ -337,7 +337,7 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
get refreshableFeatures() { get refreshableFeatures() {
return this.parent.items.reduce( return this.parent.items.reduce(
(acc, x) => { (acc, x) => {
if (x.type === 'feature' && x.system.refreshData?.type) { if (x.type === 'feature' && x.system.refreshData?.type === 'feature' && x.system.refreshData?.type) {
acc[x.system.refreshData.type].push(x); acc[x.system.refreshData.type].push(x);
} }

7
module/dialogs/selectDialog.mjs
View file

@ -5,9 +5,12 @@ export default class SelectDialog extends Dialog {
this.data = { this.data = {
title: data.title, title: data.title,
buttons: data.buttons, buttons: data.buttons,
content: renderTemplate('systems/daggerheart/templates/dialog/item-select.hbs', { content: foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/dialog/item-select.hbs',
{
items: data.choices items: data.choices
}) }
)
}; };
this.actor = data.actor; this.actor = data.actor;

14
module/documents/actor.mjs
View file

@ -355,11 +355,14 @@ export default class DhpActor extends Actor {
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/damage-roll.hbs', { content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/damage-roll.hbs',
{
roll: roll.formula, roll: roll.formula,
total: roll.result, total: roll.result,
type: action.damage.type type: action.damage.type
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());
@ -374,11 +377,14 @@ export default class DhpActor extends Actor {
const cls = getDocumentClass('ChatMessage'); const cls = getDocumentClass('ChatMessage');
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await renderTemplate('systems/daggerheart/templates/chat/healing-roll.hbs', { content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/healing-roll.hbs',
{
roll: roll.formula, roll: roll.formula,
total: roll.result, total: roll.result,
type: action.healing.type type: action.healing.type
}) }
)
}); });
cls.create(msg.toObject()); cls.create(msg.toObject());

7
module/documents/item.mjs
View file

@ -38,7 +38,9 @@ export default class DhpItem extends Item {
}, {}); }, {});
// Render the document creation form // Render the document creation form
const html = await renderTemplate('systems/daggerheart/templates/sidebar/documentCreate.hbs', { const html = await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/sidebar/documentCreate.hbs',
{
folders, folders,
name: data.name || game.i18n.format('DOCUMENT.New', { type: label }), name: data.name || game.i18n.format('DOCUMENT.New', { type: label }),
folder: data.folder, folder: data.folder,
@ -56,7 +58,8 @@ export default class DhpItem extends Item {
] ]
}, },
hasTypes: types.length > 1 hasTypes: types.length > 1
}); }
);
// Render the confirmation dialog window // Render the confirmation dialog window
return Dialog.prompt({ return Dialog.prompt({

4
styles/daggerheart.css
View file

@ -2828,14 +2828,14 @@ div.daggerheart.views.multiclass {
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-display: swap; font-display: swap;
src: url(https://fonts.gstatic.com/s/montserrat/v29/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Ew-.ttf) format('truetype'); src: url(https://fonts.gstatic.com/s/montserrat/v30/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Ew-.ttf) format('truetype');
} }
@font-face { @font-face {
font-family: 'Montserrat'; font-family: 'Montserrat';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
font-display: swap; font-display: swap;
src: url(https://fonts.gstatic.com/s/montserrat/v29/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCu170w-.ttf) format('truetype'); src: url(https://fonts.gstatic.com/s/montserrat/v30/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCu170w-.ttf) format('truetype');
} }
.application.sheet.daggerheart.dh-style h1 { .application.sheet.daggerheart.dh-style h1 {
font-family: 'Cinzel Decorative', serif; font-family: 'Cinzel Decorative', serif;