diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 661d9cf8..9b43c877 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -292,6 +292,7 @@ export class RdDUtility { Handlebars.registerHelper('array-includes', (array, value) => array.includes(value)); Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1))); + Handlebars.registerHelper('isLastIndex', (index, list) => index+1 >= list.length); Handlebars.registerHelper('regle-optionnelle', (option) => ReglesOptionnelles.isUsing(option)); Handlebars.registerHelper('trier', list => list.sort((a, b) => a.name.localeCompare(b.name))); Handlebars.registerHelper('filtreTriCompetences', competences => RdDItemCompetence.triVisible(competences)); diff --git a/templates/actor/export-scriptarium/actor-encart-sheet.hbs b/templates/actor/export-scriptarium/actor-encart-sheet.hbs index 8aa849d7..8b9e713f 100644 --- a/templates/actor/export-scriptarium/actor-encart-sheet.hbs +++ b/templates/actor/export-scriptarium/actor-encart-sheet.hbs @@ -60,11 +60,11 @@
- {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs" competences= competences}} + {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs" competences=competences}}

- {{export.draconic.value}} + {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs" competences=draconic }}

diff --git a/templates/actor/export-scriptarium/competences.hbs b/templates/actor/export-scriptarium/competences.hbs index f08cd7f8..69273fc2 100644 --- a/templates/actor/export-scriptarium/competences.hbs +++ b/templates/actor/export-scriptarium/competences.hbs @@ -1,10 +1,9 @@ {{#each competences as |group|}} {{#if @index}}/{{/if}} - {{#each group.list as |comp|}} - {{#if @index}}, {{/if}} - - {{comp.name}} - + {{#with group}} + {{#each list as |comp|}} + {{comp.name}}{{~#unless (isLastIndex @index ../list)~}},{{/unless~}} {{/each}} - {{numberFormat group.niveau decimals=0 sign=true}} + {{numberFormat niveau decimals=0 sign=true}} + {{/with}} {{/each}}