Jets de carac/compétences sur feuille encart

module/actor/base-actor-reve-sheet.js

@@ -25,8 +25,8 @@ export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
     if (!this.options.editable) return;
 
     this.html.find('.encaisser-direct').click(async event => this.actor.encaisser())
-    this.html.find('.carac-label a').click(async event => this.actor.rollCarac(Grammar.toLowerCaseNoAccent(event.currentTarget.attributes.name.value)));
-    this.html.find('a.competence-label').click(async event => this.actor.rollCompetence(RdDSheetUtility.getItemId(event)));
+    this.html.find('.roll-carac').click(async event => this.actor.rollCarac(Grammar.toLowerCaseNoAccent(event.currentTarget.attributes.name.value)));
+    this.html.find('.roll-competence').click(async event => this.actor.rollCompetence(RdDSheetUtility.getItemId(event)));
     this.html.find('.endurance-plus').click(async event => this.actor.santeIncDec("endurance", 1));
     this.html.find('.endurance-moins').click(async event => this.actor.santeIncDec("endurance", -1));
 

module/actor/base-actor-reve.js

@@ -296,6 +296,9 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   /* -------------------------------------------- */
   async rollCarac(caracName, jetResistance = undefined) {
+    if (Grammar.equalsInsensitive(caracName, 'taille')){
+      return
+    }
     RdDEmpoignade.checkEmpoignadeEnCours(this)
     let selectedCarac = this.getCaracByName(caracName)
     await this.openRollDialog({

module/actor/export-scriptarium/actor-export-sheet.js

@@ -2,7 +2,7 @@ import { RdDActorSheet } from "../../actor-sheet.js"
 import { SYSTEM_RDD } from "../../constants.js";
 import { Misc } from "../../misc.js";
 import { ExportScriptarium } from "./export-scriptarium.js";
-import { Mapping } from "./mapping.js";
+import { CATEGORIES_COMPETENCES, CATEGORIES_DRACONIC, Mapping } from "./mapping.js";
 
 export class RdDActorExportSheet extends RdDActorSheet {
   static async init() {
@@ -10,6 +10,7 @@ export class RdDActorExportSheet extends RdDActorSheet {
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme.hbs",
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac.hbs",
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac-derivee.hbs",
+      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs",
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/esquive.hbs",
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/protection.hbs",
       "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/sort.hbs",
@@ -31,12 +32,45 @@ export class RdDActorExportSheet extends RdDActorSheet {
 
   async getData() {
     const formData = await super.getData()
-    const values = Mapping.getAsObject(this.actor);
     // Add any structured, precomputed list of data
-    formData.export = values
+    formData.export = this.getMappingValues();
+    formData.competences = this.getCompetences(CATEGORIES_COMPETENCES)
+    formData.draconic = this.getCompetences(CATEGORIES_DRACONIC)
     return formData
   }
 
+  getMappingValues() {
+    const context = Mapping.prepareContext(this.actor)
+    return Object.fromEntries(Mapping.getMapping().map(it => [it.column, {
+      colName: it.colName ?? it.column,
+      column: it.column,
+      value: it.getter(this.actor, context)
+    }]))
+  }
+  
+  getCompetences(categories) {
+    const competences = Mapping.getCompetencesCategorie(this.actor, categories)
+    if (competences.length == 0) {
+      return ''
+    }
+    const byCategories = Mapping.competencesByCategoriesByNiveau(competences, categories)
+    const listByCategories = Object.values(byCategories)
+      .map(it => it.competencesParNiveau)
+      .map(byNiveau => {
+        const niveaux = Object.keys(byNiveau).map(it => Number(it)).sort(Misc.ascending())
+        if (niveaux.length == 0) {
+          return undefined
+        }
+        const listCategorieByNiveau = niveaux.map(niveau => {
+          const list = byNiveau[niveau].sort(Misc.ascending(it => it.name))
+          return {niveau, list}
+        })
+        return Misc.concat(listCategorieByNiveau)
+      }).filter(it => it != undefined)
+
+    return Misc.concat(listByCategories)
+  }
+
   activateListeners(html) {
     super.activateListeners(html);
     this.html.find('.button-export').click(async event => {

module/actor/export-scriptarium/mapping.js

@@ -9,13 +9,13 @@ import { RdDBonus } from "../../rdd-bonus.js"
 import { TMRType } from "../../tmr-utility.js"
 
 
-const CATEGORIES_COMPETENCES = [
+export const CATEGORIES_COMPETENCES = [
   "generale",
   "particuliere",
   "specialisee",
   "connaissance",
 ]
-const CATEGORIES_DRACONIC = [
+export const CATEGORIES_DRACONIC = [
   "draconic",
 ]
 
@@ -306,8 +306,8 @@ export class Mapping {
     if (competences.length == 0) {
       return ''
     }
-    const byCartegories = Mapping.competencesByCategoriesByNiveau(competences, categories)
-    const txtByCategories = Object.values(byCartegories)
+    const byCategories = Mapping.competencesByCategoriesByNiveau(competences, categories)
+    const txtByCategories = Object.values(byCategories)
       .map(it => it.competencesParNiveau)
       .map(byNiveau => {
         const niveaux = Object.keys(byNiveau).map(it => Number(it)).sort(Misc.ascending())