Roll V2: cuisine

module/actor.js

@@ -51,6 +51,7 @@ import { ROLL_TYPE_JEU, ROLL_TYPE_MEDITATION } from "./roll/roll-constants.mjs";
 import { PART_TACHE } from "./roll/roll-part-tache.mjs";
 import { PART_COMP } from "./roll/roll-part-comp.mjs";
 import { PART_OEUVRE } from "./roll/roll-part-oeuvre.mjs";
+import { PART_CUISINE } from "./roll/roll-part-cuisine.mjs";
 
 export const MAINS_DIRECTRICES = ['Droitier', 'Gaucher', 'Ambidextre']
 
@@ -1937,10 +1938,11 @@ export class RdDActor extends RdDBaseActorSang {
         type: { allowed: [PART_COMP], current: PART_COMP },
         selected: {
           carac: { key: caracName },
-          comp: { key: compName, forced: options.forced }
+          comp: { key: compName, forced: options.forced },
+          diff: { value: diff ?? 0 }
         }
       }
-      RollDialog.create(rollData, options)
+      RollDialog.create(rollData, foundry.utils.mergeObject(options, { onRollDone: RollDialog.onRollDoneClose }))
       return
     }
 
@@ -2064,7 +2066,7 @@ export class RdDActor extends RdDBaseActorSang {
         selected: { meditation: { key: id } },
         type: { allowed: [ROLL_TYPE_MEDITATION], current: ROLL_TYPE_MEDITATION }
       }
-      await RollDialog.create(rollData)
+      await RollDialog.create(rollData, { onRollDone: RollDialog.onRollDoneClose })
       return
     }
 
@@ -3210,14 +3212,26 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async rollRecetteCuisine(id) {
-    const oeuvre = this.getRecetteCuisine(id);
+    const recette = this.getRecetteCuisine(id);
+    if (OptionsAvancees.isUsing(ROLL_DIALOG_V2)) {
+      const rollData = {
+        ids: { actorId: this.id },
+        type: { allowed: [PART_CUISINE], current: PART_CUISINE },
+        selected: {
+          cuisine: { key: recette.id }
+        }
+      }
+      RollDialog.create(rollData, { onRollDone: RollDialog.onRollDoneClose })
+      return
+    }
+
     const artData = {
       verbe: 'Cuisiner',
       compName: 'cuisine',
       proportions: 1,
       ajouterEquipement: false
     };
-    await this._rollArtV1(artData, 'odoratgout', oeuvre, r => this._resultRecetteCuisine(r));
+    await this._rollArtV1(artData, 'odoratgout', recette, r => this._resultRecetteCuisine(r));
   }
 
   /* -------------------------------------------- */
@@ -3250,6 +3264,18 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   async preparerNourriture(item) {
+    if (item.getUtilisationCuisine() == 'brut' && OptionsAvancees.isUsing(ROLL_DIALOG_V2)) {
+      const rollData = {
+        ids: { actorId: this.id },
+        type: { allowed: [PART_CUISINE], current: PART_CUISINE },
+        selected: {
+          cuisine: { key: item.id }
+        }
+      }
+      RollDialog.create(rollData, { onRollDone: RollDialog.onRollDoneClose })
+      return
+    }
+
     if (item.getUtilisationCuisine() == 'brut') {
       const nourriture = {
         name: 'Plat de ' + item.name,
@@ -3260,7 +3286,7 @@ export class RdDActor extends RdDBaseActorSang {
           exotisme: item.system.exotisme,
           ingredients: item.name
         }
-      };
+      }
       const artData = {
         verbe: 'Préparer',
         compName: 'cuisine',