Ajout zone libre, macros et tirage de carte

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

modules/malefices-actor-sheet.js

@@ -44,6 +44,9 @@ export class MaleficesActorSheet extends ActorSheet {
       phyMalus: this.actor.getPhysiqueMalus(),
       elementsbio: this.actor.getElementsBio(),
       sorts: this.actor.getSorts(),
+      description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
+      notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }),
+      equipementlibre: await TextEditor.enrichHTML(this.object.system.equipementlibre, { async: true }),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,

modules/malefices-commands.js

@@ -12,6 +12,7 @@ export class MaleficesCommands {
     if (!game.system.malefices.commands) {
       const commands = new MaleficesCommands();
       commands.registerCommand({ path: ["/tirage"], func: (content, msg, params) => MaleficesCommands.createTirage(msg), descr: "Tirage des tarots" });
+      commands.registerCommand({ path: ["/carte"], func: (content, msg, params) => MaleficesCommands.tirerCarte(msg), descr: "Tirer une carte" });
       commands.registerCommand({ path: ["/resume"], func: (content, msg, params) => MaleficesCharacterSummary.displayPCSummary(), descr: "Affiche la liste des PJs!" });
       game.system.malefices.commands = commands;
     }
@@ -105,7 +106,7 @@ export class MaleficesCommands {
     ChatMessage.create(msg);
   }
 
-  /* -------------------------------------------- */
+  /* --------------------------------------------- */
   static async createTirage(msg) {
     if (game.user.isGM) {
       let tirageData = {
@@ -127,5 +128,19 @@ 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
+    MaleficesUtility.createChatMessage(game.user.name, "", {
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
+    })
+  }
 
 }

modules/malefices-main.js

@@ -64,7 +64,6 @@ Hooks.once("init", async function () {
   Items.unregisterSheet("core", ItemSheet);
   Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true });
 
-  MaleficesUtility.init()
 });
 
 /* -------------------------------------------- */
@@ -78,7 +77,7 @@ 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 et /resume pour le résumé des PJs` });
+      <p>Commandes : /tirage pour le tirage des tarots, /tirer pour tirer une simple carte et /resume pour le résumé des PJs (MJ seulement)` });
   }
 }
 /* -------------------------------------------- */
@@ -130,7 +129,6 @@ Hooks.once("ready", function () {
   registerUsageCount('fvtt-malefices')
   welcomeMessage();
   MaleficesUtility.ready()
-  MaleficesUtility.init()
   MaleficesCharacterSummary.ready()
 
 })

modules/malefices-summary-app.js

@@ -5,12 +5,17 @@ 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)
+    } else {
+      ui.notifications.info("Commande /tirage réservée au MJ !")
     }
+  }
+
   /* -------------------------------------------- */
-  updatePCSummary(){
+  updatePCSummary() {
-    if ( this.rendered) {
+    if (this.rendered) {
       this.render(true)
     }
   }
@@ -22,7 +27,7 @@ export class MaleficesCharacterSummary extends Application {
 
   /* -------------------------------------------- */
   static ready() {
-    if ( !game.user.isGM ) { // Uniquement si GM
+    if (!game.user.isGM) { // Uniquement si GM
       return
     }
     let charSummary = new MaleficesCharacterSummary()
@@ -51,14 +56,14 @@ export class MaleficesCharacterSummary extends Application {
   getData() {
     let formData = super.getData();
 
-    formData.pcs = game.actors.filter( ac => ac.type == "personnage" && ac.hasPlayerOwner )
+    formData.pcs = game.actors.filter(ac => ac.type == "personnage" && ac.hasPlayerOwner)
     formData.npcs = []
     let newList = []
     let toUpdate = false
-    for( let actorId of this.settings.npcList ) {
+    for (let actorId of this.settings.npcList) {
       let actor = game.actors.get(actorId)
       if (actor) {
-        formData.npcs.push( actor )
+        formData.npcs.push(actor)
         newList.push(actorId)
       } else {
         toUpdate = true
@@ -66,7 +71,7 @@ export class MaleficesCharacterSummary extends Application {
     }
     formData.config = game.system.malefices.config
 
-    if ( toUpdate ) {
+    if (toUpdate) {
       this.settings.npcList = newList
       //console.log("Going to update ...", this.settings)
       game.settings.set("world", "character-summary-data", this.settings)
@@ -79,21 +84,21 @@ export class MaleficesCharacterSummary extends Application {
   updateNPC() {
     game.settings.set("world", "character-summary-data", game.system.malefices.charSummary.settings)
     game.system.malefices.charSummary.close()
-    setTimeout( function() { game.system.malefices.charSummary.render(true)}, 500)
+    setTimeout(function () { game.system.malefices.charSummary.render(true) }, 500)
   }
 
   /* -------------------------------------------- */
   async _onDrop(event) {
     //console.log("Dragged data are : ", dragData)
     let data = event.dataTransfer.getData('text/plain')
-    let dataItem = JSON.parse( data)
+    let dataItem = JSON.parse(data)
     let actor = fromUuidSync(dataItem.uuid)
     if (actor) {
-      game.system.malefices.charSummary.settings.npcList.push( actor.id )
+      game.system.malefices.charSummary.settings.npcList.push(actor.id)
       game.system.malefices.charSummary.updateNPC()
 
     } else {
-      ui.notifications.warn( "Pas d'acteur trouvé" )
+      ui.notifications.warn("Pas d'acteur trouvé")
     }
   }
 

modules/malefices-utility.js

@@ -7,7 +7,7 @@ export class MaleficesUtility {
 
 
   /* -------------------------------------------- */
-  static async init() {
+  static async ready() {
     Hooks.on('renderChatLog', (log, html, data) => MaleficesUtility.chatListeners(html));
     /*Hooks.on("dropCanvasData", (canvas, data) => {
       MaleficesUtility.dropItemOnToken(canvas, data)
@@ -51,6 +51,10 @@ export class MaleficesUtility {
       default: { npcList: [], x: 200, y: 200 },
       type: Object
     })
+
+    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
+    this.tarots = tarots.map(i => i.toObject())
+
   }
 
   /*-------------------------------------------- */
@@ -67,13 +71,6 @@ export class MaleficesUtility {
     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)

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

system.json

@@ -46,6 +46,15 @@
       "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",
@@ -64,7 +73,7 @@
   ],
   "title": "Maléfices, le Jeu de Rôle",
   "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "10.1.0",
+  "version": "10.1.1",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.1.0.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.1.1.zip",
   "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }

template.json

@@ -83,7 +83,8 @@
             "value": 0,
             "max": 0
           }
-        }
+        },
+        "equipementlibre": ""
       },
       "npccore": {
         "npctype": "",

templates/actors/actor-sheet.hbs

@@ -145,6 +145,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">
@@ -183,7 +190,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>