diff --git a/system/scripts/actor.js b/system/scripts/actor.js index b1031e6..08708c0 100644 --- a/system/scripts/actor.js +++ b/system/scripts/actor.js @@ -217,7 +217,8 @@ export class ActorL5r5e extends Actor { * @return {Promise} */ async renderTextTemplate() { - const tpl = await renderTemplate(`${CONFIG.l5r5e.paths.templates}actors/actor-text.html`, this); + const data = (await this.sheet?.getData()) || this; + const tpl = await renderTemplate(`${CONFIG.l5r5e.paths.templates}actors/actor-text.html`, data); if (!tpl) { return null; } diff --git a/system/scripts/item.js b/system/scripts/item.js index f9ef300..873dbfd 100644 --- a/system/scripts/item.js +++ b/system/scripts/item.js @@ -134,9 +134,12 @@ export class ItemL5r5e extends Item { * @return {Promise} */ async renderTextTemplate() { + const data = (await this.sheet?.getData()) || this; + if (data instanceof ItemL5r5e) { + await game.l5r5e.HelpersL5r5e.refreshItemProperties(this); + } const type = this.type.replace("_", "-"); // ex: item_pattern - await game.l5r5e.HelpersL5r5e.refreshItemProperties(this); - const tpl = await renderTemplate(`${CONFIG.l5r5e.paths.templates}items/${type}/${type}-text.html`, this); + const tpl = await renderTemplate(`${CONFIG.l5r5e.paths.templates}items/${type}/${type}-text.html`, data); if (!tpl) { return null; } diff --git a/system/scripts/journal.js b/system/scripts/journal.js index b148501..dc91749 100644 --- a/system/scripts/journal.js +++ b/system/scripts/journal.js @@ -7,7 +7,8 @@ export class JournalL5r5e extends JournalEntry { * @return {Promise} */ async renderTextTemplate() { - const tpl = await renderTemplate(`${CONFIG.l5r5e.paths.templates}journal/journal-text.html`, this); + const data = (await this.sheet?.getData()) || this; + const tpl = await renderTemplate(`${CONFIG.l5r5e.paths.templates}journal/journal-text.html`, data); if (!tpl) { return null; } diff --git a/system/templates/items/item-pattern/item-pattern-text.html b/system/templates/items/item-pattern/item-pattern-text.html index 4c814ca..07472f9 100644 --- a/system/templates/items/item-pattern/item-pattern-text.html +++ b/system/templates/items/item-pattern/item-pattern-text.html @@ -11,10 +11,7 @@
  • {{localize 'l5r5e.bought_at_rank'}} : {{data.data.bought_at_rank}}
  • {{!--Linked property--}} - {{!-- - {{localize 'l5r5e.linked_property'}} : {{{data.data.linkedProperty.name}}} - linked_property_id - --}} + {{localize 'l5r5e.linked_property'}} : {{{data.linkedProperty.name}}} {{!--item-infos--}}

    {{localize 'l5r5e.description'}} : {{{data.data.description}}}

    {{localize 'l5r5e.book_reference'}} : {{data.data.book_reference}}

    diff --git a/system/templates/items/title/title-text.html b/system/templates/items/title/title-text.html index 31bde9e..e96d0ac 100644 --- a/system/templates/items/title/title-text.html +++ b/system/templates/items/title/title-text.html @@ -20,7 +20,15 @@ {{localize 'l5r5e.advancements.total_xp_spent'}} : {{data.data.xp_used_total}} - {{!-- {{#each data.embedItemsList as |advancement|}} {{json advancement}} {{/each}} --}} + {{!--advancements--}} + {{#if data.embedItemsList}} +

    + {{localize 'l5r5e.advancements.title'}} +

      + {{#each data.embedItemsList as |advancement|}}
    • {{advancement.name}} ({{advancement.data.xp_used}})
    • {{/each}} +
    +

    + {{/if}} {{!--item-infos--}}

    {{localize 'l5r5e.description'}} : {{{data.data.description}}}

    {{localize 'l5r5e.book_reference'}} : {{data.data.book_reference}}