Roll V2: les jeux

module/roll/roll-part-jeu.mjs

@@ -1,15 +1,16 @@
-import { Grammar } from "../grammar.js"
 import { ITEM_TYPES } from "../constants.js"
 import { CARACS } from "../rdd-carac.js"
 import { ROLL_TYPE_JEU } from "./roll-constants.mjs"
 import { PART_CARAC } from "./roll-part-carac.mjs"
-import { PART_COMP } from "./roll-part-comp.mjs"
+import { PART_COMP, RollPartComp } from "./roll-part-comp.mjs"
 import { RollPartSelect } from "./roll-part-select.mjs"
 import { ROLLDIALOG_SECTION } from "./roll-part.mjs"
+import { RdDItem } from "../item.js"
+import { Misc } from "../misc.js"
 
 export const PART_JEU = "jeu"
 
-const COMPETENCE_JEU = 'Jeu'
+export const COMPETENCE_JEU = 'Jeu'
 
 export class RollPartJeu extends RollPartSelect {
 
@@ -21,8 +22,12 @@ export class RollPartJeu extends RollPartSelect {
 
   loadRefs(rollData) {
     const refs = this.getRefs(rollData)
-    refs.jeux = rollData.active.actor.itemTypes[ITEM_TYPES.jeu]
-      .map(it => RollPartJeu.$extractJeu(it, rollData.active.actor))
+    const actor = rollData.active.actor
+    const compJeu = actor.getCompetence(COMPETENCE_JEU)
+
+    refs.jeux = actor.itemTypes[ITEM_TYPES.jeu]
+      .map(it => RollPartJeu.$extractJeu(it, compJeu))
+
     if (refs.jeux.length > 0) {
       this.$selectJeu(rollData)
     }
@@ -30,18 +35,17 @@ export class RollPartJeu extends RollPartSelect {
 
   choices(refs) { return refs.jeux }
 
-  static $extractJeu(jeu, actor) {
-    const comp = actor.getCompetence(COMPETENCE_JEU)
+  static $extractJeu(jeu, compJeu) {
     const caracs = jeu.system.caraccomp.toLowerCase().split(/[.,:\/-]/).map(it => it.trim())
-    const base = RollPartJeu.$getJeuBase(jeu, comp, caracs)
+    const base = RollPartJeu.$getJeuBase(jeu, compJeu, caracs)
     return {
       key: jeu.id,
       label: jeu.name,
       caracs: caracs,
       jeu: jeu,
-      value: (base ?? comp).system.niveau,
+      value: 0,
       base: base,
-      comp: comp
+      comp: compJeu
     }
   }
 
@@ -49,10 +53,10 @@ export class RollPartJeu extends RollPartSelect {
     if (jeu.system.base < comp.system.niveau) {
       return undefined
     }
-    return {
+    return new RdDItem({
       id: comp.id,
-      name: `Jeu ${jeu.name}`,
-      type: comp.type,
+      name: `Jeu ${Misc.lowerFirst(jeu.name)}`,
+      type: ITEM_TYPES.competence,
       img: comp.img,
       system: foundry.utils.mergeObject(
         {
@@ -61,9 +65,9 @@ export class RollPartJeu extends RollPartSelect {
           default_carac: caracs.length > 0 ? caracs[0] : CARACS.CHANCE
         },
         comp.system,
-        { inplace: true, overwrite: false }
+        { overwrite: false }
       )
-    }
+    })
   }
 
   prepareContext(rollData) {
@@ -77,6 +81,13 @@ export class RollPartJeu extends RollPartSelect {
 
   $selectJeu(rollData, key) {
     this.selectByKey(rollData, key, 0)
+    RollPartJeu.forceCompJeu(rollData)
+  }
+
+  static forceCompJeu(rollData) {
+    const jeu = rollData.current[PART_JEU].base ?? rollData.current[PART_JEU].comp
+    rollData.refs[PART_COMP].comps = [jeu].map(it => RollPartComp.extractComp(it))
+    rollData.current[PART_COMP] = rollData.refs[PART_COMP].comps[0]
   }
 
   async _onRender(rollDialog, context, options) {
@@ -95,7 +106,7 @@ export class RollPartJeu extends RollPartSelect {
       const current = this.getCurrent(rollData)
       switch (part.code) {
         case PART_CARAC: return part.filterCaracs(rollData, current.caracs)
-        case PART_COMP: return part.filterComps(rollData,[current.comp?.name])
+        case PART_COMP: return part.filterComps(rollData, [current.comp?.name])
       }
     }
     return undefined