Foundry v13 migration

Fix waring about grid
Fix v11/v12
2025-05-01 08:48:02 +02:00 · 2025-02-14 13:37:51 +01:00 · 2024-05-02 09:29:42 +02:00 · 2024-04-26 18:35:39 +02:00 · 2024-02-08 12:51:06 +01:00 · 2023-10-26 09:25:07 +02:00
69 changed files with 524 additions and 401 deletions
--- a/README.md
+++ b/README.md
@ -1,5 +1,7 @@
 # Système Foundry pour Maléfices (French RPG, Arkhane Asylum Publishing)

+[Vue du système](https://www.lahiette.com/leratierbretonnien/wp-content/uploads/2023/02/malefices_snapshot.webp)
+
 ## EN

 Unofficial system for Maléfices v4 (French version from Arkhane Asylum Publishing).
--- a/images/icons/.directory
+++ b/images/icons/.directory
@ -0,0 +1,6 @@
+[Dolphin]
+SortRole=modificationtime
+Timestamp=2023,2,26,15,32,34.892
+Version=4
+ViewMode=1
+VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails
--- a/images/icons/resume.webp
+++ b/images/icons/resume.webp
--- a/images/icons/tirage.webp
+++ b/images/icons/tirage.webp
--- a/images/icons/tirer.webp
+++ b/images/icons/tirer.webp
--- a/lang/fr.json
+++ b/lang/fr.json
@ -1,13 +1,15 @@
 {
-  "ACTOR": {
-    "TypePersonnage": "Personnage"
-  },
-  "ITEM": {
-    "TypeArme": "Arme",
-    "TypeEquipement": "Equipement",
-    "TypeTarot": "Tarot",
-    "TypeElementbio": "Element Biographique",
-    "TypeArchetype": "Archetype",
-    "TypeSortilege": "Sortilège"
+  "TYPES": {
+    "Actor": {
+      "personnage"  : "Personnage"
+    },
+    "Item": {
+      "arme"        : "Arme",
+      "equipement"  : "Equipement",
+      "tarot"       : "Tarot",
+      "elementbio"  : "Elément Biographique",
+      "archetype"   : "Archetype",
+      "sortilege"   : "Sortilège"
+    }
  }
 }
--- a/modules/malefices-actor-sheet.js
+++ b/modules/malefices-actor-sheet.js
@ -6,13 +6,13 @@
 import { MaleficesUtility } from "./malefices-utility.js";

 /* -------------------------------------------- */
-export class MaleficesActorSheet extends ActorSheet {
+export class MaleficesActorSheet extends foundry.appv1.sheets.ActorSheet {

  /** @override */
  static get defaultOptions() {

-    return mergeObject(super.defaultOptions, {
-      classes: ["fvtt-malefices", "sheet", "actor"],
+    return foundry.utils.mergeObject(super.defaultOptions, {
+      classes: ["fvtt-malefices", "sheet", "actor", "malefices-actor-sheet"],
      template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs",
      width: 640,
      height:680,
@ -33,17 +33,20 @@ export class MaleficesActorSheet extends ActorSheet {
      name: this.actor.name,
      editable: this.isEditable,
      cssClass: this.isEditable ? "editable" : "locked",
-      system: duplicate(this.object.system),
+      system: foundry.utils.duplicate(this.object.system),
      limited: this.object.limited,
-      armes: duplicate(this.actor.getArmes()),
-      tarots: duplicate(this.actor.getTarots()),
-      tarotsCache: duplicate(this.actor.getHiddenTarots()),
-      archetype: duplicate(this.actor.getArchetype()),
-      equipements: duplicate(this.actor.getEquipements()),
-      subActors: duplicate(this.actor.getSubActors()),
+      armes: foundry.utils.duplicate(this.actor.getArmes()),
+      tarots: foundry.utils.duplicate(this.actor.getTarots()),
+      tarotsCache: foundry.utils.duplicate(this.actor.getHiddenTarots()),
+      archetype: foundry.utils.duplicate(this.actor.getArchetype()),
+      equipements: foundry.utils.duplicate(this.actor.getEquipements()),
+      subActors: foundry.utils.duplicate(this.actor.getSubActors()),
      phyMalus: this.actor.getPhysiqueMalus(),
      elementsbio: this.actor.getElementsBio(),
      sorts: this.actor.getSorts(),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, { async: true }),
+      notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.notes, { async: true }),
+      equipementlibre: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.equipementlibre, { async: true }),
      options: this.options,
      owner: this.document.isOwner,
      editScore: this.options.editScore,
@ -51,7 +54,7 @@ export class MaleficesActorSheet extends ActorSheet {
    }
    this.formData = formData;

-    console.log("PC : ", formData, this.object);
+    console.log("PC : ", formData, this.object );
    return formData;
  }

@ -63,10 +66,10 @@ export class MaleficesActorSheet extends ActorSheet {

    // Everything below here is only needed if the sheet is editable
    if (!this.options.editable) return;
-    
+
    html.bind("keydown", function(e) { // Ignore Enter in actores sheet
      if (e.keyCode === 13) return false;
-    });  
+    });

    // Update Inventory Item
    html.find('.item-edit').click(ev => {
@ -84,14 +87,14 @@ export class MaleficesActorSheet extends ActorSheet {
      let dataType = $(ev.currentTarget).data("type")
      this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
    })
-        
+
    html.find('.subactor-edit').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
      let actorId = li.data("actor-id");
      let actor = game.actors.get( actorId );
      actor.sheet.render(true);
    });
-    
+
    html.find('.subactor-delete').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
      let actorId = li.data("actor-id");
@ -114,38 +117,38 @@ export class MaleficesActorSheet extends ActorSheet {
      const li = $(event.currentTarget).parents(".item")
      this.actor.incDecAmmo( li.data("item-id"), +1 )
    } );
-            
+
    html.find('.roll-attribut').click((event) => {
      let attrKey = $(event.currentTarget).data("attr-key")
      this.actor.rollAttribut(attrKey)
-    });    
+    });
    html.find('.roll-arme').click((event) => {
      const armeId = $(event.currentTarget).data("arme-id")
      this.actor.rollArme(armeId)
    });
-    
+
    html.find('.lock-unlock-sheet').click((event) => {
      this.options.editScore = !this.options.editScore;
      this.render(true);
-    });    
+    });
    html.find('.item-link a').click((event) => {
      const itemId = $(event.currentTarget).data("item-id");
      const item = this.actor.getOwnedItem(itemId);
      item.sheet.render(true);
-    });    
+    });
    html.find('.item-equip').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
      this.actor.equipItem( li.data("item-id") );
-      this.render(true);      
+      this.render(true);
    });

    html.find('.update-field').change(ev => {
      const fieldName = $(ev.currentTarget).data("field-name");
      let value = Number(ev.currentTarget.value);
      this.actor.update( { [`${fieldName}`]: value } );
-    });    
+    });
  }
-  
+
  /* -------------------------------------------- */
  /** @override */
  setPosition(options = {}) {
--- a/modules/malefices-actor.js
+++ b/modules/malefices-actor.js
@ -29,7 +29,7 @@ export class MaleficesActor extends Actor {
    if (data instanceof Array) {
      return super.create(data, options);
    }
-    // If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic
+    // If the created actor has items (only applicable to foundry.utils.duplicated actors) bypass the new actor creation logic
    if (data.items) {
      let actor = super.create(data, options);
      return actor;
@ -92,7 +92,7 @@ export class MaleficesActor extends Actor {
    return comp;
  }
  getArchetype() {
-    let comp = duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"})
+    let comp = foundry.utils.duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"})
    if (comp && comp.system) {
      comp.tarot = MaleficesUtility.getTarot(comp.system.lametutelaire)
    }
@ -101,25 +101,25 @@ export class MaleficesActor extends Actor {
  }
  /* -------------------------------------------- */
  getElementsBio() {
-    let comp = duplicate(this.items.filter(item => item.type == 'elementbio') || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'elementbio') || [])
    MaleficesUtility.sortArrayObjectsByName(comp)
    return comp;
  }
  /* -------------------------------------------- */
  getTarots() {
-    let comp = duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || [])
    MaleficesUtility.sortArrayObjectsByName(comp)
    return comp;
  }
  /* -------------------------------------------- */
  getHiddenTarots() {
-    let comp = duplicate(this.items.filter(item => item.type == 'tarot' && item.system.isgm) || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && item.system.isgm) || [])
    MaleficesUtility.sortArrayObjectsByName(comp)
    return comp;
  }
  /* -------------------------------------------- */
  getArmes() {
-    let comp = duplicate(this.items.filter(item => item.type == 'arme') || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'arme') || [])
    MaleficesUtility.sortArrayObjectsByName(comp)
    return comp;
  }
@ -127,7 +127,7 @@ export class MaleficesActor extends Actor {
  getItemById(id) {
    let item = this.items.find(item => item.id == id);
    if (item) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
    }
    return item;
  }
@ -173,7 +173,7 @@ export class MaleficesActor extends Actor {

  /* ------------------------------------------- */
  async buildContainerTree() {
-    let equipments = duplicate(this.items.filter(item => item.type == "equipment") || [])
+    let equipments = foundry.utils.duplicate(this.items.filter(item => item.type == "equipment") || [])
    for (let equip1 of equipments) {
      if (equip1.system.iscontainer) {
        equip1.system.contents = []
@ -229,22 +229,22 @@ export class MaleficesActor extends Actor {
  }
  /* -------------------------------------------- */
  getInitiativeScore(combatId, combatantId) {
-    let init = Math.floor(this.system.attributs.physique.value+this.system.attributs.habilete.value)
+    let init = Math.floor( (this.system.attributs.physique.value+this.system.attributs.habilite.value) / 2)
    let subvalue = new Roll("1d20").roll({async: false})
-    return init + (subvalue / 100)
+    return init + (subvalue.total / 100)
  }

  /* -------------------------------------------- */
  getSubActors() {
    let subActors = [];
    for (let id of this.system.subactors) {
-      subActors.push(duplicate(game.actors.get(id)))
+      subActors.push(foundry.utils.duplicate(game.actors.get(id)))
    }
    return subActors;
  }
  /* -------------------------------------------- */
  async addSubActor(subActorId) {
-    let subActors = duplicate(this.system.subactors);
+    let subActors = foundry.utils.duplicate(this.system.subactors);
    subActors.push(subActorId);
    await this.update({ 'system.subactors': subActors });
  }
@ -291,7 +291,7 @@ export class MaleficesActor extends Actor {
  }
  /* -------------------------------------------- */
  incDecAttr(attrKey, value) {
-    let attr = duplicate(this.system.attributs[attrKey])
+    let attr = foundry.utils.duplicate(this.system.attributs[attrKey])
    attr.value += value
    this.update( { [`system.attributs.${attrKey}`]: attr})    
  }
@ -341,6 +341,7 @@ export class MaleficesActor extends Actor {
    rollData.isReroll = false
    rollData.confrontationDegre = 0
    rollData.confrontationModif = 0
+    rollData.config = game.system.malefices.config

    console.log("ROLLDATA", rollData)

@ -358,7 +359,7 @@ export class MaleficesActor extends Actor {
  rollAttribut(attrKey) {
    let attr = this.system.attributs[attrKey]
    let rollData = this.getCommonRollData()
-    rollData.attr = duplicate(attr)
+    rollData.attr = foundry.utils.duplicate(attr)
    rollData.mode = "attribut"
    rollData.title = attr.label 
    rollData.img = this.getAtttributImage(attrKey)
@ -369,12 +370,12 @@ export class MaleficesActor extends Actor {
  rollArme(weaponId) {
    let arme = this.items.get(weaponId)
    if (arme) {
-      arme = duplicate(arme)
+      arme = foundry.utils.duplicate(arme)
      let rollData = this.getCommonRollData()
      if (arme.system.armetype == "mainsnues" || arme.system.armetype == "epee") {
-        rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique+this.system.attributs.habilite) / 2) }
+        rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique.value+this.system.attributs.habilite.value) / 2) }
      } else {
-        rollData.attr = duplicate(this.system.attributs.habilite)
+        rollData.attr = foundry.utils.duplicate(this.system.attributs.habilite)
      }
      rollData.mode = "arme"
      rollData.arme = arme
--- a/modules/malefices-commands.js
+++ b/modules/malefices-commands.js
@ -12,6 +12,7 @@ export class MaleficesCommands {
    if (!game.system.malefices.commands) {
      const commands = new MaleficesCommands();
      commands.registerCommand({ path: ["/tirage"], func: (content, msg, params) => MaleficesCommands.createTirage(msg), descr: "Tirage des tarots" });
+      commands.registerCommand({ path: ["/carte"], func: (content, msg, params) => MaleficesCommands.tirerCarte(msg), descr: "Tirer une carte" });
      commands.registerCommand({ path: ["/resume"], func: (content, msg, params) => MaleficesCharacterSummary.displayPCSummary(), descr: "Affiche la liste des PJs!" });
      game.system.malefices.commands = commands;
    }
@ -79,7 +80,7 @@ export class MaleficesCommands {
    console.log("===> Processing command")
    let command = commandsTable[name];
    path = path + name + " ";
-    if (command && command.subTable) {
+    if (command?.subTable) {
      if (params[0]) {
        return this._processCommand(command.subTable, params[0], params.slice(1), content, msg, path)
      }
@ -88,7 +89,7 @@ export class MaleficesCommands {
        return true;
      }
    }
-    if (command && command.func) {
+    if (command?.func) {
      const result = command.func(content, msg, params);
      if (result == false) {
        CrucibleCommands._chatAnswer(msg, command.descr);
@ -105,7 +106,7 @@ export class MaleficesCommands {
    ChatMessage.create(msg);
  }

-  /* -------------------------------------------- */
+  /* --------------------------------------------- */
  static async createTirage(msg) {
    if (game.user.isGM) {
      let tirageData = {
@ -114,7 +115,7 @@ export class MaleficesCommands {
        maxPlayerCard: 4,
        maxSecretCard: 1,
        cards: [],
-        players: duplicate(game.users),
+        players: foundry.utils.duplicate(game.users),
        secretCards: [],
        deck: MaleficesUtility.getTarots()
      }
@ -127,5 +128,20 @@ export class MaleficesCommands {
      tirageDialog.render(true)
    }
  }
+  /* --------------------------------------------- */
+  static async tirerCarte(msg) {
+    let deck =  MaleficesUtility.getTarots()
+    let index = Math.round(Math.random() * (deck.length-1))
+    let selectedCard = deck[index]
+    selectedCard.system.ispositif = true
+    if ( selectedCard.system.isdualside) { // Cas des cartes pouvant avoir 2 sens
+      selectedCard.system.ispositif = (Math.random() > 0.5)
+    }
+    selectedCard.system.isgm = false
+    selectedCard.value = (selectedCard.system.ispositif)? selectedCard.system.numericvalueup : selectedCard.system.numericvaluedown
+    MaleficesUtility.createChatMessage(game.user.name, "", {
+      content: await foundry.applications.handlebars.renderTemplates(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard)
+    })
+  }

 }
--- a/modules/malefices-config.js
+++ b/modules/malefices-config.js
@ -27,4 +27,41 @@ export const MALEFICES_CONFIG = {
    "epee": "Epée, sabre, javelot, etc",
    "mainsnues": "Mains Nues"
  },
+  
+  confrontationDegreOptions :{
+    "0": "0",
+    "1": "1",
+    "2": "2",
+    "3": "3",
+    "4": "4",
+    "5": "5"
+  },
+
+  confrontationModifOptions: {
+    "-1": "-1",
+    "0": "0",
+    "1": "+1"
+  },
+
+  bonusMalusPersoOptions: [
+    {value: "-3", label: "-3"},
+    {value: "-2", label: "-2"},
+    {value: "-1", label: "-1"},
+    {value: "0", label: "0"},
+    {value: "+1", label: "+1"},
+    {value: "+2", label: "+2"},
+    {value: "+3", label: "+3"}
+  ],
+  bonusMalusDefOptions: [
+    {value: "-6", label: "-6 (réussite critique)"},
+    {value: "-3", label: "-3 (réussite)"},
+    {value: "0", label: "0 (echec ou pas d'esquive)"},
+    {value: "+3", label: "+3 (echec critique)"}
+  ],
+  bonusMalusPorteeOptions: [
+    {value: "1", label: "+1 (Portée courte)"},
+    {value: "0", label: "0 (Portée moyenne)"},
+    {value: "-1", label: "-1 (Portée longue)"}
+  ]
+
 }
--- a/modules/malefices-item-sheet.js
+++ b/modules/malefices-item-sheet.js
@ -4,12 +4,12 @@ import { MaleficesUtility } from "./malefices-utility.js";
 * Extend the basic ItemSheet with some very simple modifications
 * @extends {ItemSheet}
 */
-export class MaleficesItemSheet extends ItemSheet {
+export class MaleficesItemSheet extends foundry.appv1.sheets.ItemSheet {

  /** @override */
  static get defaultOptions() {

-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
      classes: ["fvtt-malefices", "sheet", "item"],
      template: "systems/fvtt-malefices/templates/item-sheet.hbs",
      dragDrop: [{ dragSelector: null, dropSelector: null }],
@ -19,20 +19,6 @@ export class MaleficesItemSheet extends ItemSheet {
    });
  }

-  /* -------------------------------------------- */
-  _getHeaderButtons() {
-    let buttons = super._getHeaderButtons();
-    // Add "Post to chat" button
-    // We previously restricted this to GM and editable items only. If you ever find this comment because it broke something: eh, sorry!
-    buttons.unshift(
-      {
-        class: "post",
-        icon: "fas fa-comment",
-        onclick: ev => { }
-      })
-    return buttons
-  }
-
  /* -------------------------------------------- */
  /** @override */
  setPosition(options = {}) {
@ -57,20 +43,20 @@ export class MaleficesItemSheet extends ItemSheet {
      name: this.object.name,
      editable: this.isEditable,
      cssClass: this.isEditable ? "editable" : "locked",
-      system: duplicate(this.object.system),
-      config: duplicate(game.system.malefices.config),
+      system: foundry.utils.duplicate(this.object.system),
+      config: foundry.utils.duplicate(game.system.malefices.config),
      limited: this.object.limited,
      options: this.options,
      owner: this.document.isOwner,
-      description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
-      notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.description, { async: true }),
+      notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.notes, { async: true }),
      isGM: game.user.isGM
    }

    if ( this.object.type == "archetype")  {
      formData.tarots = MaleficesUtility.getTarots()
    }
-    
+
    this.options.editable = !(this.object.origin == "embeddedItem");
    console.log("ITEM DATA", formData, this);
    return formData;
@ -90,7 +76,7 @@ export class MaleficesItemSheet extends ItemSheet {

  /* -------------------------------------------- */
  postItem() {
-    let chatData = duplicate(this.item)
+    let chatData = foundry.utils.duplicate(this.item)
    if (this.actor) {
      chatData.actor = { id: this.actor.id };
    }
@ -116,7 +102,7 @@ export class MaleficesItemSheet extends ItemSheet {
    let levelIndex = Number($(ev.currentTarget).parents(".item").data("level-index"))
    let choiceIndex = Number($(ev.currentTarget).parents(".item").data("choice-index"))
    let featureId = $(ev.currentTarget).parents(".item").data("feature-id")
-    
+
    let itemData = this.object.system.levels[levelIndex].choices[choiceIndex].features[featureId]

    if (itemData.name != 'None') {
--- a/modules/malefices-main.js
+++ b/modules/malefices-main.js
@ -18,6 +18,7 @@ import { MaleficesItem } from "./malefices-item.js";
 import { MaleficesHotbar } from "./malefices-hotbar.js"
 import { MaleficesCharacterSummary } from "./malefices-summary-app.js"
 import { MALEFICES_CONFIG } from "./malefices-config.js"
+import { ClassCounter} from "https://www.uberwald.me/fvtt_appcount/count-class-ready.js"

 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@ -27,7 +28,7 @@ import { MALEFICES_CONFIG } from "./malefices-config.js"
 Hooks.once("init", async function () {

  console.log(`Initializing Malefices RPG`);
-  
+
  game.system.malefices = {
    config: MALEFICES_CONFIG,
    MaleficesHotbar
@ -38,7 +39,7 @@ Hooks.once("init", async function () {
  MaleficesUtility.preloadHandlebarsTemplates();

  /* -------------------------------------------- */
-  // Set an initiative formula for the system 
+  // Set an initiative formula for the system
  CONFIG.Combat.initiative = {
    formula: "1d6",
    decimals: 1
@ -57,52 +58,29 @@ Hooks.once("init", async function () {

  /* -------------------------------------------- */
  // Register sheet application classes
-  Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet("fvtt-malefices", MaleficesActorSheet, { types: ["personnage"], makeDefault: true });
-  Actors.registerSheet("fvtt-malefices", MaleficesNPCSheet, { types: ["pnj"], makeDefault: false });
+  foundry.documents.collections.Actors.unregisterSheet("core", foundry.appv1.sheets.ActorSheet);
+  foundry.documents.collections.Actors.registerSheet("fvtt-malefices", MaleficesActorSheet, { types: ["personnage"], makeDefault: true });
+  foundry.documents.collections.Actors.registerSheet("fvtt-malefices", MaleficesNPCSheet, { types: ["pnj"], makeDefault: false });

-  Items.unregisterSheet("core", ItemSheet);
-  Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true });
+  foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
+  foundry.documents.collections.Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true });

  MaleficesUtility.init()
+
 });

 /* -------------------------------------------- */
 function welcomeMessage() {
-  ChatMessage.create({
-    user: game.user.id,
-    whisper: [game.user.id],
-    content: `<div id="welcome-message-malefices"><span class="rdd-roll-part">
-    <strong>Bienvenu dans Malefices, le JDR qui sent le souffre !</strong>
-    <p>Le Livre de Base de Maléfices v4 est nécessaire pour jouer : https://arkhane-asylum.fr/en/malefices/</p>
-    <p>Maléfices et un jeu de rôle publié par Arkhane Asylum Publishing, tout les droits leur appartiennent.</p>
-    <p>Système développé par LeRatierBretonnien avec l'aide de la Dame du Lac et Malik, support sur le <a href="https://discord.gg/pPSDNJk">Discord FR de Foundry</a>.</p>
-    ` });
-}
-
-/* -------------------------------------------- */
-// Register world usage statistics
-function registerUsageCount( registerKey ) {
-  if ( game.user.isGM ) {
-    game.settings.register(registerKey, "world-key", {
-      name: "Unique world key",
-      scope: "world",
-      config: false,
-      default: "",
-      type: String
-    });
-
-    let worldKey = game.settings.get(registerKey, "world-key")
-    if ( worldKey == undefined || worldKey == "" ) {
-      worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey )
-    }
-    // Simple API counter
-    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-    //$.ajaxSetup({
-      //headers: { 'Access-Control-Allow-Origin': '*' }
-    //})
-    $.ajax(regURL)
+  if (game.user.isGM) {
+    ChatMessage.create({
+      user: game.user.id,
+      whisper: [game.user.id],
+      content: `<div id="welcome-message-malefices"><span class="rdd-roll-part">
+      <strong>Bienvenu dans Malefices, le JDR qui sent le souffre !</strong>
+      <p>Le Livre de Base de Maléfices v4 est nécessaire pour jouer : https://arkhane-asylum.fr/en/malefices/</p>
+      <p>Maléfices et un jeu de rôle publié par Arkhane Asylum Publishing, tout les droits leur appartiennent.</p>
+      <p>Système développé par LeRatierBretonnien avec l'aide de la Dame du Lac et Malik, support sur le <a href="https://discord.gg/pPSDNJk">Discord FR de Foundry</a>.</p>
+      <p>Commandes : /tirage pour le tirage des tarots, /carte pour tirer une simple carte et /resume pour le résumé des PJs (MJ seulement)` });
  }
 }

@ -119,18 +97,11 @@ Hooks.once("ready", function () {
      user: game.user._id
    });
  }
-  
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }

-  registerUsageCount('fvtt-malefices')
+  ClassCounter.registerUsageCount();
  welcomeMessage();
  MaleficesUtility.ready()
-  MaleficesUtility.init()
-  MaleficesCharacterSummary.ready()  
+  MaleficesCharacterSummary.ready()

 })

@ -148,4 +119,3 @@ Hooks.on("chatMessage", (html, content, msg) => {
  }
  return true;
 });
-
--- a/modules/malefices-npc-sheet.js
+++ b/modules/malefices-npc-sheet.js
@ -6,12 +6,12 @@
 import { MaleficesUtility } from "./malefices-utility.js";

 /* -------------------------------------------- */
-export class MaleficesNPCSheet extends ActorSheet {
+export class MaleficesNPCSheet extends foundry.appv1.sheets.ActorSheet {

  /** @override */
  static get defaultOptions() {

-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
      classes: ["Malefices", "sheet", "actor"],
      template: "systems/fvtt-malefices/templates/npc-sheet.html",
      width: 640,
@ -25,7 +25,7 @@ export class MaleficesNPCSheet extends ActorSheet {
  /* -------------------------------------------- */
  async getData() {
    const objectData = this.object.system
-    let actorData = duplicate(objectData)
+    let actorData = foundry.utils.duplicate(objectData)

    let formData = {
      title: this.title,
@ -38,16 +38,16 @@ export class MaleficesNPCSheet extends ActorSheet {
      data: actorData,
      limited: this.object.limited,
      skills: this.actor.getSkills( ),
-      weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
-      armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
-      shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
-      spells: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getLore())),
-      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
-      equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ),
+      weapons: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getWeapons()) ),
+      armors: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getArmors())),
+      shields: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getShields())),
+      spells: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getLore())),
+      equipments: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquipmentsOnly()) ),
+      equippedWeapons: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquippedWeapons()) ),
      equippedArmor: this.actor.getEquippedArmor(),
      equippedShield: this.actor.getEquippedShield(),
-      subActors: duplicate(this.actor.getSubActors()),
-      moneys: duplicate(this.actor.getMoneys()),
+      subActors: foundry.utils.duplicate(this.actor.getSubActors()),
+      moneys: foundry.utils.duplicate(this.actor.getMoneys()),
      encCapacity: this.actor.getEncumbranceCapacity(),
      saveRolls: this.actor.getSaveRoll(),
      conditions: this.actor.getConditions(),
@ -71,10 +71,10 @@ export class MaleficesNPCSheet extends ActorSheet {

    // Everything below here is only needed if the sheet is editable
    if (!this.options.editable) return;
-    
+
    html.bind("keydown", function(e) { // Ignore Enter in actores sheet
      if (e.keyCode === 13) return false;
-    });  
+    });

    // Update Inventory Item
    html.find('.item-edit').click(ev => {
@ -92,17 +92,17 @@ export class MaleficesNPCSheet extends ActorSheet {
      let dataType = $(ev.currentTarget).data("type")
      this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
    })
-        
+
    html.find('.equip-activate').click(ev => {
      const li = $(ev.currentTarget).parents(".item")
      let itemId = li.data("item-id")
      this.actor.equipActivate( itemId)
-    });      
+    });
    html.find('.equip-deactivate').click(ev => {
      const li = $(ev.currentTarget).parents(".item")
      let itemId = li.data("item-id")
      this.actor.equipDeactivate( itemId)
-    });      
+    });

    html.find('.subactor-edit').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
@ -110,7 +110,7 @@ export class MaleficesNPCSheet extends ActorSheet {
      let actor = game.actors.get( actorId );
      actor.sheet.render(true);
    });
-    
+
    html.find('.subactor-delete').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
      let actorId = li.data("actor-id");
@ -133,7 +133,7 @@ export class MaleficesNPCSheet extends ActorSheet {
      const li = $(event.currentTarget).parents(".item")
      this.actor.incDecAmmo( li.data("item-id"), +1 )
    } );
-            
+
    html.find('.roll-ability').click((event) => {
      const abilityKey = $(event.currentTarget).data("ability-key");
      this.actor.rollAbility(abilityKey);
@ -142,7 +142,7 @@ export class MaleficesNPCSheet extends ActorSheet {
      const li = $(event.currentTarget).parents(".item")
      const skillId = li.data("item-id")
      this.actor.rollSkill(skillId)
-    });    
+    });

    html.find('.roll-weapon').click((event) => {
      const li = $(event.currentTarget).parents(".item");
@ -163,28 +163,28 @@ export class MaleficesNPCSheet extends ActorSheet {
      const saveKey = $(event.currentTarget).data("save-key")
      this.actor.rollSave(saveKey)
    });
-    
-    
+
+
    html.find('.lock-unlock-sheet').click((event) => {
      this.options.editScore = !this.options.editScore;
      this.render(true);
-    });    
+    });
    html.find('.item-link a').click((event) => {
      const itemId = $(event.currentTarget).data("item-id");
      const item = this.actor.getOwnedItem(itemId);
      item.sheet.render(true);
-    });    
+    });
    html.find('.item-equip').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
      this.actor.equipItem( li.data("item-id") );
-      this.render(true);      
+      this.render(true);
    });

    html.find('.update-field').change(ev => {
      const fieldName = $(ev.currentTarget).data("field-name");
      let value = Number(ev.currentTarget.value);
      this.actor.update( { [`${fieldName}`]: value } );
-    });    
+    });

  }

--- a/modules/malefices-roll-dialog.js
+++ b/modules/malefices-roll-dialog.js
@ -7,10 +7,10 @@ export class MaleficesRollDialog extends Dialog {

    let options = { classes: ["MaleficesDialog"], width: 540, height: 'fit-content', 'z-index': 99999 }
    let html
-    if (rollData.attr && rollData.attr.iscard)  {
-      html = await renderTemplate('systems/fvtt-malefices/templates/dialogs/confrontation-dialog.hbs', rollData);
+    if (rollData?.attr?.iscard)  {
+      html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-malefices/templates/dialogs/confrontation-dialog.hbs', rollData);
    } else {
-      html = await renderTemplate('systems/fvtt-malefices/templates/dialogs/roll-dialog-generic.hbs', rollData);
+      html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-malefices/templates/dialogs/roll-dialog-generic.hbs', rollData);
    }

    return new MaleficesRollDialog(actor, rollData, html, options);
@ -18,7 +18,7 @@ export class MaleficesRollDialog extends Dialog {

  /* -------------------------------------------- */
  constructor(actor, rollData, html, options, close = undefined) {
-    let isCard = rollData.attr && rollData.attr.iscard
+    let isCard = rollData?.attr?.iscard
    let conf = {
      title: (isCard) ? "Jet" : "Tirage",
      content: html,
@ -45,7 +45,7 @@ export class MaleficesRollDialog extends Dialog {

  /* -------------------------------------------- */
  roll() {
-    let isCard = this.rollData.attr && this.rollData.attr.iscard
+    let isCard = this.rollData?.attr?.iscard
    if (isCard) {
      MaleficesUtility.tirageConfrontationMalefices(this.rollData)
    } else {
@ -64,7 +64,6 @@ export class MaleficesRollDialog extends Dialog {
  activateListeners(html) {
    super.activateListeners(html);

-    var dialog = this;
    function onLoad() {
    }
    $(function () { onLoad(); });
@ -87,6 +86,6 @@ export class MaleficesRollDialog extends Dialog {
    html.find('#confrontationModif').change((event) => {
      this.rollData.confrontationModif = Number(event.currentTarget.value)
    })
-    
+
  }
 }
--- a/modules/malefices-summary-app.js
+++ b/modules/malefices-summary-app.js
@ -5,24 +5,29 @@ import { MaleficesUtility } from "./malefices-utility.js";
 export class MaleficesCharacterSummary extends Application {

  /* -------------------------------------------- */
-  static displayPCSummary(){
-    game.system.malefices.charSummary.render(true)
+  static displayPCSummary() {
+    if (game.user.isGM) {
+      game.system.malefices.charSummary.render(true)
+    } else {
+      ui.notifications.info("Commande /tirage réservée au MJ !")
+    }
  }
+
  /* -------------------------------------------- */
-  updatePCSummary(){
-    if ( this.rendered) {
+  updatePCSummary() {
+    if (this.rendered) {
      this.render(true)
    }
  }
-   
+
  /* -------------------------------------------- */
  static createSummaryPos() {
    return { top: 200, left: 200 };
  }
-  
+
  /* -------------------------------------------- */
  static ready() {
-    if ( !game.user.isGM ) { // Uniquement si GM
+    if (!game.user.isGM) { // Uniquement si GM
      return
    }
    let charSummary = new MaleficesCharacterSummary()
@ -38,7 +43,7 @@ export class MaleficesCharacterSummary extends Application {

  /* -------------------------------------------- */
  static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
      template: "systems/fvtt-malefices/templates/dialogs/character-summary.hbs",
      popOut: true,
      resizable: true,
@ -51,14 +56,14 @@ export class MaleficesCharacterSummary extends Application {
  getData() {
    let formData = super.getData();

-    formData.pcs = game.actors.filter( ac => ac.type == "personnage" && ac.hasPlayerOwner )
+    formData.pcs = game.actors.filter(ac => ac.type == "personnage" && ac.hasPlayerOwner)
    formData.npcs = []
    let newList = []
-    let toUpdate = false    
-    for( let actorId of this.settings.npcList ) {
+    let toUpdate = false
+    for (let actorId of this.settings.npcList) {
      let actor = game.actors.get(actorId)
      if (actor) {
-        formData.npcs.push( actor )
+        formData.npcs.push(actor)
        newList.push(actorId)
      } else {
        toUpdate = true
@ -66,7 +71,7 @@ export class MaleficesCharacterSummary extends Application {
    }
    formData.config = game.system.malefices.config

-    if ( toUpdate ) {
+    if (toUpdate) {
      this.settings.npcList = newList
      //console.log("Going to update ...", this.settings)
      game.settings.set("world", "character-summary-data", this.settings)
@ -79,21 +84,21 @@ export class MaleficesCharacterSummary extends Application {
  updateNPC() {
    game.settings.set("world", "character-summary-data", game.system.malefices.charSummary.settings)
    game.system.malefices.charSummary.close()
-    setTimeout( function() { game.system.malefices.charSummary.render(true)}, 500)
+    setTimeout(function () { game.system.malefices.charSummary.render(true) }, 500)
  }

  /* -------------------------------------------- */
  async _onDrop(event) {
    //console.log("Dragged data are : ", dragData)
    let data = event.dataTransfer.getData('text/plain')
-    let dataItem = JSON.parse( data)
+    let dataItem = JSON.parse(data)
    let actor = fromUuidSync(dataItem.uuid)
    if (actor) {
-      game.system.malefices.charSummary.settings.npcList.push( actor.id )
+      game.system.malefices.charSummary.settings.npcList.push(actor.id)
      game.system.malefices.charSummary.updateNPC()
-      
+
    } else {
-      ui.notifications.warn( "Pas d'acteur trouvé" )
+      ui.notifications.warn("Pas d'acteur trouvé")
    }
  }

@ -124,6 +129,6 @@ export class MaleficesCharacterSummary extends Application {
      game.system.malefices.charSummary.updateNPC()
    })

- }
+  }

 }
--- a/modules/malefices-tirage-tarot-dialog.js
+++ b/modules/malefices-tirage-tarot-dialog.js
@ -6,7 +6,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
  static async create(actor, tirageData) {

    let options = { classes: ["MaleficesDialog"], width: 720, height: 740, 'z-index': 99999 };
-    let html = await renderTemplate('systems/fvtt-malefices/templates/dialogs/tirage-tarot-dialog.hbs', tirageData);
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-malefices/templates/dialogs/tirage-tarot-dialog.hbs', tirageData);

    return new MaleficesTirageTarotDialog(actor, tirageData, html, options);
  }
@ -36,7 +36,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
  async sendCardRequest() {
    this.tirageData.state = 'waiting-user-card'
    let msg = await MaleficesUtility.createChatMessage(this.tirageData.user.name, "useronly", {
-      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/request-tarot-card.hbs`, this.tirageData) 
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/request-tarot-card.hbs`, this.tirageData)
    })
    //msg.setFlag("world", "tirage-data", this.tirageData)
    console.log("MSG IS", msg)
@ -50,7 +50,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
    if ( selectedCard.system.isdualside) { // Cas des cartes pouvant avoir 2 sens
      selectedCard.system.ispositif = (Math.random() > 0.5)
    }
-    console.log("CARD SELECTED:", selectedCard)  
+    console.log("CARD SELECTED:", selectedCard)
    // Cas spécial de la Roue de la Fortune
    if ( selectedCard.name.toLowerCase().includes("fortune")) {
      this.tirageData.maxPlayerCard += 1
@ -63,7 +63,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
      }
    }
    this.tirageData.deck = newList
-    
+
    return selectedCard
  }

@ -74,9 +74,9 @@ export class MaleficesTirageTarotDialog extends Dialog {
    let selectedCard = this.drawCard()
    selectedCard.system.isgm = false
    await MaleficesUtility.createChatMessage(this.tirageData.user.name, "gmroll", {
-      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard)
    })
-    if (this.tirageData.cards[0].name == "???") {    
+    if (this.tirageData.cards[0].name == "???") {
      this.tirageData.cards.shift()
    }
    this.tirageData.cards.push(selectedCard)
@ -87,14 +87,14 @@ export class MaleficesTirageTarotDialog extends Dialog {
        let selectedCard = this.drawCard()
        selectedCard.system.isgm = true
        await MaleficesUtility.createChatMessage(this.tirageData.user.name, "blindroll", {
-          content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
+          content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard)
        })
-        if (this.tirageData.secretCards[0].name == "???") {    
+        if (this.tirageData.secretCards[0].name == "???") {
          this.tirageData.secretCards.shift()
        }
        this.tirageData.secretCards.push(selectedCard)
      }
-      this.tirageData.actors = duplicate(game.actors)
+      this.tirageData.actors = foundry.utils.duplicate(game.actors)
      this.tirageData.state = 'attribute-to-actor'
    }else {
      this.sendCardRequest()
@ -124,7 +124,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
  }
  /* -------------------------------------------- */
  async refreshDialog() {
-    const content = await renderTemplate("systems/fvtt-malefices/templates/dialogs/tirage-tarot-dialog.hbs", this.tirageData)
+    const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-malefices/templates/dialogs/tirage-tarot-dialog.hbs", this.tirageData)
    this.data.content = content
    this.render(true)
  }
@ -133,7 +133,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
  activateListeners(html) {
    super.activateListeners(html);

-    var dialog = this;
+    let dialog = this;
    function onLoad() {
    }
    $(function () { onLoad(); });
@ -150,6 +150,6 @@ export class MaleficesTirageTarotDialog extends Dialog {
        dialog.attributeToActor(actorId)
      }
    })
-        
+
  }
 }
--- a/modules/malefices-utility.js
+++ b/modules/malefices-utility.js
@ -5,18 +5,18 @@ import { MaleficesCommands } from "./malefices-commands.js";
 /* -------------------------------------------- */
 export class MaleficesUtility {

-
  /* -------------------------------------------- */
  static async init() {
    Hooks.on('renderChatLog', (log, html, data) => MaleficesUtility.chatListeners(html));
-    /*Hooks.on("dropCanvasData", (canvas, data) => {
-      MaleficesUtility.dropItemOnToken(canvas, data)
-    });*/

    this.rollDataStore = {}
    this.defenderStore = {}

    MaleficesCommands.init();
+  }
+
+  /* -------------------------------------------- */
+  static async ready() {

    Handlebars.registerHelper('count', function (list) {
      return list.length;
@ -43,6 +43,14 @@ export class MaleficesUtility {
    Handlebars.registerHelper('add', function (a, b) {
      return parseInt(a) + parseInt(b);
    })
+    // Handle v12 removal of this helper
+    Handlebars.registerHelper('select', function (selected, options) {
+      const escapedValue = RegExp.escape(Handlebars.escapeExpression(selected));
+      const rgx = new RegExp(' value=[\"\']' + escapedValue + '[\"\']');
+      const html = options.fn(this);
+      return html.replace(rgx, "$& selected");
+    });
+

    game.settings.register("world", "character-summary-data", {
      name: "character-summary-data",
@ -51,6 +59,10 @@ export class MaleficesUtility {
      default: { npcList: [], x: 200, y: 200 },
      type: Object
    })
+
+    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
+    this.tarots = tarots.map(i => i.toObject())
+
  }

  /*-------------------------------------------- */
@ -61,17 +73,10 @@ export class MaleficesUtility {

  /*-------------------------------------------- */
  static getTarots() {
-    return duplicate(this.tarots)
+    return foundry.utils.duplicate(this.tarots)
  }
  static getTarot(tId) {
-    return  this.tarots.find(t => t._id == tId)
-  }
-
-  /* -------------------------------------------- */
-  static async ready() {
-    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
-    this.tarots = tarots.map(i => i.toObject())
-
+    return this.tarots.find(t => t._id == tId)
  }

  /* -------------------------------------------- */
@ -102,14 +107,14 @@ export class MaleficesUtility {
    if (game.user.isGM) {
      game.system.malefices.currentTirage.addCard(msgId)
    } else {
-      game.socket.emit( "system.fvtt-malefices", {name: "msg-draw-card", data: {msgId: msgId}})
+      game.socket.emit("system.fvtt-malefices", { name: "msg-draw-card", data: { msgId: msgId } })
    }
  }

  /* -------------------------------------------- */
  static async chatListeners(html) {

-    html.on("click", '.roll-destin', event => {
+    $(html).on("click", '.roll-destin', event => {
      let messageId = MaleficesUtility.findChatMessageId(event.currentTarget)
      let message = game.messages.get(messageId)
      let rollData = message.getFlag("world", "rolldata")
@ -118,11 +123,11 @@ export class MaleficesUtility {
      rollData.isReroll = true
      this.rollMalefices(rollData)
    })
-    html.on("click", '.draw-tarot-card', event => {
+    $(html).on("click", '.draw-tarot-card', event => {
      let messageId = MaleficesUtility.findChatMessageId(event.currentTarget)
      this.drawDeckCard(messageId)
    })
-    
+
  }

  /* -------------------------------------------- */
@ -133,7 +138,7 @@ export class MaleficesUtility {
      'systems/fvtt-malefices/templates/items/partial-item-nav.hbs',
      'systems/fvtt-malefices/templates/items/partial-item-description.hbs'
    ]
-    return loadTemplates(templatePaths);
+    return foundry.applications.handlebars.loadTemplates(templatePaths);
  }

  /* -------------------------------------------- */
@ -199,7 +204,7 @@ export class MaleficesUtility {

    let id = rollData.rollId
    let oldRollData = this.rollDataStore[id] || {}
-    let newRollData = mergeObject(oldRollData, rollData)
+    let newRollData = foundry.utils.mergeObject(oldRollData, rollData)
    this.rollDataStore[id] = newRollData
  }

@ -207,7 +212,7 @@ export class MaleficesUtility {
  static async onSocketMesssage(msg) {
    console.log("SOCKET MESSAGE", msg.name)
    if (msg.name == "msg-draw-card") {
-      if ( game.user.isGM && game.system.malefices.currentTirage) {
+      if (game.user.isGM && game.system.malefices.currentTirage) {
        game.system.malefices.currentTirage.addCard(msg.data.msgId)
      }
    }
@ -274,71 +279,79 @@ export class MaleficesUtility {
  /* -------------------------------------------- */
  static processSpecialCard(actor, rollData) {
    if (rollData.selectedCard.name.toLowerCase().includes("archange")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("archange"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("archange"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "gmroll", {
-          content: `Conséquence supplémentaire ! <br>L'Archange : ${actor.name} gagne 1 point de Spiritualité.` })
+          content: `Conséquence supplémentaire ! <br>L'Archange : ${actor.name} gagne 1 point de Spiritualité.`
+        })
        actor.incDecAttr("spiritualite", 1)
      }
    }
    if (rollData.selectedCard.name.toLowerCase().includes("vicaire")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("vicaire"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("vicaire"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "blindroll", {
-          content: `Conséquence supplémentaire ! <br>Le Vicaire : ${actor.name} vient de gagner 1 point en Pratique de la Magie Blanche (MPMB, secret).` })
+          content: `Conséquence supplémentaire ! <br>Le Vicaire : ${actor.name} vient de gagner 1 point en Pratique de la Magie Blanche (MPMB, secret).`
+        })
        actor.incDecMPMB(1)
      }
    }
    if (rollData.selectedCard.name.toLowerCase().includes("chance")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("chance"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("chance"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "gmroll", {
-          content: `Conséquence supplémentaire ! <br>La Chance : ${actor.name} a gagné 1 point de Destin.` })
+          content: `Conséquence supplémentaire ! <br>La Chance : ${actor.name} a gagné 1 point de Destin.`
+        })
        actor.incDecDestin(1)
      }
    }
    if (rollData.selectedCard.name.toLowerCase().includes("mort")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("mort"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("mort"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "gmroll", {
-          content: `Conséquence supplémentaire ! <br>La Mort : ${actor.name} est pétrifié par la peur.` })
+          content: `Conséquence supplémentaire ! <br>La Mort : ${actor.name} est pétrifié par la peur.`
+        })
        actor.incDecDestin(1)
      }
    }
    if (rollData.selectedCard.name.toLowerCase().includes("diable")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("diable"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("diable"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "gmroll", {
-          content: `Conséquence supplémentaire ! <br>Le Diable : ${actor.name} gagne 1 point de Rationnalité.` })
+          content: `Conséquence supplémentaire ! <br>Le Diable : ${actor.name} gagne 1 point de Rationnalité.`
+        })
        actor.incDecAttr("rationnalite", 1)
      }
    }
    if (rollData.selectedCard.name.toLowerCase().includes("lune noire")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("lune noire"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("lune noire"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "blindroll", {
-          content: `Conséquence supplémentaire ! <br>La Lune Noire : ${actor.name} vient de gagner 1 point de Fluide (secret).` })
+          content: `Conséquence supplémentaire ! <br>La Lune Noire : ${actor.name} vient de gagner 1 point de Fluide (secret).`
+        })
        actor.incDecFluide(1)
      }
    }
    if (rollData.selectedCard.name.toLowerCase().includes("grand livre")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("grand livre"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("grand livre"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "blindroll", {
-          content: `Conséquence supplémentaire ! <br>La Lune Noire : ${actor.name} vient de gagner 1 point de Fluide (secret).` })
+          content: `Conséquence supplémentaire ! <br>La Lune Noire : ${actor.name} vient de gagner 1 point de Fluide (secret).`
+        })
        actor.incDecFluide(1)
      }
    }
    if (rollData.selectedCard.name.toLowerCase().includes("sorcier")) {
-      let actorCard = actor.items.find( c => c.type =="tarot" && c.name.toLowerCase().includes("sorcier"))
+      let actorCard = actor.items.find(c => c.type == "tarot" && c.name.toLowerCase().includes("sorcier"))
      if (actorCard) {
        MaleficesUtility.createChatMessage(actor.name, "blindroll", {
-          content: `Conséquence supplémentaire ! <br>Le Vicaire : ${actor.name} vient de gagner 1 point en Pratique de la Magie Noire (MPMN, secret).` })
+          content: `Conséquence supplémentaire ! <br>Le Vicaire : ${actor.name} vient de gagner 1 point en Pratique de la Magie Noire (MPMN, secret).`
+        })
        actor.incDecMPMN(1)
      }
    }

-  }  
+  }

  /* -------------------------------------------- */
  static computeResults(rollData) {
@ -365,30 +378,30 @@ export class MaleficesUtility {
    rollData.target = rollData.attr.value - rollData.confrontationDegre + rollData.confrontationModif

    let deck = this.getTarots()
-    let index = Math.round(Math.random() * (deck.length-1))
+    let index = Math.round(Math.random() * (deck.length - 1))
    let selectedCard = deck[index]
    selectedCard.system.ispositif = (Math.random() > 0.5)
-    selectedCard.value = (selectedCard.system.ispositif)? selectedCard.system.numericvalueup : selectedCard.system.numericvaluedown
+    selectedCard.value = (selectedCard.system.ispositif) ? selectedCard.system.numericvalueup : selectedCard.system.numericvaluedown
    rollData.total = selectedCard.value
    rollData.selectedCard = selectedCard
    await MaleficesUtility.createChatMessage(actor.name, "gmroll", {
-      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard)
    })

    this.computeResults(rollData)

    if (rollData.isSuccess) {
-      rollData.gainAttr = Math.ceil(rollData.confrontationDegre/2) + ((rollData.isCritical ) ? 1 : 0)
-      actor.incDecAttr(rollData.attr.abbrev, rollData.gainAttr )
+      rollData.gainAttr = Math.ceil(rollData.confrontationDegre / 2) + ((rollData.isCritical) ? 1 : 0)
+      actor.incDecAttr(rollData.attr.abbrev, rollData.gainAttr)
    } else {
      rollData.gainAttr = rollData.confrontationDegre
-      actor.incDecAttr(rollData.attr.abbrev, -rollData.gainAttr )
+      actor.incDecAttr(rollData.attr.abbrev, -rollData.gainAttr)
    }

    await MaleficesUtility.createChatMessage(actor.name, "gmroll", {
-      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/chat-confrontation-result.hbs`, rollData) 
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/chat-confrontation-result.hbs`, rollData)
    })
-    this.processSpecialCard(actor, rollData)  
+    this.processSpecialCard(actor, rollData)
  }
  /* -------------------------------------------- */
  static async rollMalefices(rollData) {
@ -405,15 +418,15 @@ export class MaleficesUtility {

    // Performs roll
    console.log("Roll formula", diceFormula)
-    let myRoll = new Roll(diceFormula).roll({ async: false })
+    let myRoll = await new Roll(diceFormula).roll()
    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = myRoll
+    rollData.roll = foundry.utils.duplicate(myRoll)
    rollData.total = myRoll.total

    this.computeResults(rollData)

    let msg = await this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/chat-generic-result.hbs`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-malefices/templates/chat/chat-generic-result.hbs`, rollData)
    })
    msg.setFlag("world", "rolldata", rollData)
    if (rollData.mode == "initiative") {
@ -465,7 +478,7 @@ export class MaleficesUtility {

  /* -------------------------------------------- */
  static blindMessageToGM(chatOptions) {
-    let chatGM = duplicate(chatOptions);
+    let chatGM = foundry.utils.duplicate(chatOptions);
    chatGM.whisper = this.getUsers(user => user.isGM);
    chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
    console.log("blindMessageToGM", chatGM);
@ -515,7 +528,7 @@ export class MaleficesUtility {
  /* -------------------------------------------- */
  static getBasicRollData() {
    let rollData = {
-      rollId: randomID(16),
+      rollId: foundry.utils.randomID(16),
      bonusMalusPerso: 0,
      bonusMalusSituation: 0,
      bonusMalusDef: 0,
--- a/packs/malefices-archetypes/000033.ldb
+++ b/packs/malefices-archetypes/000033.ldb
--- a/packs/malefices-archetypes/000035.log
+++ b/packs/malefices-archetypes/000035.log
--- a/packs/malefices-archetypes/CURRENT
+++ b/packs/malefices-archetypes/CURRENT
@ -0,0 +1 @@
+MANIFEST-000034
--- a/packs/malefices-archetypes/LOCK
+++ b/packs/malefices-archetypes/LOCK
--- a/packs/malefices-archetypes/LOG
+++ b/packs/malefices-archetypes/LOG
@ -0,0 +1,3 @@
+2025/05/01-00:13:13.266834 7efc4dffb6c0 Recovering log #31
+2025/05/01-00:13:13.321299 7efc4dffb6c0 Delete type=3 #29
+2025/05/01-00:13:13.321436 7efc4dffb6c0 Delete type=0 #31
--- a/packs/malefices-archetypes/LOG.old
+++ b/packs/malefices-archetypes/LOG.old
@ -0,0 +1,14 @@
+2024/11/29-17:51:13.272607 7f11d37fe6c0 Recovering log #28
+2024/11/29-17:51:13.282971 7f11d37fe6c0 Delete type=0 #28
+2024/11/29-17:51:13.283067 7f11d37fe6c0 Delete type=3 #27
+2024/11/29-17:51:44.217520 7f11d27fc6c0 Level-0 table #32: started
+2024/11/29-17:51:44.221106 7f11d27fc6c0 Level-0 table #32: 50651 bytes OK
+2024/11/29-17:51:44.227128 7f11d27fc6c0 Delete type=0 #30
+2024/11/29-17:51:44.256008 7f11d27fc6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at '!items!xtYE2kVIfNtrXSoU' @ 46 : 1
+2024/11/29-17:51:44.256025 7f11d27fc6c0 Compacting 2@0 + 0@1 files
+2024/11/29-17:51:44.260729 7f11d27fc6c0 Generated table #33@0: 23 keys, 50651 bytes
+2024/11/29-17:51:44.260747 7f11d27fc6c0 Compacted 2@0 + 0@1 files => 50651 bytes
+2024/11/29-17:51:44.266718 7f11d27fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
+2024/11/29-17:51:44.266853 7f11d27fc6c0 Delete type=2 #22
+2024/11/29-17:51:44.267043 7f11d27fc6c0 Delete type=2 #32
+2024/11/29-17:51:44.297135 7f11d27fc6c0 Manual compaction at level-0 from '!items!xtYE2kVIfNtrXSoU' @ 46 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)
--- a/packs/malefices-archetypes/MANIFEST-000034
+++ b/packs/malefices-archetypes/MANIFEST-000034
--- a/packs/malefices-archetypes/lost/000024.log
+++ b/packs/malefices-archetypes/lost/000024.log
--- a/packs/malefices-archetypes/lost/000025.log
+++ b/packs/malefices-archetypes/lost/000025.log
--- a/packs/malefices-archetypes/lost/MANIFEST-000023
+++ b/packs/malefices-archetypes/lost/MANIFEST-000023
--- a/packs/malefices-armes/000033.ldb
+++ b/packs/malefices-armes/000033.ldb
--- a/packs/malefices-armes/000035.log
+++ b/packs/malefices-armes/000035.log
--- a/packs/malefices-armes/CURRENT
+++ b/packs/malefices-armes/CURRENT
@ -0,0 +1 @@
+MANIFEST-000034
--- a/packs/malefices-armes/LOCK
+++ b/packs/malefices-armes/LOCK
--- a/packs/malefices-armes/LOG
+++ b/packs/malefices-armes/LOG
@ -0,0 +1,3 @@
+2025/05/01-00:13:13.203817 7efc4effd6c0 Recovering log #31
+2025/05/01-00:13:13.258580 7efc4effd6c0 Delete type=3 #29
+2025/05/01-00:13:13.258656 7efc4effd6c0 Delete type=0 #31
--- a/packs/malefices-armes/LOG.old
+++ b/packs/malefices-armes/LOG.old
@ -0,0 +1,14 @@
+2024/11/29-17:51:13.259713 7f11d2ffd6c0 Recovering log #28
+2024/11/29-17:51:13.269307 7f11d2ffd6c0 Delete type=0 #28
+2024/11/29-17:51:13.269361 7f11d2ffd6c0 Delete type=3 #27
+2024/11/29-17:51:44.227241 7f11d27fc6c0 Level-0 table #32: started
+2024/11/29-17:51:44.230288 7f11d27fc6c0 Level-0 table #32: 2091 bytes OK
+2024/11/29-17:51:44.237280 7f11d27fc6c0 Delete type=0 #30
+2024/11/29-17:51:44.267165 7f11d27fc6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at '!items!nkRQU81L1gWOfaeo' @ 18 : 1
+2024/11/29-17:51:44.267179 7f11d27fc6c0 Compacting 2@0 + 0@1 files
+2024/11/29-17:51:44.270390 7f11d27fc6c0 Generated table #33@0: 9 keys, 2091 bytes
+2024/11/29-17:51:44.270401 7f11d27fc6c0 Compacted 2@0 + 0@1 files => 2091 bytes
+2024/11/29-17:51:44.276181 7f11d27fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
+2024/11/29-17:51:44.276330 7f11d27fc6c0 Delete type=2 #22
+2024/11/29-17:51:44.276569 7f11d27fc6c0 Delete type=2 #32
+2024/11/29-17:51:44.297146 7f11d27fc6c0 Manual compaction at level-0 from '!items!nkRQU81L1gWOfaeo' @ 18 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)
--- a/packs/malefices-armes/MANIFEST-000034
+++ b/packs/malefices-armes/MANIFEST-000034
--- a/packs/malefices-armes/lost/000024.log
+++ b/packs/malefices-armes/lost/000024.log
--- a/packs/malefices-armes/lost/000025.log
+++ b/packs/malefices-armes/lost/000025.log
--- a/packs/malefices-armes/lost/MANIFEST-000023
+++ b/packs/malefices-armes/lost/MANIFEST-000023
--- a/packs/malefices-macros.db
+++ b/packs/malefices-macros.db
@ -0,0 +1,3 @@
+{"name":"Résumé des PJs pour le MJ","type":"chat","scope":"global","author":"R9gIh86vXDB4IFn1","img":"systems/fvtt-malefices/images/icons/resume.webp","command":"/resume","flags":{"core":{"sourceId":"Macro.ulj2PgchTQVE1VV4"}},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.1.1","coreVersion":"10.291","createdTime":1677422022018,"modifiedTime":1677422143283,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"folder":null,"sort":0,"_id":"ESV4er8Hy6liMOC3"}
+{"name":"Tirage des tarots","type":"chat","scope":"global","author":"R9gIh86vXDB4IFn1","img":"systems/fvtt-malefices/images/icons/tirage.webp","command":"/tirage","flags":{"core":{"sourceId":"Macro.ulj2PgchTQVE1VV4"}},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.1.1","coreVersion":"10.291","createdTime":1677422022018,"modifiedTime":1677422144635,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"folder":null,"sort":0,"_id":"sVKXJsiG9KAaBglV"}
+{"name":"Tirer une carte","type":"chat","command":"/carte","author":"R9gIh86vXDB4IFn1","img":"systems/fvtt-malefices/images/icons/tirer.webp","scope":"global","flags":{"core":{"sourceId":"Macro.P2dPA3CA5ZjOwDeE"}},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.1.1","coreVersion":"10.291","createdTime":1677421496447,"modifiedTime":1677422146138,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"folder":null,"sort":0,"_id":"zDPgmHiwNxBWhoYz"}
--- a/packs/malefices-macros/000033.ldb
+++ b/packs/malefices-macros/000033.ldb
--- a/packs/malefices-macros/000035.log
+++ b/packs/malefices-macros/000035.log
--- a/packs/malefices-macros/CURRENT
+++ b/packs/malefices-macros/CURRENT
@ -0,0 +1 @@
+MANIFEST-000034
--- a/packs/malefices-macros/LOCK
+++ b/packs/malefices-macros/LOCK
--- a/packs/malefices-macros/LOG
+++ b/packs/malefices-macros/LOG
@ -0,0 +1,3 @@
+2025/05/01-00:13:13.328666 7efc4f7fe6c0 Recovering log #31
+2025/05/01-00:13:13.380625 7efc4f7fe6c0 Delete type=3 #29
+2025/05/01-00:13:13.380738 7efc4f7fe6c0 Delete type=0 #31
--- a/packs/malefices-macros/LOG.old
+++ b/packs/malefices-macros/LOG.old
@ -0,0 +1,14 @@
+2024/11/29-17:51:13.287438 7f11d3fff6c0 Recovering log #28
+2024/11/29-17:51:13.297962 7f11d3fff6c0 Delete type=0 #28
+2024/11/29-17:51:13.298081 7f11d3fff6c0 Delete type=3 #27
+2024/11/29-17:51:44.237485 7f11d27fc6c0 Level-0 table #32: started
+2024/11/29-17:51:44.240689 7f11d27fc6c0 Level-0 table #32: 851 bytes OK
+2024/11/29-17:51:44.246485 7f11d27fc6c0 Delete type=0 #30
+2024/11/29-17:51:44.276713 7f11d27fc6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1
+2024/11/29-17:51:44.276731 7f11d27fc6c0 Compacting 2@0 + 0@1 files
+2024/11/29-17:51:44.280157 7f11d27fc6c0 Generated table #33@0: 3 keys, 851 bytes
+2024/11/29-17:51:44.280180 7f11d27fc6c0 Compacted 2@0 + 0@1 files => 851 bytes
+2024/11/29-17:51:44.287399 7f11d27fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
+2024/11/29-17:51:44.287547 7f11d27fc6c0 Delete type=2 #22
+2024/11/29-17:51:44.287718 7f11d27fc6c0 Delete type=2 #32
+2024/11/29-17:51:44.297154 7f11d27fc6c0 Manual compaction at level-0 from '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)
--- a/packs/malefices-macros/MANIFEST-000034
+++ b/packs/malefices-macros/MANIFEST-000034
--- a/packs/malefices-macros/lost/000024.log
+++ b/packs/malefices-macros/lost/000024.log
--- a/packs/malefices-macros/lost/000025.log
+++ b/packs/malefices-macros/lost/000025.log
--- a/packs/malefices-macros/lost/MANIFEST-000023
+++ b/packs/malefices-macros/lost/MANIFEST-000023
--- a/packs/malefices-tarots/000033.ldb
+++ b/packs/malefices-tarots/000033.ldb
--- a/packs/malefices-tarots/000035.log
+++ b/packs/malefices-tarots/000035.log
--- a/packs/malefices-tarots/CURRENT
+++ b/packs/malefices-tarots/CURRENT
@ -0,0 +1 @@
+MANIFEST-000034
--- a/packs/malefices-tarots/LOCK
+++ b/packs/malefices-tarots/LOCK
--- a/packs/malefices-tarots/LOG
+++ b/packs/malefices-tarots/LOG
@ -0,0 +1,3 @@
+2025/05/01-00:13:13.144691 7efc4e7fc6c0 Recovering log #31
+2025/05/01-00:13:13.196169 7efc4e7fc6c0 Delete type=3 #29
+2025/05/01-00:13:13.196332 7efc4e7fc6c0 Delete type=0 #31
--- a/packs/malefices-tarots/LOG.old
+++ b/packs/malefices-tarots/LOG.old
@ -0,0 +1,14 @@
+2024/11/29-17:51:13.246162 7f11d8ffa6c0 Recovering log #28
+2024/11/29-17:51:13.256519 7f11d8ffa6c0 Delete type=0 #28
+2024/11/29-17:51:13.256622 7f11d8ffa6c0 Delete type=3 #27
+2024/11/29-17:51:44.246559 7f11d27fc6c0 Level-0 table #32: started
+2024/11/29-17:51:44.249606 7f11d27fc6c0 Level-0 table #32: 4001 bytes OK
+2024/11/29-17:51:44.255805 7f11d27fc6c0 Delete type=0 #30
+2024/11/29-17:51:44.287848 7f11d27fc6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at '!items!zbGGMEQFdwVdlKAf' @ 44 : 1
+2024/11/29-17:51:44.287866 7f11d27fc6c0 Compacting 2@0 + 0@1 files
+2024/11/29-17:51:44.291002 7f11d27fc6c0 Generated table #33@0: 22 keys, 4001 bytes
+2024/11/29-17:51:44.291025 7f11d27fc6c0 Compacted 2@0 + 0@1 files => 4001 bytes
+2024/11/29-17:51:44.296891 7f11d27fc6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
+2024/11/29-17:51:44.296997 7f11d27fc6c0 Delete type=2 #22
+2024/11/29-17:51:44.297082 7f11d27fc6c0 Delete type=2 #32
+2024/11/29-17:51:44.297163 7f11d27fc6c0 Manual compaction at level-0 from '!items!zbGGMEQFdwVdlKAf' @ 44 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)
--- a/packs/malefices-tarots/MANIFEST-000034
+++ b/packs/malefices-tarots/MANIFEST-000034
--- a/packs/malefices-tarots/lost/000024.log
+++ b/packs/malefices-tarots/lost/000024.log
--- a/packs/malefices-tarots/lost/000025.log
+++ b/packs/malefices-tarots/lost/000025.log
--- a/packs/malefices-tarots/lost/MANIFEST-000023
+++ b/packs/malefices-tarots/lost/MANIFEST-000023
--- a/styles/simple.css
+++ b/styles/simple.css
@ -1,63 +1,63 @@
-  /* ==================== (A) Fonts ==================== */
-  @font-face {
-    font-family: "Rivanna";
-    src: url('../fonts/rivanna.ttf') format("truetype");
-  }
-  
-  :root {
-  /* =================== 1. ACTOR SHEET FONT STYLES =========== */
-    --window-header-title-font-size: 1.3rem;
-    --window-header-title-font-weight: normal;
-    --window-header-title-color: #f5f5f5;
+/* ==================== (A) Fonts ==================== */
+@font-face {
+  font-family: "Rivanna";
+  src: url('../fonts/rivanna.ttf') format("truetype");
+}

-    --major-button-font-size: 1.05rem;
-    --major-button-font-weight: normal;
-    --major-button-color: #dadada;
+:root {
+/* =================== 1. ACTOR SHEET FONT STYLES =========== */
+  --window-header-title-font-size: 1.3rem;
+  --window-header-title-font-weight: normal;
+  --window-header-title-color: #f5f5f5;

-    --tab-header-font-size: 1.0rem;
-    --tab-header-font-weight: 700;
-    --tab-header-color: #403f3e;
-    --tab-header-color-active: #4a0404;
+  --major-button-font-size: 1.05rem;
+  --major-button-font-weight: normal;
+  --major-button-color: #dadada;

-    --actor-input-font-size: 0.8rem;
-    --actor-input-font-weight: 500;
-    --actor-input-color: black;
+  --tab-header-font-size: 1.0rem;
+  --tab-header-font-weight: 700;
+  --tab-header-color: #403f3e;
+  --tab-header-color-active: #4a0404;

-    --actor-label-font-size: 0.8rem;
-    --actor-label-font-weight: 700;
-    --actor-label-color: #464331c4;
+  --actor-input-font-size: 0.8rem;
+  --actor-input-font-weight: 500;
+  --actor-input-color: black;

-  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
-    --debug-background-color-red: #ff000054;
-    --debug-background-color-blue: #1d00ff54;
-    --debug-background-color-green: #54ff0054;
+  --actor-label-font-size: 0.8rem;
+  --actor-label-font-weight: 700;
+  --actor-label-color: #464331c4;

-    --debug-box-shadow-red: inset 0 0 2px red;
-    --debug-box-shadow-blue: inset 0 0 2px blue;
-    --debug-box-shadow-green: inset 0 0 2px green;
-  }
+/* =================== 2. DEBUGGING HIGHLIGHTERS ============ */
+  --debug-background-color-red: #ff000054;
+  --debug-background-color-blue: #1d00ff54;
+  --debug-background-color-green: #54ff0054;
+
+  --debug-box-shadow-red: inset 0 0 2px red;
+  --debug-box-shadow-blue: inset 0 0 2px blue;
+  --debug-box-shadow-green: inset 0 0 2px green;
+}

 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
 /* Global styles & Font */
-.window-app {
-  text-align: justify;
-  font-size: 16px;
-  letter-spacing: 1px;
+.fvtt-malefices .window-app {
+text-align: justify;
+font-size: 16px;
+letter-spacing: 1px;
 }

 /* Fonts */
 .sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item {
-  font-size: 1.0rem;
+font-size: 1.0rem;
 } /* For title, sidebar character and scene */
-.sheet nav.sheet-tabs {
-  font-size: 0.8rem;
+.fvtt-malefices .sheet nav.sheet-tabs {
+font-size: 0.8rem;
 } /* For nav and title */
 .window-app input, .fvtt-malefices .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
-  font-size: 0.8rem;
+font-size: 0.8rem;
 }

 .window-header{
-  background: rgba(0,0,0,0.75);
+background: rgba(0,0,0,0.75);
 }

 .window-app.sheet .window-content {
@ -235,6 +235,11 @@ table {border: 1px solid #7a7971;}
  object-position: 50% 0;
  border-width: 0px;
 }
+.profile-img-container {
+  margin-right: 0.2rem;
+  max-width: 140px;
+  width: 140px;
+}

 .button-img {
  vertical-align: baseline;
@ -396,7 +401,7 @@ li.folder > .folder-header h3 {

 /* ======================================== */
 /* Sheet  */
-.window-app.sheet .window-content .sheet-header{
+.fvtt-malefices .window-app.sheet .window-content .sheet-header{
  color: rgba(19, 18, 18, 0.95);
  background: url("../images/ui/background_01_clear.webp");
  /*background: #494e6b;*/
@ -442,7 +447,7 @@ select {
  margin-left: 2px;
 }

-.window-app .window-content, .window-app.sheet .window-content .sheet-body{
+.fvtt-malefices .window-app .window-content, .fvtt-malefices .window-app.sheet .window-content .sheet-body{
  font-size: 0.8rem;
  /*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/
  background: url("../images/ui/background_01_clear.webp");
@ -460,7 +465,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
  padding: 0;
 }

-.sheet nav.sheet-tabs {
+nav.sheet-tabs {
  font-size: 1.2rem;
  font-weight: bold;
  height: 3rem;
@ -476,11 +481,23 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
  color:beige;
 }

-/*  background: rgb(245,245,240) url("../images/ui/fond4.webp") repeat left top;*/
+/* Dice tray specific overrides */
+.dice-tray button svg * {
+  fill: #6d5923 !important;
+}
+.dice-tray input[type="text"] {
+  color: #6d5923 !important;
+}
+.dice-tray button {
+  color: #6d5923 !important;
+}

 nav.sheet-tabs .item {
  position: relative;
  padding: 0 0.25rem;
+  color:beige;
+  margin-top: 4px;
+  margin-bottom: 4px;
 }

 nav.sheet-tabs .item:after {
@ -490,7 +507,7 @@ nav.sheet-tabs .item:after {
  right: 0;
  height: 2rem;
  width: 1px;
-  border-right: 1px dashed rgba(52, 52, 52, 0.25);
+  /*border-right: 1px dashed rgba(52, 52, 52, 0.25);*/
 }

 .sheet .tab[data-tab] {
@ -721,7 +738,7 @@ ul, li {

 /* ======================================== */
 .tokenhudext {
-	display: flex; 
+	display: flex;
 	flex: 0 !important;
  font-weight: 600;
 }
@ -754,6 +771,10 @@ ul, li {
 #token-hud .status-effects.active{
  z-index: 2;
 }
+.token-sheet .window-content .flexcol .sheet-tabs {
+  font-size: 0.8rem;
+}
+
 /* ======================================== */
 .item-checkbox {
  height: 25px;
@ -773,7 +794,7 @@ ul, li {
 .skill-label {
  font-size: 0.7rem;
 }
-.skill-good-checkbox {  
+.skill-good-checkbox {
  max-height: 10px;
  max-width: 10px;
 }
@ -794,6 +815,9 @@ ul, li {
  color: rgba(19, 18, 18, 0.95);
 }

+#sidebar .scene {
+  color: rgba(237, 240, 199, 0.95);
+}
 /*  background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/

 #sidebar.collapsed {
@ -808,7 +832,7 @@ ul, li {
 .sidebar-tab .directory-list .entity {
    border-top: 1px dashed rgba(0,0,0,0.25);
    border-bottom: 0 none;
-    padding: 0.25rem 0; 
+    padding: 0.25rem 0;
 }

 .sidebar-tab .directory-list .entity:hover {
@ -822,10 +846,10 @@ ul, li {
  text-align: center;
  vertical-align: middle;
  display: flex;
-  align-items: center; 
+  align-items: center;
 }

-.chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to { 
+.chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to {
  font-size: 0.9rem;
 }
 .chat-result-text,
@ -950,8 +974,6 @@ ul, li {
 }

 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
  display: inline-block;
  background-position:center;
  background-size:cover;
@ -995,7 +1017,7 @@ ul, li {
  border-radius: 0px;
 }

-#hotbar .bar-controls {  
+#hotbar .bar-controls {
  background: rgba(30, 25, 20, 1);
  border: 1px solid rgba(72, 46, 28, 1);
 }
@ -1055,7 +1077,7 @@ ul, li {
  top: 1px;
  position: absolute;
  z-index: 1;
-  
+
  /* Fade in tooltip */
  visibility: hidden;
  opacity: 0;
@ -1161,7 +1183,7 @@ ul, li {
  height: 60px;
 }

-.dice-cell {  
+.dice-cell {
  padding-left: 12px;
  padding-right: 12px;
  width: 60px;
@ -1287,7 +1309,7 @@ ul, li {
  flex-wrap: nowrap;
 }
 .item-filler {
-  flex-grow: 6;  
+  flex-grow: 6;
  flex-shrink: 7;
 }
 .item-controls-fixed {
@ -1298,7 +1320,7 @@ ul, li {
  font-weight: bold;
 }
 .flexrow-no-expand {
-  flex-grow: 0;  
+  flex-grow: 0;
 }
 .item-input-small {
  max-width: 16px;
--- a/system.json
+++ b/system.json
@ -3,8 +3,10 @@
  "esmodules": [
    "modules/malefices-main.js"
  ],
-  "gridDistance": 1,
-  "gridUnits": "u",
+  "grid": {
+    "distance": 2,
+    "units": "m"
+  },
  "languages": [
    {
      "lang": "fr",
@ -24,36 +26,56 @@
      "type": "Item",
      "label": "Tarots",
      "name": "malefices-tarots",
-      "path": "packs/malefices-tarots.db",
+      "path": "packs/malefices-tarots",
      "system": "fvtt-malefices",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Armes",
      "name": "malefices-armes",
-      "path": "packs/malefices-armes.db",
+      "path": "packs/malefices-armes",
      "system": "fvtt-malefices",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    },
    {
      "type": "Item",
      "label": "Archetypes",
      "name": "malefices-archetypes",
-      "path": "packs/malefices-archetypes.db",
+      "path": "packs/malefices-archetypes",
      "system": "fvtt-malefices",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
+    },
+    {
+      "type": "Macro",
+      "label": "Macros",
+      "name": "malefices-macros",
+      "path": "packs/malefices-macros",
+      "system": "fvtt-malefices",
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
    }
  ],
  "license": "LICENSE.txt",
  "manifest": "https://www.uberwald.me/gitea/public/fvtt-malefices/raw/branch/master/system.json",
  "compatibility": {
-    "minimum": "10",
-    "verified": "10",
-    "maximum": "10"
+    "minimum": "13",
+    "verified": "13"
  },
  "id": "fvtt-malefices",
  "primaryTokenAttribute": "secondary.health",
@ -64,7 +86,7 @@
  ],
  "title": "Maléfices, le Jeu de Rôle",
  "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "10.0.24",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.24.zip",
+  "version": "13.0.0",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v13.0.0.zip",
  "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }
--- a/template.json
+++ b/template.json
@ -25,6 +25,7 @@
          "religion": "",
          "fantastique": "",
          "description": "",
+          "notes": "",
          "gmnotes": ""
        }
      },
@ -83,7 +84,8 @@
            "value": 0,
            "max": 0
          }
-        }
+        },
+        "equipementlibre": ""
      },
      "npccore": {
        "npctype": "",
@ -131,7 +133,7 @@
      "description": ""
    },
    "arme": {
-      "armetype": 0,
+      "armetype": "",
      "porteecourte": "",
      "porteemoyenne": "",
      "dommagenormale": 0,
--- a/templates/actors/actor-sheet.hbs
+++ b/templates/actors/actor-sheet.hbs
@ -4,7 +4,11 @@
  <header class="sheet-header">
    <div class="header-fields">
      <div class="flexrow">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+
+        <div class="profile-img-container">
+          <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        </div>
+
        <div class="flexcol">
          <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>

@ -41,7 +45,7 @@

    {{!-- Skills Tab --}}
    <div class="tab main" data-group="primary" data-tab="main">
-      
+

      <div class="grid grid-2col">
        <div>
@ -64,12 +68,12 @@
              <input type="text" class="item-field-label-short" name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="Number"/>
              {{#if attr.hasmax}}
                <input type="text" class="item-field-label-short" name="system.attributs.{{key}}.max" value="{{attr.max}}" data-dtype="Number"/>
-              {{/if}}          
+              {{/if}}
              {{#if (eq key "physique")}}
                {{#if @root.phyMalus}}
                  ({{@root.phyMalus}})
                {{/if}}
-              {{/if}}          
+              {{/if}}
            </li>
            {{/each}}

@ -77,7 +81,7 @@
              <span class="item-field-label-long">Points de Destin</span>
              <input type="text" class="item-field-label-short" name="system.pointdestin" value="{{system.pointdestin}}" data-dtype="Number"/>
            </li>
-            
+
            {{#if isGM}}
            <li class="item flexrow list-item">
              <span class="item-field-label-long">Fluide (MJ)</span>
@ -145,6 +149,13 @@
    {{!-- Equipement Tab --}}
    <div class="tab equipements" data-group="primary" data-tab="equipements">

+      <span class="item-name-label-header items-title-bg">
+          <h3><label class="items-title-text">Equipements (saisie libre)</label></h3>
+      </span>
+      <div class="form-group small-editor">
+        {{editor equipementlibre target="system.equipementlibre" button=true owner=owner editable=editable}}
+      </div>
+
      <ul class="item-list alternate-list">
        <li class="item flexrow list-item items-title-bg">
          <span class="item-name-label-header">
@ -160,7 +171,7 @@
            <label class="item-field-label-medium">Critique</label>
          </span>
          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="arme" title="Créer une arme"><i class="fas fa-plus"></i></a>
          </div>
        </li>
        {{#each armes as |arme key|}}
@ -183,14 +194,14 @@
      <ul class="item-list alternate-list">
        <li class="item flexrow list-item items-title-bg">
          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Equipements</label></h3>
+            <h3><label class="items-title-text">Equipements (Items)</label></h3>
          </span>
          <span class="item-field-label-long">
            <label class="short-label">Q.</label>
          </span>
          <div class="item-filler">&nbsp;</div>
          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="equipement" title="Créer un équipement"><i class="fas fa-plus"></i></a>
          </div>

        </li>
@ -218,7 +229,7 @@
          </span>
          <div class="item-filler">&nbsp;</div>
          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="sortilege" title="Créer un Sortilège"><i class="fas fa-plus"></i></a>
          </div>

        </li>
@ -309,7 +320,7 @@
          </ul>
        </div>
      </div>
-  
+
        <ul>
          <li class="item flexrow">
            <label class="generic-label">Position vis-à-vis du fantastique</label>
@ -328,7 +339,7 @@
            <label class="item-field-label-medium">Sens</label>
          </span>
          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="tarot" title="Créer une lame de tarot"><i class="fas fa-plus"></i></a>
          </div>
        </li>
        {{#each tarots as |tarot key|}}
@ -357,7 +368,7 @@
            <label class="item-field-label-medium">Sens</label>
          </span>
          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="tarot" title="Créer une lame de Tarot (secret)"><i class="fas fa-plus"></i></a>
          </div>
        </li>
        {{#each tarotsCache as |tarot key|}}
@ -385,8 +396,7 @@
          <h3><label class="items-title-text">Background</label></h3>
      </span>
      <div class="form-group editor">
-        {{editor description target="system.biodata.description" button=true owner=owner
-        editable=editable}}
+        {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
      </div>
      <hr>
      <span class="item-name-label-header items-title-bg">
--- a/templates/chat/chat-confrontation-result.hbs
+++ b/templates/chat/chat-confrontation-result.hbs
@ -28,7 +28,7 @@
        {{#if isSuccess}}
          <li><label class="chat-result-text chat-result-success ">Réussite !</label> Votre {{attr.label}} augmente de {{gainAttr}} points.</li>
        {{else}}
-          <li><label class="chat-result-text chat-result-success ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
+          <li><label class="chat-result-text chat-result-failure ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
        {{/if}}

      </ul>  
--- a/templates/chat/chat-generic-result.hbs
+++ b/templates/chat/chat-generic-result.hbs
@ -33,25 +33,25 @@
            <li><label class="chat-result-text chat-result-success ">Réussite Critique !</label></li>
            {{#if arme}}
              {{#if arme.system.dommagecritiquemort}}
-                <li><label class="chat-result-text chat-result-success">La victime est morte !</label></li>
+                <li><label class="chat-result-success">La victime est morte !</label></li>
              {{else}}
                {{#if arme.system.dommagecritiqueko}}
                  <li><label class="chat-result-text chat-result-success ">La victime est KO !</label></li>
                {{/if}}
-                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagecritique}} dommages</label></li>
+                <li><label class="chat-result-success ">La victime subit {{arme.system.dommagecritique}} dommages</label></li>
              {{/if}}
            {{/if}}
          {{else}}  
            {{#if isPart}}
              <li><label class="chat-result-text chat-result-success ">Réussite Particulière !</label></li>
              {{#if arme}}
-                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagepart}} dommages</label></li>
+                <li><label class="chat-result-success ">La victime subit {{arme.system.dommagepart}} dommages</label></li>
              {{/if}}        

            {{else}}
              <li><label class="chat-result-text chat-result-success ">Succés !</label></li>
              {{#if arme}}
-                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagenormale}} dommages</label></li>
+                <li><label class="chat-result-success ">La victime subit {{arme.system.dommagenormale}} dommages</label></li>
              {{/if}}        
            {{/if}}        
          {{/if}}
--- a/templates/dialogs/confrontation-dialog.hbs
+++ b/templates/dialogs/confrontation-dialog.hbs
@ -18,25 +18,14 @@
      <div class="flexrow">
        <span class="roll-dialog-label">Degré de la confrontation : </span>
        <select id="confrontationDegre" name="confrontationDegre">
-          {{#select confrontationDegre}} 
-            <option value="0">0</option>
-            <option value="1">1</option>
-            <option value="2">2</option>
-            <option value="3">3</option>
-            <option value="4">4</option>
-            <option value="5">5</option>
-          {{/select}}
+          {{selectOptions config.confrontationDegreOptions selected=confrontationDegre}}
        </select>        
      </div>

      <div class="flexrow">
        <span class="roll-dialog-label">Modificateur de confrontation : </span>
        <select id="confrontationModif" name="confrontationModif">
-          {{#select confrontationModif}} 
-            <option value="-1">-1</option>
-            <option value="0">0</option>
-            <option value="1">+1</option>
-          {{/select}}
+          {{selectOptions config.confrontationModifOptions selected=confrontationModif}}
        </select>        
      </div>

--- a/templates/dialogs/roll-dialog-generic.hbs
+++ b/templates/dialogs/roll-dialog-generic.hbs
@ -7,7 +7,7 @@
  </header>

    <div class="flexcol">
-      
+
      {{#if attr}}
      <div class="flexrow">
        <span class="roll-dialog-label">{{attr.label}} : </span>
@ -17,11 +17,11 @@
            {{#if phyMalus}}
              ({{phyMalus}})
            {{/if}}
-          {{/if}}          
+          {{/if}}
        </span>
      </div>
      {{/if}}
-      
+
      <div class="flexcol">
        <span class="roll-dialog-label">Rappel des élements biographiques : </span>
        <ul class="ul-level1 item-list alternate-list">
@ -36,55 +36,30 @@
      <div class="flexrow">
        <span class="roll-dialog-label">Bonus/Malus biographique : </span>
        <select id="bonusMalusPerso" name="bonusMalusPerso">
-          {{#select bonusMalusPerso}} 
-            <option value="-3">-3</option>
-            <option value="-2">-2</option>
-            <option value="-1">-1</option>
-            <option value="0">0</option>
-            <option value="1">+1</option>
-            <option value="2">+2</option>
-            <option value="3">+3</option>
-          {{/select}}
-        </select>        
+          {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusPerso valueAttr="value" labelAttr="label"}}
+        </select>
      </div>

      <div class="flexrow">
        <span class="roll-dialog-label">Bonus/Malus de situation : </span>
        <select id="bonusMalusSituation" name="bonusMalusSituation">
-          {{#select bonusMalusSituation}} 
-            <option value="-3">-3</option>
-            <option value="-2">-2</option>
-            <option value="-1">-1</option>
-            <option value="0">0</option>
-            <option value="1">+1</option>
-            <option value="2">+2</option>
-            <option value="3">+3</option>
-          {{/select}}
-        </select>        
+          {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusSituation valueAttr="value" labelAttr="label"}}
+        </select>
      </div>

      {{#if arme}}
      <div class="flexrow">
        <span class="roll-dialog-label">Défense : </span>
        <select id="bonusMalusDef" name="bonusMalusDef">
-          {{#select bonusMalusDef}} 
-            <option value="-3">-6 (réussite critique)</option>
-            <option value="-3">-3 (réussite)</option>
-            <option value="0">0 (echec ou pas d'esquive)</option>
-            <option value="3">+3 (echec critique)</option>
-          {{/select}}
-        </select>        
+          {{selectOptions config.bonusMalusDefOptions selected=bonusMalusDef valueAttr="value" labelAttr="label"}}
+        </select>
      </div>

      <div class="flexrow">
        <span class="roll-dialog-label">Portée : </span>
        <select id="bonusMalusPortee" name="bonusMalusPortee">
-          {{#select bonusMalusPortee}} 
-            <option value="1">+1 (Portée courte)</option>
-            <option value="0">0 (Portée moyenne)</option>
-            <option value="-1">-1 (Portée longue)</option>
-          {{/select}}
-        </select>        
+          {{selectOptions config.bonusMalusPorteeOptions selected=bonusMalusPortee valueAttr="value" labelAttr="label"}}
+        </select>
      </div>
      {{/if}}

--- a/templates/items/item-archetype-sheet.hbs
+++ b/templates/items/item-archetype-sheet.hbs
@ -20,12 +20,8 @@
        <ul>
          <li class="flexrow">
            <label class="item-field-label-long">Lame tutélaire</label>
-            <select class="item-field-label-long" type="text" name="system.lametutelaire" value="{{system.lametutelaire}}" data-dtype="String">
-              {{#select system.lametutelaire}}
-                {{#each tarots as |carte key| }}
-                <option value="{{carte._id}}">{{carte.name}}</option>
-                {{/each}}
-              {{/select}}
+            <select class="item-field-label-long" type="text" name="system.lametutelaire" data-dtype="String">
+              {{selectOptions tarots selected=system.lametutelaire nameAttr="_id" labelAttr="name"}}
            </select> 
          </li>

--- a/templates/items/item-arme-sheet.hbs
+++ b/templates/items/item-arme-sheet.hbs
@ -22,11 +22,7 @@
          <li class="flexrow">
            <label class="item-field-label-long">Type d'arme</label>
            <select class="item-field-label-long" type="text" name="system.armetype" value="{{system.armetype}}" data-dtype="String">
-              {{#select system.armetype}}
-                {{#each config.armeTypes as |type key| }}
-                <option value="{{key}}">{{type}}</option>
-                {{/each}}
-              {{/select}}
+              {{selectOptions config.armeTypes selected=system.armetype}}
            </select> 
          </li>

--- a/templates/items/item-tarot-sheet.hbs
+++ b/templates/items/item-tarot-sheet.hbs
@ -26,11 +26,7 @@
          <li class="flexrow">
            <label class="item-field-label-long">Type </label>
            <select class="item-field-label-long" type="text" name="system.tarottype" value="{{system.tarottype}}" data-dtype="String">
-              {{#select system.tarottype}}
-                {{#each config.tarotType as |type key| }}
-                <option value="{{key}}">{{type}}</option>
-                {{/each}}
-              {{/select}}
+              {{selectOptions config.tarotType selected=system.tarottype}}
            </select> 
          </li>
Author	SHA1	Message	Date
LeRatierBretonnien	d647fcc35e	Foundry v13 migration	2025-05-01 08:48:02 +02:00
LeRatierBretonnien	342f9c2342	Fix waring about grid	2025-02-14 13:37:51 +01:00
LeRatierBretonnien	cd14db85cc	Fix v11/v12	2024-05-02 09:29:42 +02:00
LeRatierBretonnien	ec06f0fdcb	Update pour v11/v12 et correction d'un bug sur les defenses	2024-04-26 18:35:39 +02:00
LeRatierBretonnien	234bd44742	Enhance stats	2024-02-08 12:51:06 +01:00
LeRatierBretonnien	e0df1f1ff5	Fix CSS pour confrontation et CSS pour DiceTray	2023-10-26 09:25:07 +02:00
LeRatierBretonnien	2c92dd6ef9	Fix notes + CSS	2023-10-25 00:00:30 +02:00
LeRatierBretonnien	8af5851246	v10/v11 compatibility	2023-05-25 08:04:31 +02:00
LeRatierBretonnien	14b536cc52	Fix sur ajout tarots	2023-05-08 23:24:05 +02:00
LeRatierBretonnien	9944ebe64d	Fix sur armes et affichage	2023-03-08 20:24:19 +01:00
LeRatierBretonnien	165c836f39	Fix sur tarots et message	2023-02-28 13:06:46 +01:00
LeRatierBretonnien	cb8e70c6c1	Ajout zone libre, macros et tirage de carte	2023-02-26 15:38:44 +01:00
LeRatierBretonnien	b2a9d8cb75	Gestion armes	2023-02-25 09:38:35 +01:00
LeRatierBretonnien	6d75c8532c	Update README	2023-02-24 15:28:35 +01:00
LeRatierBretonnien	dce8ad025b	Update README	2023-02-24 15:27:49 +01:00
LeRatierBretonnien	6e4cd71b99	Minot fixes	2023-02-22 23:08:03 +01:00