Petites améliorations

module/roll/chat-roll-result.mjs

@@ -98,7 +98,8 @@ export default class ChatRollResult {
 
   async buildRollHtml(roll) {
     const template = `systems/foundryvtt-reve-de-dragon/templates/roll/result/chat-${roll.type.current}.hbs`
-    return await renderTemplate(template, roll)
+    const html = await renderTemplate(template, roll)
+    return await RdDTextEditor.enrichHTML(html, undefined, { showLink: false })
   }
 
   async chatListeners(html) {

module/roll/roll-constants.mjs

@@ -1,10 +1,10 @@
 
 export const ROLL_TYPE_ATTAQUE = 'attaque'
 export const ROLL_TYPE_COMP = 'comp'
+export const ROLL_TYPE_CUISINE = 'cuisine'
 export const ROLL_TYPE_DEFENSE = 'defense'
 export const ROLL_TYPE_JEU = 'jeu'
 export const ROLL_TYPE_MEDITATION = 'meditation'
-export const ROLL_TYPE_CUISINE = 'cuisine'
 export const ROLL_TYPE_OEUVRE = 'oeuvre'
 export const ROLL_TYPE_SORT = 'sort'
 export const ROLL_TYPE_TACHE = 'tache'
@@ -12,11 +12,10 @@ export const ROLL_TYPE_TACHE = 'tache'
 export const ATTAQUE_ROLL_TYPES = [ROLL_TYPE_ATTAQUE]
 export const COMBAT_ROLL_TYPES = [ROLL_TYPE_ATTAQUE, ROLL_TYPE_DEFENSE]
 export const DEMIREVE_ROLL_TYPES = [ROLL_TYPE_SORT]
-export const DEFAULT_ROLL_TYPES = [ROLL_TYPE_COMP, ROLL_TYPE_JEU, ROLL_TYPE_MEDITATION, ROLL_TYPE_CUISINE, ROLL_TYPE_OEUVRE, ROLL_TYPE_TACHE]
+export const DEFAULT_ROLL_TYPES = [ROLL_TYPE_COMP, ROLL_TYPE_TACHE, ROLL_TYPE_MEDITATION, ROLL_TYPE_CUISINE, ROLL_TYPE_OEUVRE, ROLL_TYPE_JEU]
 export const ALL_ROLL_TYPES = [...DEFAULT_ROLL_TYPES, ...COMBAT_ROLL_TYPES, ...DEMIREVE_ROLL_TYPES]
 
 
-
 export const DIFF = {
   LIBRE: 'libre',
   ATTAQUE: 'attaque',

module/roll/roll-dialog-adapter.mjs

@@ -67,7 +67,7 @@ export class RollDialogAdapter {
     if (rollData.ajustements == undefined) {
       rollData.ajustements = {}
     }
-    rollData.selectedCarac = rollData.active.actor.system.carac[rollData.current.carac.key]
+    rollData.selectedCarac = rollData.active.actor.getCaracByName(rollData.current.carac.key)
 
     const compKey = rollData.current.comp?.key
     if (compKey) {

module/roll/roll-part-comp.mjs

@@ -21,10 +21,9 @@ export class RollPartComp extends RollPartSelect {
     refs.all = this.$getActorComps(rollData)
       .filter(comp => !selected.forced ||
         (selected.key ?
-        Grammar.includesLowerCaseNoAccent(comp.name, selected.key)
-        : comp.key == '')
+          Grammar.includesLowerCaseNoAccent(comp.name, selected.key)
+          : comp.key == '')
       )
-
     refs.comps = refs.all
     this.$selectComp(rollData)
   }
@@ -52,12 +51,16 @@ export class RollPartComp extends RollPartSelect {
     }
   }
 
-  filterComps(rollData, allowed = []) {
+  filterComps(rollData, allowed = [], sorting = undefined) {
+    const sans = allowed.includes('')
     allowed = allowed.filter(it => it != undefined)
     const refs = this.getRefs(rollData)
     refs.comps = allowed.length > 0
-      ? refs.all.filter(it => allowed.includes(it.label))
+      ? refs.all.filter(it => allowed.includes(it.label) || (sans && it.key == ''))
       : refs.all
+    if (sorting && refs.comps.length > 0) {
+      refs.comps.sort(sorting)
+    }
     this.$selectComp(rollData)
   }
 

module/roll/roll-part-diff.mjs

@@ -1,10 +1,15 @@
-import { DIFF, DIFFS, ROLL_TYPE_MEDITATION, ROLL_TYPE_OEUVRE, ROLL_TYPE_SORT, ROLL_TYPE_TACHE } from "./roll-constants.mjs";
+import { DIFF, DIFFS, ROLL_TYPE_CUISINE, ROLL_TYPE_MEDITATION, ROLL_TYPE_OEUVRE, ROLL_TYPE_SORT, ROLL_TYPE_TACHE } from "./roll-constants.mjs";
 import { ROLLDIALOG_SECTION, RollPart } from "./roll-part.mjs";
 import { Misc } from "../misc.js";
 
 export const PART_DIFF = "diff"
 
-const EXCLUDED_ROLL_TYPES = [ROLL_TYPE_TACHE, ROLL_TYPE_MEDITATION, ROLL_TYPE_SORT, ROLL_TYPE_OEUVRE]
+const EXCLUDED_ROLL_TYPES = [
+  ROLL_TYPE_TACHE,
+  ROLL_TYPE_MEDITATION,
+  ROLL_TYPE_SORT,
+  ROLL_TYPE_CUISINE,
+  ROLL_TYPE_OEUVRE]
 
 export class RollPartDiff extends RollPart {
 
@@ -53,8 +58,8 @@ export class RollPartDiff extends RollPart {
 
   setDiff(rollData, diff) {
     const current = this.getCurrent(rollData)
-    current.value = diff.diff
-    current.type = diff.type
+    current.value = diff.diff ?? current.value
+    current.type = diff.type ?? current.type
   }
 
   getAjustements(rollData) {

module/roll/roll-part-select.mjs

@@ -27,7 +27,7 @@ export class RollPartSelect extends RollPart {
     const current = this.getCurrent(rollData)
     const newChoice = (choices.length == 0)
       ? { key: '', value: defValue }
-      : this.$getSelectedChoice(choices, key ?? current?.key ?? refs?.key ?? '')
+      : this.$getSelectedChoice(choices, key ?? current?.key ?? refs?.key ?? choices[0].key)
     this.setCurrent(rollData, newChoice)
     return newChoice
   }

module/roll/roll-part-sort.mjs

@@ -11,9 +11,11 @@ import { CARACS } from "../rdd-carac.js"
 export const PART_SORT = "sort"
 
 export class RollPartSort extends RollPartSelect {
+
   onReady() {
     // TODO: utiliser un hook pour écouter les déplacements dans les TMRs?
   }
+
   get code() { return PART_SORT }
   get section() { return ROLLDIALOG_SECTION.CHOIX }
 
@@ -23,7 +25,7 @@ export class RollPartSort extends RollPartSelect {
   loadRefs(rollData) {
     const refs = this.getRefs(rollData)
     const coord = rollData.active.actor.system.reve.tmrpos.coord
-    const draconics = rollData.active.actor.getDraconicList()
+    const draconics = rollData.active.actor.getDraconics()
     const sorts = rollData.active.actor.itemTypes[ITEM_TYPES.sort]
       .map(s => RollPartSort.$extractSort(s, coord, draconics))
 

module/roll/roll-type-comp.mjs

@@ -1,4 +1,4 @@
-import { ROLL_TYPE_COMP } from "./roll-constants.mjs"
+import { DIFF, ROLL_TYPE_COMP } from "./roll-constants.mjs"
 import { RollType } from "./roll-type.mjs"
 
 export class RollTypeComp extends RollType {
@@ -7,4 +7,9 @@ export class RollTypeComp extends RollType {
 
   title(rollData) { return `fait un jet ${rollData.type.opposed ? ' contre ' : ''}` }
 
+
+  onSelect(rollData) {
+    this.setDiffType(rollData, DIFF.LIBRE)
+  }
+
 }