Fix v11/v12

README.md

@@ -0,0 +1,33 @@
+# 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).
+
+This system has been approved by Arkhane Asylum Publishing ( https://arkhane-asylum.fr ), thanks !
+The Tarot assets, as well as other graphical elements has been provide by Arkhane Asylum.
+
+Books are mandatory to play and are available at : https://arkhane-asylum.fr/en/malefices
+
+## FR
+
+Système non-officiel pour le JDR Maléfices, version 4 (Arkhane Asylum Publishing).
+
+Ce système a été autorisé par le Arkhane Asylum Publishing (  https://arkhane-asylum.fr ), merci à eux !
+Les images du Tarot et autres éléments graphiques ont été fournis par Arkhane Asylum.
+
+Les livres du jeu sont nécessaires pour jouer, et sont disponibles ici : https://arkhane-asylum.fr/fr/malefices
+
+# Credits 
+
+Maléfices, le jeu de rôle qui sent le souffre, is a property of Arkhane Asylum Publishing.
+
+# Developmement 
+
+LeRatierBretonnien
+
+# Tests, icones et saisie des données
+
+Dame du Lac, Malik

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

lang/fr.json

@@ -1,22 +1,15 @@
 {
-  "ACTOR": {
-    "TypeCharacter": "Character",
-    "TypeNpc": "NPC"
-  },
-  "ITEM": {
-    "TypeWeapon": "Weapon",
-    "TypeShield": "Shield",
-    "TypeArmor": "Armor",
-    "TypeSpell": "Spell",
-    "TypeModule": "Module",
-    "TypeMoney": "Money",
-    "TypeEquipment": "Equipment",
-    "TypeAction": "Action",
-    "TypeFreeaction": "Free Action",
-    "TypeReaction": "Reaction",
-    "TypeStance": "Stance",
-    "TypeTrait": "Trait",
-    "TypeCondition": "Condition",
-    "TypeCraftingskill": "Crafting Skill"
+  "TYPES": {
+    "Actor": {
+      "personnage"  : "Personnage"
+    },
+    "Item": {
+      "arme"        : "Arme",
+      "equipement"  : "Equipement",
+      "tarot"       : "Tarot",
+      "elementbio"  : "Elément Biographique",
+      "archetype"   : "Archetype",
+      "sortilege"   : "Sortilège"
+    }
   }
 }

modules/malefices-actor-sheet.js

@@ -11,11 +11,11 @@ export class MaleficesActorSheet extends 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: 640,
+      height:680,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
       editScore: true
@@ -33,13 +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()),
-      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 TextEditor.enrichHTML(this.object.system.biodata.description, { async: true }),
+      notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, { async: true }),
+      equipementlibre: await TextEditor.enrichHTML(this.object.system.equipementlibre, { async: true }),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -47,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;
   }
 

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;
@@ -86,16 +86,40 @@ export class MaleficesActor extends Actor {
     MaleficesUtility.sortArrayObjectsByName(comp)
     return comp;
   }
-  
+  getSorts() {
+    let comp = this.items.filter(item => item.type == 'sortilege');
+    MaleficesUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
+  getArchetype() {
+    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)
+    }
+
+    return comp;
+  }
+  /* -------------------------------------------- */
+  getElementsBio() {
+    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') || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || [])
+    MaleficesUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
+  /* -------------------------------------------- */
+  getHiddenTarots() {
+    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;
   }
@@ -103,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;
   }
@@ -149,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 = []
@@ -205,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 });
   }
@@ -248,7 +272,29 @@ export class MaleficesActor extends Actor {
       await this.createEmbeddedDocuments('Item', [newItem]);
     }
   }
-
+  /* -------------------------------------------- */
+  incDecFluide(value) {
+    let fluide = this.system.fluide + value
+    this.update( {'system.fluide': fluide} )
+  }
+  incDecDestin(value) {
+    let destin = this.system.pointdestin + value
+    this.update( {'system.pointdestin': destin} )
+  }
+  incDecMPMB(value) {
+    let mpmb = this.system.mpmb + value
+    this.update( {'system.mpmb': mpmb} )
+  }
+  incDecMPMN(value) {
+    let mpmn = this.system.mpmn + value
+    this.update( {'system.mpmn': mpmn} )
+  }
+  /* -------------------------------------------- */
+  incDecAttr(attrKey, value) {
+    let attr = foundry.utils.duplicate(this.system.attributs[attrKey])
+    attr.value += value
+    this.update( { [`system.attributs.${attrKey}`]: attr})    
+  }
   /* -------------------------------------------- */
   async incDecQuantity(objetId, incDec = 0) {
     let objetQ = this.items.get(objetId)
@@ -290,8 +336,12 @@ export class MaleficesActor extends Actor {
     rollData.actorId = this.id
     rollData.img = this.img
     rollData.phyMalus = this.getPhysiqueMalus()
+    rollData.elementsbio = this.getElementsBio()
     rollData.destin = this.system.pointdestin
     rollData.isReroll = false
+    rollData.confrontationDegre = 0
+    rollData.confrontationModif = 0
+    rollData.config = game.system.malefices.config
 
     console.log("ROLLDATA", rollData)
 
@@ -309,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)
@@ -320,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

modules/malefices-commands.js

@@ -2,6 +2,8 @@
 
 import { MaleficesUtility } from "./malefices-utility.js";
 import { MaleficesRollDialog } from "./malefices-roll-dialog.js";
+import { MaleficesTirageTarotDialog } from "./malefices-tirage-tarot-dialog.js"
+import { MaleficesCharacterSummary } from "./malefices-summary-app.js"
 
 /* -------------------------------------------- */
 export class MaleficesCommands {
@@ -9,8 +11,9 @@ export class MaleficesCommands {
   static init() {
     if (!game.system.malefices.commands) {
       const commands = new MaleficesCommands();
-      //crucibleCommands.registerCommand({ path: ["/char"], func: (content, msg, params) => crucibleCommands.createChar(msg), descr: "Create a new character" });
-      //crucibleCommands.registerCommand({ path: ["/pool"], func: (content, msg, params) => crucibleCommands.poolRoll(msg), descr: "Generic Roll Window" });
+      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;
     }
   }
@@ -100,18 +103,45 @@ export class MaleficesCommands {
   static _chatAnswer(msg, content) {
     msg.whisper = [game.user.id];
     msg.content = content;
-    ChatMessage.create(msg);    
+    ChatMessage.create(msg);
   }
 
-  /* -------------------------------------------- */
-  async poolRoll( msg) {
-    let rollData = MaleficesUtility.getBasicRollData()
-    rollData.alias = "Dice Pool Roll", 
-    rollData.mode  = "generic"
-    rollData.title = `Dice Pool Roll`;
-    
-    let rollDialog = await MaleficesRollDialog.create( this, rollData);
-    rollDialog.render( true );
+  /* --------------------------------------------- */
+  static async createTirage(msg) {
+    if (game.user.isGM) {
+      let tirageData = {
+        state: 'select-player',
+        nbCard: 0,
+        maxPlayerCard: 4,
+        maxSecretCard: 1,
+        cards: [],
+        players: foundry.utils.duplicate(game.users),
+        secretCards: [],
+        deck: MaleficesUtility.getTarots()
+      }
+      for (let i = 0; i < 4; i++) {
+        tirageData.cards.push({ name: "???", img: "systems/fvtt-malefices/images/tarots/background.webp" })
+      }
+      tirageData.secretCards.push({ name: "???", img: "systems/fvtt-malefices/images/tarots/background.webp" })
+
+      let tirageDialog = await MaleficesTirageTarotDialog.create(this, tirageData)
+      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 renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
+    })
   }
 
 }

modules/malefices-config.js

@@ -1,5 +1,14 @@
 
 export const MALEFICES_CONFIG = {
+  attributs: {
+    "constitution": "Cons",
+    "physique": "Phy",
+    "culturegenerale": "CGén",
+    "habilite": "Hab",
+    "perception": "Per",
+    "spiritualite": "Spi",
+    "rationnalite": "Rat"
+  },
 
   tarotType: {
     "majeur": "Arcane Majeur",
@@ -18,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)"}
+  ]
+
 }

modules/malefices-item-sheet.js

@@ -9,30 +9,16 @@ export class MaleficesItemSheet extends 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 }],
       width: 620,
-      height: 'fit-content',
+      height: 580,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }]
     });
   }
 
-  /* -------------------------------------------- */
-  _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,8 +43,8 @@ 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,
@@ -67,6 +53,10 @@ export class MaleficesItemSheet extends ItemSheet {
       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;
@@ -86,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 };
     }

modules/malefices-item.js

@@ -1,8 +1,12 @@
 import { MaleficesUtility } from "./malefices-utility.js";
 
 export const defaultItemImg = {
-  //skill: "systems/fvtt-malefices/images/icons/skill1.webp",
-  arme: "systems/fvtt-malefices/images/icones/arme.webp"
+  arme: "systems/fvtt-malefices/images/icons/arme.webp",
+  equipement: "systems/fvtt-malefices/images/icons/equipement.webp",
+  elementbio: "systems/fvtt-malefices/images/icons/wisdom.webp",
+  archetype: "systems/fvtt-malefices/images/icons/archetype.webp",
+  tarot: "systems/fvtt-malefices/images/icons/tarot.webp",
+  sortilege: "systems/fvtt-malefices/images/icons/sortilege.webp",
 }
 
 /**

modules/malefices-main.js

@@ -16,7 +16,9 @@ import { MaleficesUtility } from "./malefices-utility.js";
 import { MaleficesCombat } from "./malefices-combat.js";
 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                  */
@@ -26,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
@@ -64,16 +66,22 @@ Hooks.once("init", async function () {
   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>
-    ` });
+  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)` });
+  }
 }
 
 /* -------------------------------------------- */
@@ -89,18 +97,15 @@ 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";
-  }
 
+  ClassCounter.registerUsageCount();
   welcomeMessage();
   MaleficesUtility.ready()
-  MaleficesUtility.init()
+  MaleficesCharacterSummary.ready()
+
 })
 
+
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -108,7 +113,7 @@ Hooks.on("chatMessage", (html, content, msg) => {
   if (content[0] == '/') {
     let regExp = /(\S+)/g;
     let commands = content.match(regExp);
-    if (game.system.Malefices.commands.processChatCommand(commands, content, msg)) {
+    if (game.system.malefices.commands.processChatCommand(commands, content, msg)) {
       return false;
     }
   }

modules/malefices-npc-sheet.js

@@ -11,7 +11,7 @@ export class MaleficesNPCSheet extends 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(),

modules/malefices-roll-dialog.js

@@ -5,26 +5,32 @@ export class MaleficesRollDialog extends Dialog {
   /* -------------------------------------------- */
   static async create(actor, rollData) {
 
-    let options = { classes: ["MaleficesDialog"], width: 540, height: 'fit-content', 'z-index': 99999 };
-    let html = await renderTemplate('systems/fvtt-malefices/templates/dialogs/roll-dialog-generic.hbs', rollData);
+    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);
+    } else {
+      html = await renderTemplate('systems/fvtt-malefices/templates/dialogs/roll-dialog-generic.hbs', rollData);
+    }
 
     return new MaleficesRollDialog(actor, rollData, html, options);
   }
 
   /* -------------------------------------------- */
   constructor(actor, rollData, html, options, close = undefined) {
+    let isCard = rollData.attr && rollData.attr.iscard
     let conf = {
-      title: (rollData.mode == "skill") ? "Skill" : "Attribute",
+      title: (isCard) ? "Jet" : "Tirage",
       content: html,
       buttons: {
         roll: {
           icon: '<i class="fas fa-check"></i>',
-          label: "Roll !",
+          label: (isCard) ? "Tirer une carte" : "Lancer le dé",
           callback: () => { this.roll() }
         },
         cancel: {
           icon: '<i class="fas fa-times"></i>',
-          label: "Cancel",
+          label: "Annuler",
           callback: () => { this.close() }
         }
       },
@@ -39,7 +45,12 @@ export class MaleficesRollDialog extends Dialog {
 
   /* -------------------------------------------- */
   roll() {
-    MaleficesUtility.rollMalefices(this.rollData)
+    let isCard = this.rollData.attr && this.rollData.attr.iscard
+    if (isCard) {
+      MaleficesUtility.tirageConfrontationMalefices(this.rollData)
+    } else {
+      MaleficesUtility.rollMalefices(this.rollData)
+    }
   }
 
   /* -------------------------------------------- */
@@ -70,6 +81,12 @@ export class MaleficesRollDialog extends Dialog {
     html.find('#bonusMalusPortee').change((event) => {
       this.rollData.bonusMalusPortee = Number(event.currentTarget.value)
     })
-        
+    html.find('#confrontationDegre').change((event) => {
+      this.rollData.confrontationDegre = Number(event.currentTarget.value)
+    })
+    html.find('#confrontationModif').change((event) => {
+      this.rollData.confrontationModif = Number(event.currentTarget.value)
+    })
+    
   }
 }

modules/malefices-summary-app.js

@@ -0,0 +1,134 @@
+/* -------------------------------------------- */
+import { MaleficesUtility } from "./malefices-utility.js";
+
+/* -------------------------------------------- */
+export class MaleficesCharacterSummary extends Application {
+
+  /* -------------------------------------------- */
+  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) {
+      this.render(true)
+    }
+  }
+
+  /* -------------------------------------------- */
+  static createSummaryPos() {
+    return { top: 200, left: 200 };
+  }
+
+  /* -------------------------------------------- */
+  static ready() {
+    if (!game.user.isGM) { // Uniquement si GM
+      return
+    }
+    let charSummary = new MaleficesCharacterSummary()
+    game.system.malefices.charSummary = charSummary
+  }
+
+  /* -------------------------------------------- */
+  constructor() {
+    super();
+    //game.settings.set("world", "character-summary-data", {npcList: [], x:0, y:0})
+    this.settings = game.settings.get("world", "character-summary-data")
+  }
+
+  /* -------------------------------------------- */
+  static get defaultOptions() {
+    return foundry.utils.mergeObject(super.defaultOptions, {
+      template: "systems/fvtt-malefices/templates/dialogs/character-summary.hbs",
+      popOut: true,
+      resizable: true,
+      dragDrop: [{ dragSelector: ".items-list .item", dropSelector: null }],
+      classes: ["bol", "dialog"], width: 920, height: 'fit-content'
+    })
+  }
+
+  /* -------------------------------------------- */
+  getData() {
+    let formData = super.getData();
+
+    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 actor = game.actors.get(actorId)
+      if (actor) {
+        formData.npcs.push(actor)
+        newList.push(actorId)
+      } else {
+        toUpdate = true
+      }
+    }
+    formData.config = game.system.malefices.config
+
+    if (toUpdate) {
+      this.settings.npcList = newList
+      //console.log("Going to update ...", this.settings)
+      game.settings.set("world", "character-summary-data", this.settings)
+    }
+
+    return formData
+  }
+
+  /* -------------------------------------------- */
+  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)
+  }
+
+  /* -------------------------------------------- */
+  async _onDrop(event) {
+    //console.log("Dragged data are : ", dragData)
+    let data = event.dataTransfer.getData('text/plain')
+    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.updateNPC()
+
+    } else {
+      ui.notifications.warn("Pas d'acteur trouvé")
+    }
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  async activateListeners(html) {
+    super.activateListeners(html);
+
+    html.find('.actor-open').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      const actor = game.actors.get(li.data("actor-id"))
+      actor.sheet.render(true)
+    })
+
+    html.find('.summary-roll').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      const actor = game.actors.get(li.data("actor-id"))
+      let type = $(event.currentTarget).data("type")
+      let key = $(event.currentTarget).data("key")
+      actor.rollAttribut(key)
+    })
+
+    html.find('.actor-delete').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      let actorId = li.data("actor-id")
+      let newList = game.system.malefices.charSummary.settings.npcList.filter(id => id != actorId)
+      game.system.malefices.charSummary.settings.npcList = newList
+      game.system.malefices.charSummary.updateNPC()
+    })
+
+  }
+
+}

modules/malefices-tirage-tarot-dialog.js

@@ -0,0 +1,155 @@
+import { MaleficesUtility } from "./malefices-utility.js";
+
+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);
+
+    return new MaleficesTirageTarotDialog(actor, tirageData, html, options);
+  }
+
+  /* -------------------------------------------- */
+  constructor(actor, tirageData, html, options, close = undefined) {
+    let conf = {
+      title: "Tirage des tarots",
+      content: html,
+      buttons: {
+        cancel: {
+          icon: '<i class="fas fa-times"></i>',
+          label: "Fermer/Annuler",
+          callback: () => { this.close() }
+        }
+      },
+      close: close
+    }
+
+    super(conf, options);
+
+    this.actor = actor;
+    this.tirageData = tirageData;
+  }
+
+  /* -------------------------------------------- */
+  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) 
+    })
+    //msg.setFlag("world", "tirage-data", this.tirageData)
+    console.log("MSG IS", msg)
+  }
+
+  /* -------------------------------------------- */
+  drawCard() {
+    let index = Math.round(Math.random() * (this.tirageData.deck.length-1))
+    let selectedCard = this.tirageData.deck[index]
+    selectedCard.system.ispositif = true
+    if ( selectedCard.system.isdualside) { // Cas des cartes pouvant avoir 2 sens
+      selectedCard.system.ispositif = (Math.random() > 0.5)
+    }
+    console.log("CARD SELECTED:", selectedCard)  
+    // Cas spécial de la Roue de la Fortune
+    if ( selectedCard.name.toLowerCase().includes("fortune")) {
+      this.tirageData.maxPlayerCard += 1
+      this.tirageData.maxSecretCard += 1
+    }
+    let newList = []
+    for(let card of this.tirageData.deck) {
+      if (card.name != selectedCard.name) {
+        newList.push(card)
+      }
+    }
+    this.tirageData.deck = newList
+    
+    return selectedCard
+  }
+
+  /* -------------------------------------------- */
+  async addCard( msgId ) {
+    MaleficesUtility.removeChatMessageId(msgId)
+
+    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) 
+    })
+    if (this.tirageData.cards[0].name == "???") {    
+      this.tirageData.cards.shift()
+    }
+    this.tirageData.cards.push(selectedCard)
+    this.tirageData.nbCard++
+
+    if (this.tirageData.nbCard == this.tirageData.maxPlayerCard) {
+      for (let i=0; i<this.tirageData.maxSecretCard; i++) {
+        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) 
+        })
+        if (this.tirageData.secretCards[0].name == "???") {    
+          this.tirageData.secretCards.shift()
+        }
+        this.tirageData.secretCards.push(selectedCard)
+      }
+      this.tirageData.actors = foundry.utils.duplicate(game.actors)
+      this.tirageData.state = 'attribute-to-actor'
+    }else {
+      this.sendCardRequest()
+    }
+    this.refreshDialog()
+  }
+
+  /* -------------------------------------------- */
+  async processSelectedPlayer() {
+    let user = game.users.get(this.tirageData.playerId)
+    this.tirageData.user  = user
+    this.tirageData.players = null
+    console.log("Going to work with ", user.name)
+    game.system.malefices.currentTirage = this
+    this.refreshDialog()
+    this.sendCardRequest()
+  }
+
+  /* -------------------------------------------- */
+  attributeToActor(actorId) {
+    let actor = game.actors.get(actorId)
+    if (actor) {
+      actor.createEmbeddedDocuments('Item', this.tirageData.cards)
+      actor.createEmbeddedDocuments('Item', this.tirageData.secretCards)
+      ui.notifications.info("Les cartes ont été attribuées à " + actor.name)
+    }
+  }
+  /* -------------------------------------------- */
+  async refreshDialog() {
+    const content = await renderTemplate("systems/fvtt-malefices/templates/dialogs/tirage-tarot-dialog.hbs", this.tirageData)
+    this.data.content = content
+    this.render(true)
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    var dialog = this;
+    function onLoad() {
+    }
+    $(function () { onLoad(); });
+
+    html.find('#playerId').change((event) => {
+      if ( event.currentTarget.value != "none") {
+        dialog.tirageData.playerId = event.currentTarget.value
+        dialog.processSelectedPlayer()
+      }
+    })
+    html.find('#actorId').change((event) => {
+      if ( event.currentTarget.value != "none") {
+        let actorId = event.currentTarget.value
+        dialog.attributeToActor(actorId)
+      }
+    })
+        
+  }
+}

modules/malefices-utility.js

@@ -1,23 +1,22 @@
 /* -------------------------------------------- */
-import { MaleficesCombat } from "./malefices-combat.js";
 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;
@@ -44,6 +43,18 @@ export class MaleficesUtility {
     Handlebars.registerHelper('add', function (a, b) {
       return parseInt(a) + parseInt(b);
     })
+
+    game.settings.register("world", "character-summary-data", {
+      name: "character-summary-data",
+      scope: "world",
+      config: false,
+      default: { npcList: [], x: 200, y: 200 },
+      type: Object
+    })
+
+    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
+    this.tarots = tarots.map(i => i.toObject())
+
   }
 
   /*-------------------------------------------- */
@@ -53,54 +64,11 @@ export class MaleficesUtility {
   }
 
   /*-------------------------------------------- */
-  static getSkills() {
-    return duplicate(this.skills)
+  static getTarots() {
+    return foundry.utils.duplicate(this.tarots)
   }
-  /*-------------------------------------------- */
-  static getWeaponSkills() {
-    return duplicate(this.weaponSkills)
-  }
-  /*-------------------------------------------- */
-  static getShieldSkills() {
-    return duplicate(this.shieldSkills)
-  }
-
-  /* -------------------------------------------- */
-  static isModuleItemAllowed(type) {
-    return __ALLOWED_MODULE_TYPES[type]
-  }
-
-  /* -------------------------------------------- */
-  static buildBonusList() {
-    let bonusList = []
-    for (let key in game.system.model.Actor.character.bonus) {
-      let bonuses = game.system.model.Actor.character.bonus[key]
-      for (let bonus in bonuses) {
-        bonusList.push(key + "." + bonus)
-      }
-    }
-    for (let key in game.system.model.Actor.character.attributes) {
-      let attrs = game.system.model.Actor.character.attributes[key]
-      for (let skillKey in attrs.skills) {
-        bonusList.push(key + ".skills." + skillKey + ".modifier")
-      }
-    }
-    for (let key in game.system.model.Actor.character.universal.skills) {
-      bonusList.push("universal.skills." + key + ".modifier")
-    }
-    return bonusList
-  }
-
-  /* -------------------------------------------- */
-  static async ready() {
-    const skills = await MaleficesUtility.loadCompendium("fvtt-malefices.skills")
-    this.skills = skills.map(i => i.toObject())
-    this.weaponSkills = duplicate(this.skills.filter(item => item.system.isweaponskill))
-    this.shieldSkills = duplicate(this.skills.filter(item => item.system.isshieldskill))
-
-    const rollTables = await MaleficesUtility.loadCompendium("fvtt-malefices.rolltables")
-    this.rollTables = rollTables.map(i => i.toObject())
-
+  static getTarot(tId) {
+    return  this.tarots.find(t => t._id == tId)
   }
 
   /* -------------------------------------------- */
@@ -126,6 +94,14 @@ export class MaleficesUtility {
     }
     return actor
   }
+  /* -------------------------------------------- */
+  static drawDeckCard(msgId) {
+    if (game.user.isGM) {
+      game.system.malefices.currentTirage.addCard(msgId)
+    } else {
+      game.socket.emit( "system.fvtt-malefices", {name: "msg-draw-card", data: {msgId: msgId}})
+    }
+  }
 
   /* -------------------------------------------- */
   static async chatListeners(html) {
@@ -139,6 +115,11 @@ export class MaleficesUtility {
       rollData.isReroll = true
       this.rollMalefices(rollData)
     })
+    html.on("click", '.draw-tarot-card', event => {
+      let messageId = MaleficesUtility.findChatMessageId(event.currentTarget)
+      this.drawDeckCard(messageId)
+    })
+    
   }
 
   /* -------------------------------------------- */
@@ -215,182 +196,20 @@ 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
   }
-  /* -------------------------------------------- */
-  static saveRollData(rollData) {
-    game.socket.emit("system.fvtt-malefices", {
-      name: "msg_update_roll", data: rollData
-    }); // Notify all other clients of the roll    
-    this.updateRollData(rollData)
-  }
-
-  /* -------------------------------------------- */
-  static getRollData(id) {
-    return this.rollDataStore[id]
-  }
-
-  /* -------------------------------------------- */
-  static async displayDefenseMessage(rollData) {
-    if (rollData.mode == "weapon" && rollData.defenderTokenId) {
-      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
-      if (game.user.isGM || (game.user.character && game.user.character.id == defender.id)) {
-        rollData.defender = defender
-        rollData.defenderWeapons = defender.getEquippedWeapons()
-        rollData.isRangedAttack = rollData.weapon?.system.isranged
-        this.createChatWithRollMode(defender.name, {
-          name: defender.name,
-          alias: defender.name,
-          //user: defender.id,
-          content: await renderTemplate(`systems/fvtt-malefices/templates/chat-request-defense.html`, rollData),
-          whisper: [defender.id].concat(ChatMessage.getWhisperRecipients('GM')),
-        })
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  static getSuccessResult(rollData) {
-    if (rollData.sumSuccess <= -3) {
-      if (rollData.attackRollData.weapon.system.isranged) {
-        return { result: "miss", fumble: true, hpLossType: "melee" }
-      } else {
-        return { result: "miss", fumble: true, attackerHPLoss: "2d3", hpLossType: "melee" }
-      }
-    }
-    if (rollData.sumSuccess == -2) {
-      if (rollData.attackRollData.weapon.system.isranged) {
-        return { result: "miss", dangerous_fumble: true }
-      } else {
-        return { result: "miss", dangerous_fumble: true, attackerHPLoss: "1d3", hpLossType: "melee" }
-      }
-    }
-    if (rollData.sumSuccess == -1) {
-      return { result: "miss" }
-    }
-    if (rollData.sumSuccess == 0) {
-      if (rollData.attackRollData.weapon.system.isranged) {
-        return { result: "target_space", aoe: true }
-      } else {
-        return { result: "clash", hack_vs_shields: true }
-      }
-    }
-    if (rollData.sumSuccess == 1) {
-      return { result: "hit", defenderDamage: "1", entangle: true, knockback: true }
-    }
-    if (rollData.sumSuccess == 2) {
-      return { result: "hit", defenderDamage: "2", critical_1: true, entangle: true, knockback: true, penetrating_impale: true, hack_armors: true }
-    }
-    if (rollData.sumSuccess >= 3) {
-      return { result: "hit", defenderDamage: "3", critical_2: true, entangle: true, knockback: true, penetrating_impale: true, hack_armors: true }
-    }
-  }
-
-  /* -------------------------------------------- */
-  static async getFumble(weapon) {
-    const pack = game.packs.get("fvtt-malefices.rolltables")
-    const index = await pack.getIndex()
-    let entry
-
-    if (weapon.isranged) {
-      entry = index.find(e => e.name === "Fumble! (ranged)")
-    }
-    if (!weapon.isranged) {
-      entry = index.find(e => e.name === "Fumble! (melee)")
-    }
-    let table = await pack.getDocument(entry._id)
-    const draw = await table.draw({ displayChat: false, rollMode: "gmroll" })
-    return draw.results.length > 0 ? draw.results[0] : undefined
-  }
-
-  /* -------------------------------------------- */
-  static async processSuccessResult(rollData) {
-    if (game.user.isGM) { // Only GM process this
-      let result = rollData.successDetails
-      let attacker = game.actors.get(rollData.actorId)
-      let defender = game.canvas.tokens.get(rollData.attackRollData.defenderTokenId).actor
-
-      if (attacker && result.attackerHPLoss) {
-        result.attackerHPLossValue = await attacker.incDecHP("-" + result.attackerHPLoss)
-      }
-      if (attacker && defender && result.defenderDamage) {
-        let dmgDice = (rollData.attackRollData.weapon.system.isranged) ? "d6" : "d8"
-        result.damageWeaponFormula = result.defenderDamage + dmgDice
-        result.defenderHPLossValue = await defender.incDecHP("-" + result.damageWeaponFormula)
-      }
-      if (result.fumble || (result.dangerous_fumble && MaleficesUtility.isWeaponDangerous(rollData.attackRollData.weapon))) {
-        result.fumbleDetails = await this.getFumble(rollData.weapon)
-      }
-      if (result.critical_1 || result.critical_2) {
-        let isDeadly = MaleficesUtility.isWeaponDeadly(rollData.attackRollData.weapon)
-        result.critical = await this.getCritical((result.critical_1) ? "I" : "II", rollData.attackRollData.weapon)
-        result.criticalText = result.critical.text
-      }
-      this.createChatWithRollMode(rollData.alias, {
-        content: await renderTemplate(`systems/fvtt-malefices/templates/chat-attack-defense-result.html`, rollData)
-      })
-      console.log("Results processed", rollData)
-    }
-  }
-
-  /* -------------------------------------------- */
-  static async processAttackDefense(rollData) {
-    if (rollData.attackRollData) {
-      //console.log("Defender token, ", rollData, rollData.defenderTokenId)
-      let defender = game.canvas.tokens.get(rollData.attackRollData.defenderTokenId).actor
-      let sumSuccess = rollData.attackRollData.nbSuccess - rollData.nbSuccess
-      if (sumSuccess > 0) {
-        let armorResult = await defender.rollArmorDie(rollData)
-        rollData.armorResult = armorResult
-        sumSuccess += rollData.armorResult.nbSuccess
-        if (sumSuccess < 0) { // Never below 0
-          sumSuccess = 0
-        }
-      }
-      rollData.sumSuccess = sumSuccess
-      rollData.successDetails = this.getSuccessResult(rollData)
-      if (game.user.isGM) {
-        this.processSuccessResult(rollData)
-      } else {
-        game.socket.emit("system.fvtt-malefices", { msg: "msg_gm_process_attack_defense", data: rollData });
-      }
-    }
-  }
 
   /* -------------------------------------------- */
   static async onSocketMesssage(msg) {
     console.log("SOCKET MESSAGE", msg.name)
-    if (msg.name == "msg_update_roll") {
-      this.updateRollData(msg.data)
-    }
-    if (msg.name == "msg_gm_process_attack_defense") {
-      this.processSuccessResult(msg.data)
-    }
-    if (msg.name == "msg_gm_item_drop" && game.user.isGM) {
-      let actor = game.actors.get(msg.data.actorId)
-      let item
-      if (msg.data.isPack) {
-        item = await fromUuid("Compendium." + msg.data.isPack + "." + msg.data.itemId)
-      } else {
-        item = game.items.get(msg.data.itemId)
+    if (msg.name == "msg-draw-card") {
+      if ( game.user.isGM && game.system.malefices.currentTirage) {
+        game.system.malefices.currentTirage.addCard(msg.data.msgId)
       }
-      this.addItemDropToActor(actor, item)
     }
   }
 
-  /* -------------------------------------------- */
-  static computeFocusData(focus) {
-    let focusData = {
-      focusPoints: __focusCore[focus.core] + __focusPointTreatment[focus.treatment],
-      burnChance: __burnChanceTreatment[focus.treatment],
-      focusRegen: __focusRegenBond[focus.bond],
-      spellAttackBonus: __bonusSpellAttackBond[focus.bond],
-      spellDamageBonus: __bonusSpellDamageBond[focus.bond]
-    }
-    return focusData
-  }
-
   /* -------------------------------------------- */
   static async searchItem(dataItem) {
     let item
@@ -404,19 +223,6 @@ export class MaleficesUtility {
     return item
   }
 
-  /* -------------------------------------------- */
-  static getSpellCost(spell) {
-    return __spellCost[spell.system.level]
-  }
-
-  /* -------------------------------------------- */
-  static getArmorPenalty(item) {
-    if (item && (item.type == "shield" || item.type == "armor")) {
-      return __armorPenalties[item.system.category]
-    }
-    return {}
-  }
-
   /* -------------------------------------------- */
   static chatDataSetup(content, modeOverride, isRoll = false, forceWhisper) {
     let chatData = {
@@ -462,6 +268,125 @@ 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"))
+      if (actorCard) {
+        MaleficesUtility.createChatMessage(actor.name, "gmroll", {
+          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"))
+      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).` })
+        actor.incDecMPMB(1)
+      }
+    }
+    if (rollData.selectedCard.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.` })
+        actor.incDecDestin(1)
+      }
+    }
+    if (rollData.selectedCard.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.` })
+        actor.incDecDestin(1)
+      }
+    }
+    if (rollData.selectedCard.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é.` })
+        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"))
+      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).` })
+        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"))
+      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).` })
+        actor.incDecFluide(1)
+      }
+    }
+    if (rollData.selectedCard.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).` })
+        actor.incDecMPMN(1)
+      }
+    }
+
+  }  
+
+  /* -------------------------------------------- */
+  static computeResults(rollData) {
+    rollData.isSuccess = false
+    if (rollData.total <= rollData.target) {
+      rollData.isSuccess = true
+    }
+    if (rollData.total == 1) {
+      rollData.isSuccess = true
+      rollData.isCritical = true
+    }
+    if (rollData.total == 20) {
+      rollData.isSuccess = false
+      rollData.isFumble = true
+    }
+    if (rollData.total <= Math.floor(rollData.target / 3)) {
+      rollData.isPart = true
+    }
+  }
+  /* -------------------------------------------- */
+  static async tirageConfrontationMalefices(rollData) {
+    let actor = game.actors.get(rollData.actorId)
+
+    rollData.target = rollData.attr.value - rollData.confrontationDegre + rollData.confrontationModif
+
+    let deck = this.getTarots()
+    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
+    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) 
+    })
+
+    this.computeResults(rollData)
+
+    if (rollData.isSuccess) {
+      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 )
+    }
+
+    await MaleficesUtility.createChatMessage(actor.name, "gmroll", {
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/chat-confrontation-result.hbs`, rollData) 
+    })
+    this.processSpecialCard(actor, rollData)  
+  }
   /* -------------------------------------------- */
   static async rollMalefices(rollData) {
 
@@ -477,25 +402,12 @@ 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
 
-    rollData.isSuccess = false
-    if (myRoll.total <= rollData.target) {
-      rollData.isSuccess = true
-    }
-    if (myRoll.total == 1) {
-      rollData.isSuccess = true
-      rollData.isCritical = true
-    }
-    if (myRoll.total == 20) {
-      rollData.isSuccess = false
-      rollData.isFumble = true
-    }
-    if (myRoll.total <= Math.floor(rollData.target / 3)) {
-      rollData.isPart = true
-    }
+    this.computeResults(rollData)
 
     let msg = await this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-malefices/templates/chat/chat-generic-result.hbs`, rollData)
@@ -532,11 +444,17 @@ export class MaleficesUtility {
     switch (rollMode) {
       case "blindroll": return this.getUsers(user => user.isGM);
       case "gmroll": return this.getWhisperRecipientsAndGMs(name);
+      case "useronly": return this.getWhisperRecipientsOnly(name);
       case "selfroll": return [game.user.id];
     }
     return undefined;
   }
   /* -------------------------------------------- */
+  static getWhisperRecipientsOnly(name) {
+    let recep1 = ChatMessage.getWhisperRecipients(name) || [];
+    return recep1
+  }
+  /* -------------------------------------------- */
   static getWhisperRecipientsAndGMs(name) {
     let recep1 = ChatMessage.getWhisperRecipients(name) || [];
     return recep1.concat(ChatMessage.getWhisperRecipients('GM'));
@@ -544,7 +462,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);
@@ -570,7 +488,7 @@ export class MaleficesUtility {
   }
 
   /* -------------------------------------------- */
-  static createChatMessage(name, rollMode, chatOptions) {
+  static async createChatMessage(name, rollMode, chatOptions) {
     switch (rollMode) {
       case "blindroll": // GM only
         if (!game.user.isGM) {
@@ -588,13 +506,13 @@ export class MaleficesUtility {
         break;
     }
     chatOptions.alias = chatOptions.alias || name;
-    return ChatMessage.create(chatOptions);
+    return await ChatMessage.create(chatOptions);
   }
 
   /* -------------------------------------------- */
   static getBasicRollData() {
     let rollData = {
-      rollId: randomID(16),
+      rollId: foundry.utils.randomID(16),
       bonusMalusPerso: 0,
       bonusMalusSituation: 0,
       bonusMalusDef: 0,
@@ -614,8 +532,8 @@ export class MaleficesUtility {
   }
 
   /* -------------------------------------------- */
-  static createChatWithRollMode(name, chatOptions) {
-    return this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions)
+  static async createChatWithRollMode(name, chatOptions) {
+    return await this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions)
   }
 
   /* -------------------------------------------- */

packs/malefices-archetypes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000018

packs/malefices-archetypes/LOG

@@ -0,0 +1,15 @@
+2024/04/26-18:07:32.626395 7efdd82006c0 Recovering log #16
+2024/04/26-18:07:32.637138 7efdd82006c0 Delete type=3 #14
+2024/04/26-18:07:32.637193 7efdd82006c0 Delete type=0 #16
+2024/04/26-18:35:17.538874 7efdd72006c0 Level-0 table #21: started
+2024/04/26-18:35:17.542754 7efdd72006c0 Level-0 table #21: 50638 bytes OK
+2024/04/26-18:35:17.548838 7efdd72006c0 Delete type=0 #19
+2024/04/26-18:35:17.591000 7efdd72006c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)
+2024/04/26-18:35:17.591055 7efdd72006c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at '!items!xtYE2kVIfNtrXSoU' @ 46 : 1
+2024/04/26-18:35:17.591063 7efdd72006c0 Compacting 1@1 + 1@2 files
+2024/04/26-18:35:17.595486 7efdd72006c0 Generated table #22@1: 23 keys, 50638 bytes
+2024/04/26-18:35:17.595513 7efdd72006c0 Compacted 1@1 + 1@2 files => 50638 bytes
+2024/04/26-18:35:17.602259 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/04/26-18:35:17.602378 7efdd72006c0 Delete type=2 #5
+2024/04/26-18:35:17.602577 7efdd72006c0 Delete type=2 #21
+2024/04/26-18:35:17.632494 7efdd72006c0 Manual compaction at level-1 from '!items!xtYE2kVIfNtrXSoU' @ 46 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)

packs/malefices-archetypes/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.238994 7f5603fff6c0 Recovering log #12
+2023/10/26-09:14:30.250498 7f5603fff6c0 Delete type=3 #10
+2023/10/26-09:14:30.250614 7f5603fff6c0 Delete type=0 #12
+2023/10/26-09:23:17.065670 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.065742 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.072462 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.079476 7f56037fe6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.079561 7f56037fe6c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)

packs/malefices-armes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000018

packs/malefices-armes/LOG

@@ -0,0 +1,15 @@
+2024/04/26-18:07:32.613484 7efdd96006c0 Recovering log #16
+2024/04/26-18:07:32.623734 7efdd96006c0 Delete type=3 #14
+2024/04/26-18:07:32.623791 7efdd96006c0 Delete type=0 #16
+2024/04/26-18:35:17.569282 7efdd72006c0 Level-0 table #21: started
+2024/04/26-18:35:17.582262 7efdd72006c0 Level-0 table #21: 2093 bytes OK
+2024/04/26-18:35:17.590842 7efdd72006c0 Delete type=0 #19
+2024/04/26-18:35:17.591036 7efdd72006c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)
+2024/04/26-18:35:17.612788 7efdd72006c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at '!items!nkRQU81L1gWOfaeo' @ 18 : 1
+2024/04/26-18:35:17.612797 7efdd72006c0 Compacting 1@1 + 1@2 files
+2024/04/26-18:35:17.615928 7efdd72006c0 Generated table #22@1: 9 keys, 2093 bytes
+2024/04/26-18:35:17.615956 7efdd72006c0 Compacted 1@1 + 1@2 files => 2093 bytes
+2024/04/26-18:35:17.622427 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/04/26-18:35:17.622520 7efdd72006c0 Delete type=2 #5
+2024/04/26-18:35:17.622620 7efdd72006c0 Delete type=2 #21
+2024/04/26-18:35:17.632530 7efdd72006c0 Manual compaction at level-1 from '!items!nkRQU81L1gWOfaeo' @ 18 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)

packs/malefices-armes/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.225660 7f56117fa6c0 Recovering log #12
+2023/10/26-09:14:30.236009 7f56117fa6c0 Delete type=3 #10
+2023/10/26-09:14:30.236095 7f56117fa6c0 Delete type=0 #12
+2023/10/26-09:23:17.051895 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.051934 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.058810 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.072664 7f56037fe6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.079499 7f56037fe6c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)

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"}

packs/malefices-macros/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000018

packs/malefices-macros/LOG

@@ -0,0 +1,15 @@
+2024/04/26-18:07:32.640485 7efdd8c006c0 Recovering log #16
+2024/04/26-18:07:32.650356 7efdd8c006c0 Delete type=3 #14
+2024/04/26-18:07:32.650410 7efdd8c006c0 Delete type=0 #16
+2024/04/26-18:35:17.622677 7efdd72006c0 Level-0 table #21: started
+2024/04/26-18:35:17.625968 7efdd72006c0 Level-0 table #21: 855 bytes OK
+2024/04/26-18:35:17.632284 7efdd72006c0 Delete type=0 #19
+2024/04/26-18:35:17.632542 7efdd72006c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)
+2024/04/26-18:35:17.632580 7efdd72006c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1
+2024/04/26-18:35:17.632588 7efdd72006c0 Compacting 1@1 + 1@2 files
+2024/04/26-18:35:17.635838 7efdd72006c0 Generated table #22@1: 3 keys, 855 bytes
+2024/04/26-18:35:17.635878 7efdd72006c0 Compacted 1@1 + 1@2 files => 855 bytes
+2024/04/26-18:35:17.642105 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/04/26-18:35:17.642236 7efdd72006c0 Delete type=2 #5
+2024/04/26-18:35:17.642702 7efdd72006c0 Delete type=2 #21
+2024/04/26-18:35:17.667688 7efdd72006c0 Manual compaction at level-1 from '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)

packs/malefices-macros/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.253493 7f5610ff96c0 Recovering log #12
+2023/10/26-09:14:30.264581 7f5610ff96c0 Delete type=3 #10
+2023/10/26-09:14:30.264682 7f5610ff96c0 Delete type=0 #12
+2023/10/26-09:23:17.058988 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.059024 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.065403 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.079441 7f56037fe6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.079539 7f56037fe6c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)

packs/malefices-tarots.db

@@ -1,22 +1,22 @@
-{"name":"Le Moine","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Moine_600%20dpi.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053851,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"1DRKmbzGzbCRCswc"}
-{"name":"La Lune Noire","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Lune%20Noire_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053846,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"6jHm4eWelq7eLKwU"}
-{"name":"Hippocrate","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Hippocrate_600%20dpi.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053843,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"BCQenQMvFjLKkl56"}
-{"name":"Eve","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Eve_600%20dpi.webp","system":{"tarottype":"mineur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053842,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"IJaK9oxcsamMs4pw"}
-{"name":"Le Sorcier","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Sorcier_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053852,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"IwsZkMHLKGuCGUf7"}
-{"name":"La Mort","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_La%20Mort_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053847,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"MHdmnX0tbbjhPbA0"}
-{"name":"L'Artiste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Artiste_600%20dpi.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053845,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"NQBZmrYhEiyNxEo2"}
-{"name":"Le Savetier","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Savetier_600%20dpi%20copie.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053852,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"SClVaCgZjZoR1WiD"}
-{"name":"La Roue de la Fortune","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_La%20roue%20de%20la%20fortune_600%20dpi.webp","system":{"tarottype":"mineur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053847,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"WRILaKwS1cjxZGRk"}
-{"name":"L'Alchimiste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Alchimiste_600%20dpi.webp","system":{"tarottype":"mineur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053844,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"WlsCeal346QfJweB"}
-{"name":"L'Archange","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Archange_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053844,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"bVvGkOVe3BQeK7HR"}
-{"name":"La Chance","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Chance_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053846,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"ba7fmG0dYpV2jpIv"}
-{"name":"Le Vicaire","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Vicaire_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053853,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"dbc8W1qD0kj5rQ4s"}
-{"name":"Le Juge","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Le%20Juge_600%20dpi.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053849,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"dkvHSWzgbOqbykUL"}
-{"name":"Le Diable","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Diable_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053848,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"earXcKB3NZ9sM8S7"}
-{"name":"Le Centurion","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Centurion_600%20dpi.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053848,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"fIHWGqwcubToEjOK"}
-{"name":"Le Cabaliste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Cabaliste_600%20dpi.webp","system":{"tarottype":"mineur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053847,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"gS7fULIr9lPCl5Vb"}
-{"name":"Adam","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Adam_600%20dpi.webp","system":{"tarottype":"mineur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053841,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"ooRr6cSNg73cPyaU"}
-{"name":"Le Medium","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Medium_600%20dpi.webp","system":{"tarottype":"mineur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053850,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"rOgagyXv5RWxvyBa"}
-{"name":"L'Archiviste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Archiviste_600%20dpi.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053845,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"wHc7WwyWPZIqt219"}
-{"name":"Le Laboureur","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Laboureur_600%20dpi.webp","system":{"tarottype":"metier","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053850,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"wLFdvRd9eLiCtc7b"}
-{"name":"Le Grand Livre","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Grand%20Livre_600%20dpi.webp","system":{"tarottype":"majeur","isreversed":false,"description":""},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.3","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675372053849,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"zbGGMEQFdwVdlKAf"}
+{"name":"Le Moine","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Moine_600%20dpi.webp","system":{"tarottype":"metier","numericvalueup":9,"numericvaluedown":14,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789474,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"1DRKmbzGzbCRCswc"}
+{"name":"La Lune Noire","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Lune%20Noire_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":18,"numericvaluedown":5,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"6jHm4eWelq7eLKwU"}
+{"name":"Hippocrate","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Hippocrate_600%20dpi.webp","system":{"tarottype":"metier","numericvalueup":16,"numericvaluedown":7,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789472,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"BCQenQMvFjLKkl56"}
+{"name":"Eve","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Eve_600%20dpi.webp","system":{"tarottype":"mineur","numericvalueup":3,"numericvaluedown":20,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789472,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"IJaK9oxcsamMs4pw"}
+{"name":"Le Sorcier","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Sorcier_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":22,"numericvaluedown":1,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789474,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"IwsZkMHLKGuCGUf7"}
+{"name":"La Mort","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_La%20Mort_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":13,"numericvaluedown":10,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"MHdmnX0tbbjhPbA0"}
+{"name":"L'Artiste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Artiste_600%20dpi.webp","system":{"tarottype":"metier","numericvalueup":1,"numericvaluedown":22,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789472,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"NQBZmrYhEiyNxEo2"}
+{"name":"Le Savetier","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Savetier_600%20dpi%20copie.webp","system":{"tarottype":"metier","numericvalueup":12,"numericvaluedown":11,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789474,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"SClVaCgZjZoR1WiD"}
+{"name":"La Roue de la Fortune","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_La%20roue%20de%20la%20fortune_600%20dpi.webp","system":{"tarottype":"mineur","numericvalueup":10,"numericvaluedown":13,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"WRILaKwS1cjxZGRk"}
+{"name":"L'Alchimiste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Alchimiste_600%20dpi.webp","system":{"tarottype":"mineur","numericvalueup":19,"numericvaluedown":4,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789472,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"WlsCeal346QfJweB"}
+{"name":"L'Archange","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Archange_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":2,"numericvaluedown":21,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789472,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"bVvGkOVe3BQeK7HR"}
+{"name":"La Chance","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Chance_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":7,"numericvaluedown":16,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"ba7fmG0dYpV2jpIv"}
+{"name":"Le Vicaire","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Vicaire_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":5,"numericvaluedown":18,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789474,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"dbc8W1qD0kj5rQ4s"}
+{"name":"Le Juge","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Le%20Juge_600%20dpi.webp","system":{"tarottype":"metier","numericvalueup":8,"numericvaluedown":15,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"dkvHSWzgbOqbykUL"}
+{"name":"Le Diable","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Diable_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":15,"numericvaluedown":8,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"earXcKB3NZ9sM8S7"}
+{"name":"Le Centurion","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Centurion_600%20dpi.webp","system":{"tarottype":"metier","numericvalueup":11,"numericvaluedown":12,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"fIHWGqwcubToEjOK"}
+{"name":"Le Cabaliste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Cabaliste_600%20dpi.webp","system":{"tarottype":"mineur","numericvalueup":17,"numericvaluedown":6,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"gS7fULIr9lPCl5Vb"}
+{"name":"Adam","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Adam_600%20dpi.webp","system":{"tarottype":"mineur","numericvalueup":4,"numericvaluedown":19,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789472,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"ooRr6cSNg73cPyaU"}
+{"name":"Le Medium","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Medium_600%20dpi.webp","system":{"tarottype":"mineur","numericvalueup":6,"numericvaluedown":17,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789474,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"rOgagyXv5RWxvyBa"}
+{"name":"L'Archiviste","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Archiviste_600%20dpi.webp","system":{"tarottype":"metier","numericvalueup":14,"numericvaluedown":9,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789472,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"wHc7WwyWPZIqt219"}
+{"name":"Le Laboureur","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Laboureur_600%20dpi.webp","system":{"tarottype":"metier","numericvalueup":21,"numericvaluedown":2,"isdualside":true,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789474,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"wLFdvRd9eLiCtc7b"}
+{"name":"Le Grand Livre","type":"tarot","img":"systems/fvtt-malefices/images/tarots/Malefice_Tarot_Grand%20Livre_600%20dpi.webp","system":{"tarottype":"majeur","numericvalueup":20,"numericvaluedown":3,"isdualside":false,"ispositif":true,"isgm":false,"description":"","numericvalue":0,"isreversed":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.0.21","coreVersion":"10.291","createdTime":1675369447354,"modifiedTime":1675867789473,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"folder":null,"sort":0,"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"_id":"zbGGMEQFdwVdlKAf"}

packs/malefices-tarots/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000018

packs/malefices-tarots/LOG

@@ -0,0 +1,15 @@
+2024/04/26-18:07:32.598967 7efdda0006c0 Recovering log #16
+2024/04/26-18:07:32.609105 7efdda0006c0 Delete type=3 #14
+2024/04/26-18:07:32.609187 7efdda0006c0 Delete type=0 #16
+2024/04/26-18:35:17.558727 7efdd72006c0 Level-0 table #21: started
+2024/04/26-18:35:17.562742 7efdd72006c0 Level-0 table #21: 3999 bytes OK
+2024/04/26-18:35:17.569132 7efdd72006c0 Delete type=0 #19
+2024/04/26-18:35:17.591025 7efdd72006c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)
+2024/04/26-18:35:17.602706 7efdd72006c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at '!items!zbGGMEQFdwVdlKAf' @ 44 : 1
+2024/04/26-18:35:17.602723 7efdd72006c0 Compacting 1@1 + 1@2 files
+2024/04/26-18:35:17.606397 7efdd72006c0 Generated table #22@1: 22 keys, 3999 bytes
+2024/04/26-18:35:17.606426 7efdd72006c0 Compacted 1@1 + 1@2 files => 3999 bytes
+2024/04/26-18:35:17.612531 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/04/26-18:35:17.612635 7efdd72006c0 Delete type=2 #5
+2024/04/26-18:35:17.612730 7efdd72006c0 Delete type=2 #21
+2024/04/26-18:35:17.632514 7efdd72006c0 Manual compaction at level-1 from '!items!zbGGMEQFdwVdlKAf' @ 44 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)

packs/malefices-tarots/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.211232 7f5611ffb6c0 Recovering log #12
+2023/10/26-09:14:30.222971 7f5611ffb6c0 Delete type=3 #10
+2023/10/26-09:14:30.223076 7f5611ffb6c0 Delete type=0 #12
+2023/10/26-09:23:17.024333 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.024403 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.030633 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.041759 7f56037fe6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.051874 7f56037fe6c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -1,60 +1,64 @@
-  /* ==================== (A) Fonts ==================== */
+/* ==================== (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;
+:root {
+/* =================== 1. ACTOR SHEET FONT STYLES =========== */
+  --window-header-title-font-size: 1.3rem;
+  --window-header-title-font-weight: normal;
+  --window-header-title-color: #f5f5f5;
 
-    --major-button-font-size: 1.05rem;
-    --major-button-font-weight: normal;
-    --major-button-color: #dadada;
+  --major-button-font-size: 1.05rem;
+  --major-button-font-weight: normal;
+  --major-button-color: #dadada;
 
-    --tab-header-font-size: 1.0rem;
-    --tab-header-font-weight: 700;
-    --tab-header-color: #403f3e;
-    --tab-header-color-active: #4a0404;
+  --tab-header-font-size: 1.0rem;
+  --tab-header-font-weight: 700;
+  --tab-header-color: #403f3e;
+  --tab-header-color-active: #4a0404;
 
-    --actor-input-font-size: 0.8rem;
-    --actor-input-font-weight: 500;
-    --actor-input-color: black;
+  --actor-input-font-size: 0.8rem;
+  --actor-input-font-weight: 500;
+  --actor-input-color: black;
 
-    --actor-label-font-size: 0.8rem;
-    --actor-label-font-weight: 700;
-    --actor-label-color: #464331c4;
+  --actor-label-font-size: 0.8rem;
+  --actor-label-font-weight: 700;
+  --actor-label-color: #464331c4;
 
-  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
-    --debug-background-color-red: #ff000054;
-    --debug-background-color-blue: #1d00ff54;
-    --debug-background-color-green: #54ff0054;
+/* =================== 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;
-  }
+  --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 {
   margin: 0;
@@ -231,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;
@@ -276,6 +285,8 @@ table {border: 1px solid #7a7971;}
 }
 
 .fvtt-malefices .sheet-header h1.charname input {
+  font-family: Rivanna;
+  font-size: 3rem;
   width: 100%;
   height: 100%;
   margin: 0;
@@ -285,6 +296,8 @@ table {border: 1px solid #7a7971;}
   -webkit-box-flex: 0;
   -ms-flex: 0;
   flex: 0;
+  font-family: Rivanna;
+  font-size: 2.2rem;
 }
 
 .fvtt-malefices .sheet-body,
@@ -296,7 +309,7 @@ table {border: 1px solid #7a7971;}
 
 .editor {
   border: 2;
-  height: 300px;
+  height: 100%;
   padding: 0 3px;
 }
 
@@ -388,9 +401,9 @@ 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.webp");
+  background: url("../images/ui/background_01_clear.webp");
   /*background: #494e6b;*/
 }
 
@@ -412,7 +425,7 @@ select {
 
 .window-app.sheet .window-content .sheet-header input[type="password"], .window-app.sheet .window-content .sheet-header input[type="date"], .window-app.sheet .window-content .sheet-header input[type="time"] {
   color: rgba(19, 18, 18, 0.95);
-  background: url("../images/ui/background_01.webp");
+  background: url("../images/ui/background_01_clear.webp");
   border: 1 none;
   margin-bottom: 0.25rem;
   margin-left: 2px;
@@ -420,7 +433,7 @@ select {
 
 .window-app.sheet .window-content .sheet-body input[type="password"], .window-app.sheet .window-content .sheet-body input[type="date"], .window-app.sheet .window-content .sheet-body input[type="time"] {
   color: rgba(19, 18, 18, 0.95);
-  background: url("../images/ui/background_01.webp");
+  background: url("../images/ui/background_01_clear.webp");
   border: 1 none;
   margin-bottom: 0.25rem;
   margin-left: 2px;
@@ -434,10 +447,10 @@ 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.webp");
+  background: url("../images/ui/background_01_clear.webp");
   color: rgba(19, 18, 18, 0.95);
 }
 
@@ -452,8 +465,8 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
   padding: 0;
 }
 
-.sheet nav.sheet-tabs {
-  font-size: 0.70rem;
+.malefices-actor-sheet nav.sheet-tabs {
+  font-size: 1.2rem;
   font-weight: bold;
   height: 3rem;
   flex: 0 0 3rem;
@@ -468,7 +481,16 @@ 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;
@@ -482,7 +504,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] {
@@ -746,6 +768,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;
@@ -778,11 +804,17 @@ ul, li {
 /* Sidebar CSS */
 #sidebar {
   font-size: 1rem;
-  background-position: 100%;
-  background: url("../images/ui/background_01.webp");
+  /*background-position: 100%;*/
+  background-color:#f5f5f5;
+  background-position: 0px 35px;
+  background-repeat: no-repeat;
+  background-image: url("../images/ui/background_01_clear.webp");
   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 {
@@ -817,10 +849,19 @@ ul, li {
 .chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to { 
   font-size: 0.9rem;
 }
+.chat-result-text,
 .chat-actor-name {
+  font-weight: bold;
+  font-family: Rivanna;
+  font-size: 1.2rem;
   padding: 4px;
 }
-
+.chat-result-success {
+  color:darkgreen;
+}
+.chat-result-failure {
+  color:darkred;
+}
 .chat-img {
   width: 64px;
   height: 64px;
@@ -930,8 +971,6 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
   display: inline-block;
   background-position:center;
   background-size:cover;
@@ -1212,11 +1251,24 @@ ul, li {
   min-width: 10rem;
 }
 .item-name-label-long {
+  margin-top: 4px;
   flex-grow:2;
-  max-width: 12rem;
-  min-width: 12rem;
+  max-width: 10rem;
+  min-width: 10rem;
+}
+.item-name-label-short {
+  flex-grow:1;
+  max-width: 4rem;
+  min-width: 4rem;
+}
+.item-name-label-medium {
+  margin-top: 4px;
+  flex-grow:2;
+  max-width: 6rem;
+  min-width: 6rem;
 }
 .item-name-label-long2 {
+  margin-top: 4px;
   flex-grow:2;
   max-width: 22rem;
   min-width: 22rem;
@@ -1242,7 +1294,6 @@ ul, li {
   min-width: 6.8rem;
 }
 .item-field-label-long {
-  margin-top: 4px;
   flex-grow:1;
   max-width: 10rem;
   min-width: 10rem;
@@ -1272,3 +1323,17 @@ ul, li {
   max-width: 16px;
   max-height: 12px;
 }
+.flip-tarot {
+  transform: scaleY(-1);
+}
+.tarot-fixed-width {
+  width: 140px;
+  max-width: 140px;
+}
+.tarot-title {
+  text-align: center;
+  font-weight: bold;
+}
+.character-summary-rollable {
+  text-decoration: underline;
+}

system.json

@@ -37,14 +37,31 @@
       "system": "fvtt-malefices",
       "private": false,
       "flags": {}
+    },
+    {
+      "type": "Item",
+      "label": "Archetypes",
+      "name": "malefices-archetypes",
+      "path": "packs/malefices-archetypes.db",
+      "system": "fvtt-malefices",
+      "private": false,
+      "flags": {}
+    },
+    {
+      "type": "Macro",
+      "label": "Macros",
+      "name": "malefices-macros",
+      "path": "packs/malefices-macros.db",
+      "system": "fvtt-malefices",
+      "private": false,
+      "flags": {}
     }
   ],
   "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": "11",
+    "verified": "12"
   },
   "id": "fvtt-malefices",
   "primaryTokenAttribute": "secondary.health",
@@ -55,7 +72,7 @@
   ],
   "title": "Maléfices, le Jeu de Rôle",
   "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "10.0.6",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.6.zip",
+  "version": "12.0.1",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v12.0.1.zip",
   "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }

template.json

@@ -1,8 +1,7 @@
 {
   "Actor": {
     "types": [
-      "personnage",
-      "pnj"
+      "personnage"
     ],
     "templates": {
       "biodata": {
@@ -26,6 +25,7 @@
           "religion": "",
           "fantastique": "",
           "description": "",
+          "notes": "",
           "gmnotes": ""
         }
       },
@@ -34,6 +34,8 @@
         "lamesdestin": [],
         "pointdestin": 1,
         "fluide": 5,
+        "mpmb": 0,
+        "mpmn": 0,
         "attributs": {
           "constitution": {
             "label": "Constitution",
@@ -62,25 +64,28 @@
           },
           "perception": {
             "label": "Perception",
-            "abbrev": "habilite",
+            "abbrev": "perception",
             "value": 0,
             "max": 0
           },
           "spiritualite": {
             "label": "Spiritualite",
             "abbrev": "spiritualite",
-            "hasmax": true,
+            "hasmax": false,
+            "iscard": true,
             "value": 0,
             "max": 0
           },
           "rationnalite": {
             "label": "Rationnalite",
             "abbrev": "rationnalite",
-            "hasmax": true,
+            "hasmax": false,
+            "iscard": true,
             "value": 0,
             "max": 0
           }
-        }
+        },
+        "equipementlibre": ""
       },
       "npccore": {
         "npctype": "",
@@ -98,19 +103,37 @@
     "types": [
       "arme",
       "equipement",
-      "tarot"
+      "archetype",
+      "tarot",
+      "sortilege",
+      "elementbio"
     ],
     "templates": {},
+    "elementbio": {
+      "description": ""
+    },
     "equipement": {
       "description": ""
     },
     "tarot": {
       "tarottype": "",
-      "isreversed": false,
+      "numericvalueup": 0,
+      "numericvaluedown": 0,
+      "isdualside": false,
+      "ispositif": true,
+      "isgm": false,
+      "description": ""
+    },
+    "archetype":  {
+      "lametutelaire": "",
+      "description": ""
+    },
+    "sortilege":  {
+      "seuil": 0,
       "description": ""
     },
     "arme": {
-      "armetype": 0,
+      "armetype": "",
       "porteecourte": "",
       "porteemoyenne": "",
       "dommagenormale": 0,

templates/actors/actor-sheet.hbs

@@ -4,11 +4,25 @@
   <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>
 
-          <div class="flexrow">
+        <div class="flexrow">
+            <ul>
+              <li class="flexrow item">
+                <label class="item-name-label-long">Milieu social</label>
+                <input type="text" class="item-field-label-long" name="system.biodata.milieusocial" value="{{system.biodata.milieusocial}}" data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-name-label-long">Profession</label>
+                <input type="text" class="item-field-label-long" name="system.biodata.profession" value="{{system.biodata.profession}}" data-dtype="String" />
+              </li>
+            </ul>
           </div>
 
           </div>
@@ -21,7 +35,7 @@
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
     <a class="item" data-tab="main">Principal</a>
-    <a class="item" data-tab="equipements">Equipements</a>
+    <a class="item" data-tab="equipements">Equipement</a>
     <a class="item" data-tab="biodata">Biographie</a>
     <a class="item" data-tab="notes">Notes</a>
   </nav>
@@ -43,7 +57,14 @@
             </li>
             {{#each system.attributs as |attr key|}}
             <li class="item flexrow list-item">
-              <span class="item-field-label-long"><a class="roll-attribut" data-attr-key="{{key}}">{{attr.label}}<i class="fa-solid fa-dice-d20"></i></a></span>
+              <span class="item-name-label-long">
+                <a class="roll-attribut" data-attr-key="{{key}}">{{attr.label}}
+                {{#if attr.iscard}}
+                  <i class="fa-solid fa-cards-blank"></i>
+                {{else}}
+                  <i class="fa-solid fa-dice-d20"></i>
+                {{/if}}
+                </a></span>
               <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"/>
@@ -63,9 +84,17 @@
             
             {{#if isGM}}
             <li class="item flexrow list-item">
-              <span class="item-field-label-long">Fluide (MJ seulement)</span>
+              <span class="item-field-label-long">Fluide (MJ)</span>
               <input type="text" class="item-field-label-short" name="system.fluide" value="{{system.fluide}}" data-dtype="Number"/>
             </li>
+            <li class="item flexrow list-item">
+              <span class="item-field-label-long">MPMB (MJ)</span>
+              <input type="text" class="item-field-label-short" name="system.mpmb" value="{{system.mpmb}}" data-dtype="Number"/>
+            </li>
+            <li class="item flexrow list-item">
+              <span class="item-field-label-long">MPMN (MJ)</span>
+              <input type="text" class="item-field-label-short" name="system.mpmn" value="{{system.mpmn}}" data-dtype="Number"/>
+            </li>
             {{/if}}
 
           </ul>
@@ -85,6 +114,32 @@
             </li>
             {{/each}}
           </ul>
+
+          <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">Elements biographiques</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="elementbio" title="Create Item"><i class="fas fa-plus"></i></a>
+              </div>
+            </li>
+
+            {{#each elementsbio as |elem key|}}
+            <li class="item list-item flexrow list-item-shadow" data-item-id="{{elem._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{elem.img}}" /></a>
+              <span class="item-name-label">{{elem.name}}</span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+
         </div>
 
       </div>
@@ -94,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">
@@ -132,7 +194,7 @@
       <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>
@@ -157,71 +219,107 @@
         {{/each}}
       </ul>
 
+      <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">Sortilèges</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Seuil</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>
+          </div>
+
+        </li>
+        {{#each sorts as |sort key|}}
+        <li class="item list-item flexrow list-item-shadow" data-item-id="{{sort._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{sort.img}}" /></a>
+          <span class="item-name-label">{{sort.name}}</span>
+          <span class="item-field-label-medium">
+            <label class="short-label">{{sort.system.seuil}}</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
       <hr>
 
     </div>
 
     {{!-- Biography Tab --}}
     <div class="tab biodata" data-group="primary" data-tab="biodata">
+
       <div class="grid grid-2col">
         <div>
           <ul class="item-list alternate-list">
+            <li class="item flexrow" data-item-id="{{archetype._id}}">
+              <label class="item-name-label-medium">Archetype</label>
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{archetype.img}}" /></a>
+              <span class="item-name-label-medium">{{archetype.name}}</span>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
             <li class="item flexrow">
-              <label class="generic-label">Lieu de naissance</label>
+              <label class="item-name-label-medium">Lieu de naissance</label>
               <input type="text" class="" name="system.biodata.lieunaissance" value="{{system.biodata.lieunaissance}}"
                 data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Age</label>
+              <label class="item-name-label-medium">Age</label>
               <input type="text" class="" name="system.biodata.age" value="{{system.biodata.age}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Nationalité</label>
+              <label class="item-name-label-medium">Nationalité</label>
               <input type="text" class="" name="system.biodata.nationalite" value="{{system.biodata.nationalite}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Enfance</label>
+              <label class="item-name-label-medium">Enfance</label>
               <input type="text" class="" name="system.biodata.enfance" value="{{system.biodata.enfance}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Vie d'adulte</label>
+              <label class="item-name-label-medium">Vie d'adulte</label>
               <input type="text" class="" name="system.biodata.adulte" value="{{system.biodata.adulte}}" data-dtype="String" />
             </li>
-            <li class="item flexrow">
-              <label class="generic-label">Loisirs</label>
-              <input type="text" class="" name="system.biodata.loisirs" value="{{system.biodata.loisirs}}" data-dtype="String" />
-            </li>
           </ul>
         </div>
        <div>
           <ul>
-            <li class="flexrow item">
-              <label class="generic-label">Milieu social</label>
-              <input type="text" class="" name="system.biodata.milieusocial" value="{{system.biodata.milieusocial}}" data-dtype="String" />
+            <li class="item flexrow">
+              <label class="item-name-label-medium">Lame tutélaire</label>
+              <span class="item-name-label-medium">{{archetype.tarot.name}}</span>
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Profession</label>
-              <input type="text" class="" name="system.biodata.profession" value="{{system.biodata.profession}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Résidence</label>
+              <label class="item-name-label-medium">Résidence</label>
               <input type="text" class="" name="system.biodata.residence" value="{{system.biodata.residence}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Singularité</label>
+              <label class="item-name-label-medium">Singularité</label>
               <input type="text" class="" name="system.biodata.singularite" value="{{system.biodata.singularite}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Orientation politique</label>
+              <label class="item-name-label-medium">Loisirs</label>
+              <input type="text" class="" name="system.biodata.loisirs" value="{{system.biodata.loisirs}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="item-name-label-medium">Orientation politique</label>
               <input type="text" class="" name="system.biodata.politique" value="{{system.biodata.politique}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Orientation religieuse</label>
+              <label class="item-name-label-medium">Orientation religieuse</label>
               <input type="text" class="" name="system.biodata.religion" value="{{system.biodata.religion}}" data-dtype="String" />
             </li>
           </ul>
         </div>
-  </div>
+      </div>
   
         <ul>
           <li class="item flexrow">
@@ -237,8 +335,11 @@
           <span class="item-name-label-header">
             <h3><label class="items-title-text">Tarots</label></h3>
           </span>
+          <span class="item-field-label-medium">
+            <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="Create Item"><i class="fas fa-plus"></i></a>
           </div>
         </li>
         {{#each tarots as |tarot key|}}
@@ -246,6 +347,7 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{tarot.img}}" /></a>
           <span class="item-name-label">{{tarot.name}}</span>
+          <span class="item-field-label-medium"><label>{{#if tarot.system.ispositif}}Positif{{else}}Négatif{{/if}}</label></span>
           <div class="item-filler">&nbsp;</div>
           {{#if @root.isGM}}
             <div class="item-controls item-controls-fixed">
@@ -256,6 +358,36 @@
         {{/each}}
       </ul>
 
+      {{#if isGM}}
+      <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">Tarot secret(MJ)</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Sens</label>
+          </span>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
+          </div>
+        </li>
+        {{#each tarotsCache as |tarot key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{tarot._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{tarot.img}}" /></a>
+          <span class="item-name-label">{{tarot.name}}</span>
+          <span class="item-field-label-medium"><label>{{#if tarot.system.ispositif}}Positif{{else}}Négatif{{/if}}</label></span>
+          <div class="item-filler">&nbsp;</div>
+          {{#if @root.isGM}}
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+          {{/if}}
+        </li>
+        {{/each}}
+      </ul>
+      {{/if}}
+
   </div>
 
   <div class="tab notes" data-group="primary" data-tab="notes">
@@ -264,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">

templates/chat/chat-confrontation-result.hbs

@@ -0,0 +1,37 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class="chat-actor-name">{{alias}}</h4>
+</div>
+
+  <hr>
+  
+  {{#if img}}
+  <div >
+    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+  </div>
+  {{/if}}
+
+  <div class="flexcol">
+    </div>
+
+    <div>
+      <ul>
+        <li>Confrontation de {{attr.label}} : {{attr.value}} 
+        </li>
+        <li>Degré de la confrontation: {{confrontationDegre}} </li>
+        <li>Ajustement spécial : {{confrontationModif}} </li>
+        <li>Seuil final : {{target}} </li>
+        <li>Valeur de la carte : {{total}} </li>
+
+        {{#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-failure ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
+        {{/if}}
+
+      </ul>  
+    </div>
+
+  </div>