images/icons/.directory

@@ -1,6 +0,0 @@
-[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,15 +1,13 @@
 {
-  "TYPES": {
+  "ACTOR": {
-    "Actor": {
+    "TypePersonnage": "Personnage"
-      "personnage"  : "Personnage"
+  },
-    },
+  "ITEM": {
-    "Item": {
+    "TypeArme": "Arme",
-      "arme"        : "Arme",
+    "TypeEquipement": "Equipement",
-      "equipement"  : "Equipement",
+    "TypeTarot": "Tarot",
-      "tarot"       : "Tarot",
+    "TypeElementbio": "Element Biographique",
-      "elementbio"  : "Elément Biographique",
+    "TypeArchetype": "Archetype",
-      "archetype"   : "Archetype",
+    "TypeSortilege": "Sortilège"
-      "sortilege"   : "Sortilège"
-    }
   }
 }

modules/malefices-actor-sheet.js

@@ -11,8 +11,8 @@ export class MaleficesActorSheet extends ActorSheet {
   /** @override */
   static get defaultOptions() {
 
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return mergeObject(super.defaultOptions, {
-      classes: ["fvtt-malefices", "sheet", "actor", "malefices-actor-sheet"],
+      classes: ["fvtt-malefices", "sheet", "actor"],
       template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs",
       width: 640,
       height:680,
@@ -33,20 +33,17 @@ export class MaleficesActorSheet extends ActorSheet {
       name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: foundry.utils.duplicate(this.object.system),
+      system: duplicate(this.object.system),
       limited: this.object.limited,
-      armes: foundry.utils.duplicate(this.actor.getArmes()),
+      armes: duplicate(this.actor.getArmes()),
-      tarots: foundry.utils.duplicate(this.actor.getTarots()),
+      tarots: duplicate(this.actor.getTarots()),
-      tarotsCache: foundry.utils.duplicate(this.actor.getHiddenTarots()),
+      tarotsCache: duplicate(this.actor.getHiddenTarots()),
-      archetype: foundry.utils.duplicate(this.actor.getArchetype()),
+      archetype: duplicate(this.actor.getArchetype()),
-      equipements: foundry.utils.duplicate(this.actor.getEquipements()),
+      equipements: duplicate(this.actor.getEquipements()),
-      subActors: foundry.utils.duplicate(this.actor.getSubActors()),
+      subActors: 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,
@@ -54,7 +51,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 foundry.utils.duplicated actors) bypass the new actor creation logic
+    // If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic
     if (data.items) {
       let actor = super.create(data, options);
       return actor;
@@ -92,7 +92,7 @@ export class MaleficesActor extends Actor {
     return comp;
   }
   getArchetype() {
-    let comp = foundry.utils.duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"})
+    let comp = duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"})
     if (comp && comp.system) {
       comp.tarot = MaleficesUtility.getTarot(comp.system.lametutelaire)
     }
@@ -101,25 +101,25 @@ export class MaleficesActor extends Actor {
   }
   /* -------------------------------------------- */
   getElementsBio() {
-    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'elementbio') || [])
+    let comp = duplicate(this.items.filter(item => item.type == 'elementbio') || [])
     MaleficesUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   /* -------------------------------------------- */
   getTarots() {
-    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || [])
+    let comp = 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) || [])
+    let comp = duplicate(this.items.filter(item => item.type == 'tarot' && item.system.isgm) || [])
     MaleficesUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   /* -------------------------------------------- */
   getArmes() {
-    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'arme') || [])
+    let comp = duplicate(this.items.filter(item => item.type == 'arme') || [])
     MaleficesUtility.sortArrayObjectsByName(comp)
     return comp;
   }
@@ -127,7 +127,7 @@ export class MaleficesActor extends Actor {
   getItemById(id) {
     let item = this.items.find(item => item.id == id);
     if (item) {
-      item = foundry.utils.duplicate(item)
+      item = duplicate(item)
     }
     return item;
   }
@@ -173,7 +173,7 @@ export class MaleficesActor extends Actor {
 
   /* ------------------------------------------- */
   async buildContainerTree() {
-    let equipments = foundry.utils.duplicate(this.items.filter(item => item.type == "equipment") || [])
+    let equipments = duplicate(this.items.filter(item => item.type == "equipment") || [])
     for (let equip1 of equipments) {
       if (equip1.system.iscontainer) {
         equip1.system.contents = []
@@ -238,13 +238,13 @@ export class MaleficesActor extends Actor {
   getSubActors() {
     let subActors = [];
     for (let id of this.system.subactors) {
-      subActors.push(foundry.utils.duplicate(game.actors.get(id)))
+      subActors.push(duplicate(game.actors.get(id)))
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = foundry.utils.duplicate(this.system.subactors);
+    let subActors = duplicate(this.system.subactors);
     subActors.push(subActorId);
     await this.update({ 'system.subactors': subActors });
   }
@@ -291,7 +291,7 @@ export class MaleficesActor extends Actor {
   }
   /* -------------------------------------------- */
   incDecAttr(attrKey, value) {
-    let attr = foundry.utils.duplicate(this.system.attributs[attrKey])
+    let attr = duplicate(this.system.attributs[attrKey])
     attr.value += value
     this.update( { [`system.attributs.${attrKey}`]: attr})    
   }
@@ -341,7 +341,6 @@ export class MaleficesActor extends Actor {
     rollData.isReroll = false
     rollData.confrontationDegre = 0
     rollData.confrontationModif = 0
-    rollData.config = game.system.malefices.config
 
     console.log("ROLLDATA", rollData)
 
@@ -359,7 +358,7 @@ export class MaleficesActor extends Actor {
   rollAttribut(attrKey) {
     let attr = this.system.attributs[attrKey]
     let rollData = this.getCommonRollData()
-    rollData.attr = foundry.utils.duplicate(attr)
+    rollData.attr = duplicate(attr)
     rollData.mode = "attribut"
     rollData.title = attr.label 
     rollData.img = this.getAtttributImage(attrKey)
@@ -370,12 +369,12 @@ export class MaleficesActor extends Actor {
   rollArme(weaponId) {
     let arme = this.items.get(weaponId)
     if (arme) {
-      arme = foundry.utils.duplicate(arme)
+      arme = 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.value+this.system.attributs.habilite.value) / 2) }
+        rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique+this.system.attributs.habilite) / 2) }
       } else {
-        rollData.attr = foundry.utils.duplicate(this.system.attributs.habilite)
+        rollData.attr = duplicate(this.system.attributs.habilite)
       }
       rollData.mode = "arme"
       rollData.arme = arme

modules/malefices-commands.js

@@ -12,7 +12,6 @@ export class MaleficesCommands {
     if (!game.system.malefices.commands) {
       const commands = new MaleficesCommands();
       commands.registerCommand({ path: ["/tirage"], func: (content, msg, params) => MaleficesCommands.createTirage(msg), descr: "Tirage des tarots" });
-      commands.registerCommand({ path: ["/carte"], func: (content, msg, params) => MaleficesCommands.tirerCarte(msg), descr: "Tirer une carte" });
       commands.registerCommand({ path: ["/resume"], func: (content, msg, params) => MaleficesCharacterSummary.displayPCSummary(), descr: "Affiche la liste des PJs!" });
       game.system.malefices.commands = commands;
     }
@@ -106,7 +105,7 @@ export class MaleficesCommands {
     ChatMessage.create(msg);
   }
 
-  /* --------------------------------------------- */
+  /* -------------------------------------------- */
   static async createTirage(msg) {
     if (game.user.isGM) {
       let tirageData = {
@@ -115,7 +114,7 @@ export class MaleficesCommands {
         maxPlayerCard: 4,
         maxSecretCard: 1,
         cards: [],
-        players: foundry.utils.duplicate(game.users),
+        players: duplicate(game.users),
         secretCards: [],
         deck: MaleficesUtility.getTarots()
       }
@@ -128,20 +127,5 @@ export class MaleficesCommands {
       tirageDialog.render(true)
     }
   }
-  /* --------------------------------------------- */
-  static async tirerCarte(msg) {
-    let deck =  MaleficesUtility.getTarots()
-    let index = Math.round(Math.random() * (deck.length-1))
-    let selectedCard = deck[index]
-    selectedCard.system.ispositif = true
-    if ( selectedCard.system.isdualside) { // Cas des cartes pouvant avoir 2 sens
-      selectedCard.system.ispositif = (Math.random() > 0.5)
-    }
-    selectedCard.system.isgm = false
-    selectedCard.value = (selectedCard.system.ispositif)? selectedCard.system.numericvalueup : selectedCard.system.numericvaluedown
-    MaleficesUtility.createChatMessage(game.user.name, "", {
-      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
-    })
-  }
 
 }

modules/malefices-config.js

@@ -27,41 +27,4 @@ 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,7 +9,7 @@ export class MaleficesItemSheet extends ItemSheet {
   /** @override */
   static get defaultOptions() {
 
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return mergeObject(super.defaultOptions, {
       classes: ["fvtt-malefices", "sheet", "item"],
       template: "systems/fvtt-malefices/templates/item-sheet.hbs",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
@@ -19,6 +19,20 @@ export class MaleficesItemSheet extends ItemSheet {
     });
   }
 
+  /* -------------------------------------------- */
+  _getHeaderButtons() {
+    let buttons = super._getHeaderButtons();
+    // Add "Post to chat" button
+    // We previously restricted this to GM and editable items only. If you ever find this comment because it broke something: eh, sorry!
+    buttons.unshift(
+      {
+        class: "post",
+        icon: "fas fa-comment",
+        onclick: ev => { }
+      })
+    return buttons
+  }
+
   /* -------------------------------------------- */
   /** @override */
   setPosition(options = {}) {
@@ -43,8 +57,8 @@ export class MaleficesItemSheet extends ItemSheet {
       name: this.object.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: foundry.utils.duplicate(this.object.system),
+      system: duplicate(this.object.system),
-      config: foundry.utils.duplicate(game.system.malefices.config),
+      config: duplicate(game.system.malefices.config),
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
@@ -76,7 +90,7 @@ export class MaleficesItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   postItem() {
-    let chatData = foundry.utils.duplicate(this.item)
+    let chatData = duplicate(this.item)
     if (this.actor) {
       chatData.actor = { id: this.actor.id };
     }

modules/malefices-main.js

@@ -18,7 +18,6 @@ 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                  */
@@ -66,7 +65,6 @@ Hooks.once("init", async function () {
   Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true });
 
   MaleficesUtility.init()
-
 });
 
 /* -------------------------------------------- */
@@ -80,7 +78,32 @@ function welcomeMessage() {
       <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)` });
+      <p>Commandes : /tirage pour le tirage des tarots et /resume pour le résumé des PJs` });
+  }
+}
+/* -------------------------------------------- */
+// Register world usage statistics
+function registerUsageCount(registerKey) {
+  if (game.user.isGM) {
+    game.settings.register(registerKey, "world-key", {
+      name: "Unique world key",
+      scope: "world",
+      config: false,
+      default: "",
+      type: String
+    });
+
+    let worldKey = game.settings.get(registerKey, "world-key")
+    if (worldKey == undefined || worldKey == "") {
+      worldKey = randomID(32)
+      game.settings.set(registerKey, "world-key", worldKey)
+    }
+    // Simple API counter
+    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
+    //$.ajaxSetup({
+    //headers: { 'Access-Control-Allow-Origin': '*' }
+    //})
+    $.ajax(regURL)
   }
 }
 
@@ -98,9 +121,16 @@ Hooks.once("ready", function () {
     });
   }
 
-  ClassCounter.registerUsageCount();
+  // CSS patch for v9
+  if (game.version) {
+    let sidebar = document.getElementById("sidebar");
+    sidebar.style.width = "min-content";
+  }
+
+  registerUsageCount('fvtt-malefices')
   welcomeMessage();
   MaleficesUtility.ready()
+  MaleficesUtility.init()
   MaleficesCharacterSummary.ready()
 
 })

modules/malefices-npc-sheet.js

@@ -11,7 +11,7 @@ export class MaleficesNPCSheet extends ActorSheet {
   /** @override */
   static get defaultOptions() {
 
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return 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 = foundry.utils.duplicate(objectData)
+    let actorData = 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( foundry.utils.duplicate(this.actor.getWeapons()) ),
+      weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
-      armors: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getArmors())),
+      armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
-      shields: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getShields())),
+      shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
-      spells: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getLore())),
+      spells: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getLore())),
-      equipments: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquipmentsOnly()) ),
+      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
-      equippedWeapons: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquippedWeapons()) ),
+      equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ),
       equippedArmor: this.actor.getEquippedArmor(),
       equippedShield: this.actor.getEquippedShield(),
-      subActors: foundry.utils.duplicate(this.actor.getSubActors()),
+      subActors: duplicate(this.actor.getSubActors()),
-      moneys: foundry.utils.duplicate(this.actor.getMoneys()),
+      moneys: duplicate(this.actor.getMoneys()),
       encCapacity: this.actor.getEncumbranceCapacity(),
       saveRolls: this.actor.getSaveRoll(),
       conditions: this.actor.getConditions(),

modules/malefices-summary-app.js

@@ -5,29 +5,24 @@ import { MaleficesUtility } from "./malefices-utility.js";
 export class MaleficesCharacterSummary extends Application {
 
   /* -------------------------------------------- */
-  static displayPCSummary() {
+  static displayPCSummary(){
-    if (game.user.isGM) {
+    game.system.malefices.charSummary.render(true)
-      game.system.malefices.charSummary.render(true)
-    } else {
-      ui.notifications.info("Commande /tirage réservée au MJ !")
-    }
   }
-
   /* -------------------------------------------- */
-  updatePCSummary() {
+  updatePCSummary(){
-    if (this.rendered) {
+    if ( this.rendered) {
       this.render(true)
     }
   }
-
+   
   /* -------------------------------------------- */
   static createSummaryPos() {
     return { top: 200, left: 200 };
   }
-
+  
   /* -------------------------------------------- */
   static ready() {
-    if (!game.user.isGM) { // Uniquement si GM
+    if ( !game.user.isGM ) { // Uniquement si GM
       return
     }
     let charSummary = new MaleficesCharacterSummary()
@@ -43,7 +38,7 @@ export class MaleficesCharacterSummary extends Application {
 
   /* -------------------------------------------- */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return mergeObject(super.defaultOptions, {
       template: "systems/fvtt-malefices/templates/dialogs/character-summary.hbs",
       popOut: true,
       resizable: true,
@@ -56,14 +51,14 @@ export class MaleficesCharacterSummary extends Application {
   getData() {
     let formData = super.getData();
 
-    formData.pcs = game.actors.filter(ac => ac.type == "personnage" && ac.hasPlayerOwner)
+    formData.pcs = game.actors.filter( ac => ac.type == "personnage" && ac.hasPlayerOwner )
     formData.npcs = []
     let newList = []
-    let toUpdate = false
+    let toUpdate = false    
-    for (let actorId of this.settings.npcList) {
+    for( let actorId of this.settings.npcList ) {
       let actor = game.actors.get(actorId)
       if (actor) {
-        formData.npcs.push(actor)
+        formData.npcs.push( actor )
         newList.push(actorId)
       } else {
         toUpdate = true
@@ -71,7 +66,7 @@ export class MaleficesCharacterSummary extends Application {
     }
     formData.config = game.system.malefices.config
 
-    if (toUpdate) {
+    if ( toUpdate ) {
       this.settings.npcList = newList
       //console.log("Going to update ...", this.settings)
       game.settings.set("world", "character-summary-data", this.settings)
@@ -84,21 +79,21 @@ export class MaleficesCharacterSummary extends Application {
   updateNPC() {
     game.settings.set("world", "character-summary-data", game.system.malefices.charSummary.settings)
     game.system.malefices.charSummary.close()
-    setTimeout(function () { game.system.malefices.charSummary.render(true) }, 500)
+    setTimeout( function() { game.system.malefices.charSummary.render(true)}, 500)
   }
 
   /* -------------------------------------------- */
   async _onDrop(event) {
     //console.log("Dragged data are : ", dragData)
     let data = event.dataTransfer.getData('text/plain')
-    let dataItem = JSON.parse(data)
+    let dataItem = JSON.parse( data)
     let actor = fromUuidSync(dataItem.uuid)
     if (actor) {
-      game.system.malefices.charSummary.settings.npcList.push(actor.id)
+      game.system.malefices.charSummary.settings.npcList.push( actor.id )
       game.system.malefices.charSummary.updateNPC()
-
+      
     } else {
-      ui.notifications.warn("Pas d'acteur trouvé")
+      ui.notifications.warn( "Pas d'acteur trouvé" )
     }
   }
 
@@ -129,6 +124,6 @@ export class MaleficesCharacterSummary extends Application {
       game.system.malefices.charSummary.updateNPC()
     })
 
-  }
+ }
 
 }

modules/malefices-tirage-tarot-dialog.js

@@ -94,7 +94,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
         }
         this.tirageData.secretCards.push(selectedCard)
       }
-      this.tirageData.actors = foundry.utils.duplicate(game.actors)
+      this.tirageData.actors = duplicate(game.actors)
       this.tirageData.state = 'attribute-to-actor'
     }else {
       this.sendCardRequest()

modules/malefices-utility.js

@@ -5,18 +5,18 @@ import { MaleficesCommands } from "./malefices-commands.js";
 /* -------------------------------------------- */
 export class MaleficesUtility {
 
+
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => MaleficesUtility.chatListeners(html));
+    /*Hooks.on("dropCanvasData", (canvas, data) => {
+      MaleficesUtility.dropItemOnToken(canvas, data)
+    });*/
 
     this.rollDataStore = {}
     this.defenderStore = {}
 
     MaleficesCommands.init();
-  }
-
-  /* -------------------------------------------- */
-  static async ready() {
 
     Handlebars.registerHelper('count', function (list) {
       return list.length;
@@ -51,10 +51,6 @@ export class MaleficesUtility {
       default: { npcList: [], x: 200, y: 200 },
       type: Object
     })
-
-    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
-    this.tarots = tarots.map(i => i.toObject())
-
   }
 
   /*-------------------------------------------- */
@@ -65,12 +61,19 @@ export class MaleficesUtility {
 
   /*-------------------------------------------- */
   static getTarots() {
-    return foundry.utils.duplicate(this.tarots)
+    return duplicate(this.tarots)
   }
   static getTarot(tId) {
     return  this.tarots.find(t => t._id == tId)
   }
 
+  /* -------------------------------------------- */
+  static async ready() {
+    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
+    this.tarots = tarots.map(i => i.toObject())
+
+  }
+
   /* -------------------------------------------- */
   static async loadCompendiumData(compendium) {
     const pack = game.packs.get(compendium)
@@ -196,7 +199,7 @@ export class MaleficesUtility {
 
     let id = rollData.rollId
     let oldRollData = this.rollDataStore[id] || {}
-    let newRollData = foundry.utils.mergeObject(oldRollData, rollData)
+    let newRollData = mergeObject(oldRollData, rollData)
     this.rollDataStore[id] = newRollData
   }
 
@@ -402,9 +405,9 @@ export class MaleficesUtility {
 
     // Performs roll
     console.log("Roll formula", diceFormula)
-    let myRoll = await new Roll(diceFormula).roll()
+    let myRoll = new Roll(diceFormula).roll({ async: false })
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = foundry.utils.duplicate(myRoll)
+    rollData.roll = myRoll
     rollData.total = myRoll.total
 
     this.computeResults(rollData)
@@ -462,7 +465,7 @@ export class MaleficesUtility {
 
   /* -------------------------------------------- */
   static blindMessageToGM(chatOptions) {
-    let chatGM = foundry.utils.duplicate(chatOptions);
+    let chatGM = duplicate(chatOptions);
     chatGM.whisper = this.getUsers(user => user.isGM);
     chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
@@ -512,7 +515,7 @@ export class MaleficesUtility {
   /* -------------------------------------------- */
   static getBasicRollData() {
     let rollData = {
-      rollId: foundry.utils.randomID(16),
+      rollId: randomID(16),
       bonusMalusPerso: 0,
       bonusMalusSituation: 0,
       bonusMalusDef: 0,

packs/malefices-archetypes/CURRENT

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

packs/malefices-archetypes/LOG

@@ -1,15 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

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

packs/malefices-armes/LOG

@@ -1,15 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,3 +0,0 @@
-{"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

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

packs/malefices-macros/LOG

@@ -1,15 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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/CURRENT

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

packs/malefices-tarots/LOG

@@ -1,15 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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,64 +1,64 @@
-/* ==================== (A) Fonts ==================== */
+  /* ==================== (A) Fonts ==================== */
-@font-face {
+  @font-face {
-  font-family: "Rivanna";
+    font-family: "Rivanna";
-  src: url('../fonts/rivanna.ttf') format("truetype");
+    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 {
+    --major-button-font-size: 1.05rem;
-/* =================== 1. ACTOR SHEET FONT STYLES =========== */
+    --major-button-font-weight: normal;
-  --window-header-title-font-size: 1.3rem;
+    --major-button-color: #dadada;
-  --window-header-title-font-weight: normal;
-  --window-header-title-color: #f5f5f5;
 
-  --major-button-font-size: 1.05rem;
+    --tab-header-font-size: 1.0rem;
-  --major-button-font-weight: normal;
+    --tab-header-font-weight: 700;
-  --major-button-color: #dadada;
+    --tab-header-color: #403f3e;
+    --tab-header-color-active: #4a0404;
 
-  --tab-header-font-size: 1.0rem;
+    --actor-input-font-size: 0.8rem;
-  --tab-header-font-weight: 700;
+    --actor-input-font-weight: 500;
-  --tab-header-color: #403f3e;
+    --actor-input-color: black;
-  --tab-header-color-active: #4a0404;
 
-  --actor-input-font-size: 0.8rem;
+    --actor-label-font-size: 0.8rem;
-  --actor-input-font-weight: 500;
+    --actor-label-font-weight: 700;
-  --actor-input-color: black;
+    --actor-label-color: #464331c4;
 
-  --actor-label-font-size: 0.8rem;
+  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
-  --actor-label-font-weight: 700;
+    --debug-background-color-red: #ff000054;
-  --actor-label-color: #464331c4;
+    --debug-background-color-blue: #1d00ff54;
+    --debug-background-color-green: #54ff0054;
 
-/* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
+    --debug-box-shadow-red: inset 0 0 2px red;
-  --debug-background-color-red: #ff000054;
+    --debug-box-shadow-blue: inset 0 0 2px blue;
-  --debug-background-color-blue: #1d00ff54;
+    --debug-box-shadow-green: inset 0 0 2px green;
-  --debug-background-color-green: #54ff0054;
+  }
-
-  --debug-box-shadow-red: inset 0 0 2px red;
-  --debug-box-shadow-blue: inset 0 0 2px blue;
-  --debug-box-shadow-green: inset 0 0 2px green;
-}
 
 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
 /* Global styles & Font */
-.fvtt-malefices .window-app {
+.window-app {
-text-align: justify;
+  text-align: justify;
-font-size: 16px;
+  font-size: 16px;
-letter-spacing: 1px;
+  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 */
-.fvtt-malefices .sheet nav.sheet-tabs {
+.sheet nav.sheet-tabs {
-font-size: 0.8rem;
+  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;
@@ -235,11 +235,6 @@ 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;
@@ -401,7 +396,7 @@ li.folder > .folder-header h3 {
 
 /* ======================================== */
 /* Sheet  */
-.fvtt-malefices .window-app.sheet .window-content .sheet-header{
+.window-app.sheet .window-content .sheet-header{
   color: rgba(19, 18, 18, 0.95);
   background: url("../images/ui/background_01_clear.webp");
   /*background: #494e6b;*/
@@ -447,7 +442,7 @@ select {
   margin-left: 2px;
 }
 
-.fvtt-malefices .window-app .window-content, .fvtt-malefices .window-app.sheet .window-content .sheet-body{
+.window-app .window-content, .window-app.sheet .window-content .sheet-body{
   font-size: 0.8rem;
   /*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/
   background: url("../images/ui/background_01_clear.webp");
@@ -465,7 +460,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
   padding: 0;
 }
 
-.malefices-actor-sheet nav.sheet-tabs {
+.sheet nav.sheet-tabs {
   font-size: 1.2rem;
   font-weight: bold;
   height: 3rem;
@@ -481,16 +476,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
   color:beige;
 }
 
-/* Dice tray specific overrides */
+/*  background: rgb(245,245,240) url("../images/ui/fond4.webp") repeat left top;*/
-.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;
@@ -504,7 +490,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] {
@@ -812,9 +798,6 @@ ul, li {
   color: rgba(19, 18, 18, 0.95);
 }
 
-#sidebar .scene {
-  color: rgba(237, 240, 199, 0.95);
-}
 /*  background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/
 
 #sidebar.collapsed {
@@ -971,6 +954,8 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
+  width: 25px;
+  height: 25px;
   display: inline-block;
   background-position:center;
   background-size:cover;

system.json

@@ -46,22 +46,14 @@
       "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": "11",
+    "minimum": "10",
-    "verified": "12"
+    "verified": "10",
+    "maximum": "10"
   },
   "id": "fvtt-malefices",
   "primaryTokenAttribute": "secondary.health",
@@ -72,7 +64,7 @@
   ],
   "title": "Maléfices, le Jeu de Rôle",
   "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "12.0.1",
+  "version": "10.1.0",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v12.0.1.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.1.0.zip",
   "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }

template.json

@@ -25,7 +25,6 @@
           "religion": "",
           "fantastique": "",
           "description": "",
-          "notes": "",
           "gmnotes": ""
         }
       },
@@ -84,8 +83,7 @@
             "value": 0,
             "max": 0
           }
-        },
+        }
-        "equipementlibre": ""
       },
       "npccore": {
         "npctype": "",
@@ -133,7 +131,7 @@
       "description": ""
     },
     "arme": {
-      "armetype": "",
+      "armetype": 0,
       "porteecourte": "",
       "porteemoyenne": "",
       "dommagenormale": 0,

templates/actors/actor-sheet.hbs

@@ -4,11 +4,7 @@
   <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>
 
@@ -149,13 +145,6 @@
     {{!-- 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">
@@ -194,7 +183,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 (Items)</label></h3>
+            <h3><label class="items-title-text">Equipements</label></h3>
           </span>
           <span class="item-field-label-long">
             <label class="short-label">Q.</label>
@@ -339,7 +328,7 @@
             <label class="item-field-label-medium">Sens</label>
           </span>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
         </li>
         {{#each tarots as |tarot key|}}
@@ -368,7 +357,7 @@
             <label class="item-field-label-medium">Sens</label>
           </span>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
         </li>
         {{#each tarotsCache as |tarot key|}}
@@ -396,7 +385,8 @@
           <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

@@ -28,7 +28,7 @@
         {{#if isSuccess}}
           <li><label class="chat-result-text chat-result-success ">Réussite !</label> Votre {{attr.label}} augmente de {{gainAttr}} points.</li>
         {{else}}
-          <li><label class="chat-result-text chat-result-failure ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
+          <li><label class="chat-result-text chat-result-success ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
         {{/if}}
 
       </ul>  

templates/chat/chat-generic-result.hbs

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

templates/dialogs/confrontation-dialog.hbs

@@ -18,14 +18,25 @@
       <div class="flexrow">
         <span class="roll-dialog-label">Degré de la confrontation : </span>
         <select id="confrontationDegre" name="confrontationDegre">
-          {{selectOptions config.confrontationDegreOptions selected=confrontationDegre}}
+          {{#select confrontationDegre}} 
+            <option value="0">0</option>
+            <option value="1">1</option>
+            <option value="2">2</option>
+            <option value="3">3</option>
+            <option value="4">4</option>
+            <option value="5">5</option>
+          {{/select}}
         </select>        
       </div>
 
       <div class="flexrow">
         <span class="roll-dialog-label">Modificateur de confrontation : </span>
         <select id="confrontationModif" name="confrontationModif">
-          {{selectOptions config.confrontationModifOptions selected=confrontationModif}}
+          {{#select confrontationModif}} 
+            <option value="-1">-1</option>
+            <option value="0">0</option>
+            <option value="1">+1</option>
+          {{/select}}
         </select>        
       </div>
 

templates/dialogs/roll-dialog-generic.hbs

@@ -36,14 +36,30 @@
       <div class="flexrow">
         <span class="roll-dialog-label">Bonus/Malus biographique : </span>
         <select id="bonusMalusPerso" name="bonusMalusPerso">
-          {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusPerso nameAttr="value" labelAttr="label"}}
+          {{#select bonusMalusPerso}} 
+            <option value="-3">-3</option>
+            <option value="-2">-2</option>
+            <option value="-1">-1</option>
+            <option value="0">0</option>
+            <option value="1">+1</option>
+            <option value="2">+2</option>
+            <option value="3">+3</option>
+          {{/select}}
         </select>        
       </div>
 
       <div class="flexrow">
         <span class="roll-dialog-label">Bonus/Malus de situation : </span>
         <select id="bonusMalusSituation" name="bonusMalusSituation">
-          {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusSituation nameAttr="value" labelAttr="label"}}
+          {{#select bonusMalusSituation}} 
+            <option value="-3">-3</option>
+            <option value="-2">-2</option>
+            <option value="-1">-1</option>
+            <option value="0">0</option>
+            <option value="1">+1</option>
+            <option value="2">+2</option>
+            <option value="3">+3</option>
+          {{/select}}
         </select>        
       </div>
 
@@ -51,14 +67,23 @@
       <div class="flexrow">
         <span class="roll-dialog-label">Défense : </span>
         <select id="bonusMalusDef" name="bonusMalusDef">
-          {{selectOptions config.bonusMalusDefOptions selected=bonusMalusDef nameAttr="value" labelAttr="label"}}
+          {{#select bonusMalusDef}} 
+            <option value="-3">-6 (réussite critique)</option>
+            <option value="-3">-3 (réussite)</option>
+            <option value="0">0 (echec ou pas d'esquive)</option>
+            <option value="3">+3 (echec critique)</option>
+          {{/select}}
         </select>        
       </div>
 
       <div class="flexrow">
         <span class="roll-dialog-label">Portée : </span>
         <select id="bonusMalusPortee" name="bonusMalusPortee">
-          {{selectOptions config.bonusMalusPorteeOptions selected=bonusMalusPortee nameAttr="value" labelAttr="label"}}
+          {{#select bonusMalusPortee}} 
+            <option value="1">+1 (Portée courte)</option>
+            <option value="0">0 (Portée moyenne)</option>
+            <option value="-1">-1 (Portée longue)</option>
+          {{/select}}
         </select>        
       </div>
       {{/if}}

templates/items/item-archetype-sheet.hbs

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

templates/items/item-arme-sheet.hbs

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

templates/items/item-tarot-sheet.hbs

@@ -26,7 +26,11 @@
           <li class="flexrow">
             <label class="item-field-label-long">Type </label>
             <select class="item-field-label-long" type="text" name="system.tarottype" value="{{system.tarottype}}" data-dtype="String">
-              {{selectOptions config.tarotType selected=system.tarottype}}
+              {{#select system.tarottype}}
+                {{#each config.tarotType as |type key| }}
+                <option value="{{key}}">{{type}}</option>
+                {{/each}}
+              {{/select}}
             </select> 
           </li>