Export scriptarium OK agfain

Reviewed-on: #765

changelog.md

@@ -5,6 +5,7 @@
 - On peut de nouveau modifier les descriptions
 - ne pas proposer l'export csv par défaut
 - Correction de la macro "Jet quelconque"
+- Correction de la ligne 'rêve actuel' ajoutée dans les caracs
 - Corrections d'affichage
   - boutons de l'horloge
   - boutons de déplacement des TMR

less/foundryvtt-reve-de-dragon.less

@@ -1484,11 +1484,11 @@
     background: rgba(220,220,210,0.75);
     border: 2px solid #545469;
   }
-  
+
   .chat-message hr {
     margin: 0.2rem 0;
   }
-  
+
   .chat-icon {
     border: 0;
     padding: 2px 6px 2px 2px;

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

@@ -12,14 +12,18 @@ export class ExportScriptarium {
   }
 
   constructor() {
-    Hooks.on("getActorDirectoryFolderContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
-    Hooks.on("getActorDirectoryEntryContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
+    //Hooks.on("getActorDirectoryFolderContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
+    Hooks.on("getFolderContextOptions", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
+    //Hooks.on("getActorDirectoryEntryContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
+    Hooks.on("getActorContextOptions", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
+
   }
 
   onActorDirectoryMenu(actorDirectory, menus) {
+    // DEBUG console.log("ExportScriptarium.onActorDirectoryMenu", actorDirectory, menus)
     menus.push({
-      name: 'Export Personnages <i class="fa-regular fa-file-csv"></i>',
-      icon: IMG_SCRIPTARIUM,
+      name: 'Export Personnages',
+      icon: '<i class="fa-solid fa-download"></i>', //IMG_SCRIPTARIUM,
       condition: (target) => game.user.isGM &&
         OptionsAvancees.isUsing(EXPORT_CSV_SCRIPTARIUM) &&
         this.$getActors(actorDirectory, target).length > 0,
@@ -28,22 +32,28 @@ export class ExportScriptarium {
   }
 
   $getTargetName(actorDirectory, target) {
+    target = $(target)
     const li = target.closest(".directory-item")
     const folderId = li.data("folderId")
-    const actorId = li.data("documentId")
+    const actorId = li.data("entryId")
     return actorId
       ? game.actors.get(actorId).name
-      : actorDirectory.folders.find(it => it.id == folderId).name
+      : actorDirectory.collection.filter(it => it.folder.id == folderId).name
   }
 
   $getActors(actorDirectory, target) {
+    if (actorDirectory.id != "actors") {
+      return []
+    }
+    // DEBUG console.log("ExportScriptarium.$getActors", actorDirectory, target)
+    target = $(target)
     const li = target.closest(".directory-item")
     const folderId = li.data("folderId")
-    const actorId = li.data("documentId")
+    const actorId = li.data("entryId")
     const actors = actorId
       ? [game.actors.get(actorId)]
       : folderId
-        ? actorDirectory.folders.find(it => it.id == folderId).contents
+        ? actorDirectory.collection.filter(it => it.folder.id == folderId)
         : []
     return actors.filter(it => it.type == ACTOR_TYPES.personnage)
   }
@@ -54,7 +64,7 @@ export class ExportScriptarium {
     const actorLines = actors.map(actor => Misc.join(this.getActorLine(actor), ';'))
     const data = Misc.join([header, ...actorLines], eol)
     const filename = `scriptarium-${targetName?.slugify()}.csv`;
-    saveDataToFile(data, "text/csv;charset=windows-1252", `${filename}`);
+    foundry.utils.saveDataToFile(data, "text/csv;charset=windows-1252", `${filename}`);
   }
 
   getHeaderLine() {

module/migrations.js

@@ -8,6 +8,7 @@ import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDRaretes } from "./item/raretes.js";
 import { VOIES_DRACONIC } from "./item-sort.js";
 import { SystemCompendiums } from "./settings/system-compendiums.js";
+import { Misc } from "./misc.js";
 
 class Migration {
   get code() { return "sample"; }
@@ -632,12 +633,21 @@ class _12_0_38_TachesEcriture extends Migration {
   async migrate() {
     await this.applyItemsUpdates(items => items
       .filter(it => [ITEM_TYPES.tache, ITEM_TYPES.livre, ITEM_TYPES.oeuvre, ITEM_TYPES.meditation].includes(it.type) )
-      .filter(it => it.system.competence == 'Ecriture')
+      .filter(it => Grammar.equalsInsensitive(it.system.competence, 'ecriture'))
       .map(it => { return { _id: it.id, 'system.competence': 'Écriture' } })
     )
   }
 }
 
+class _13_0_4_FixReveActuel extends Migration {
+  get code() { return "fix-revvve-actuel" }
+  get version() { return "13.0.4" }
+
+  async migrate() {
+    game.actors.forEach(it => it.update({'system.carac.-=reve-actuel': null}))
+  }
+}
+
 export class Migrations {
   static getMigrations() {
     return [
@@ -660,7 +670,8 @@ export class Migrations {
       new _12_0_26_MigrationVoieSorts(),
       new _12_0_32_MigrationRaces(),
       new _12_0_37_MigrationAlchimieEtat(),
-      new _12_0_38_TachesEcriture()
+      new _12_0_38_TachesEcriture(),
+      new _13_0_4_FixReveActuel()
     ];
   }
 

module/rdd-roll.js

@@ -40,7 +40,7 @@ export class RdDRoll extends Dialog {
       etat: actor.getEtatGeneral(),
       moral: actor.getMoralTotal(), /* La valeur du moral pour les jets de volonté */
       amoureux: actor.listeSuivants(it => it.coeur > 0),
-      carac: actor.system.carac,
+      carac: foundry.utils.duplicate(actor.system.carac),
       finalLevel: 0,
       diffConditions: 0,
       diffLibre: rollData.competence?.system.default_diffLibre ?? 0,