From 0f7b9baf51debced77b59299ad08491548dd80e7 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandeme@gmail.com>
Date: Sat, 5 Oct 2024 14:39:56 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20liste=20de=20comp=C3=A9tenc?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/rdd-utility.js                                 |  1 +
 .../actor/export-scriptarium/actor-encart-sheet.hbs   |  4 ++--
 templates/actor/export-scriptarium/competences.hbs    | 11 +++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

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 @@
     </div>
   <hr>
     <div>
-      {{>"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}}
     </div>
   <hr>
     <div>
-      {{export.draconic.value}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs" competences=draconic }}
     </div>
     <hr>
     <div>
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}}
-      <span class="item" data-item-id="{{comp._id}}">
-        <a class="roll-competence">{{comp.name}}</a>
-      </span>
+  {{#with group}}
+    {{#each list as |comp|}}
+      <span class="item" data-item-id="{{comp._id}}"><a class="roll-competence">{{comp.name}}</a></span>{{~#unless (isLastIndex @index ../list)~}},{{/unless~}}
     {{/each}}
-  {{numberFormat group.niveau decimals=0 sign=true}}
+    {{numberFormat niveau decimals=0 sign=true}}
+  {{/with}}
 {{/each}}