v10/v11 compatibility

README.md

@@ -1,5 +1,7 @@
 # Système Foundry pour Maléfices (French RPG, Arkhane Asylum Publishing)
 
+[Vue du système](https://www.lahiette.com/leratierbretonnien/wp-content/uploads/2023/02/malefices_snapshot.webp)
+
 ## EN
 
 Unofficial system for Maléfices v4 (French version from Arkhane Asylum Publishing).

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-actor.js

@@ -229,9 +229,9 @@ 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)
   }
 
   /* -------------------------------------------- */
@@ -372,7 +372,7 @@ export class MaleficesActor extends Actor {
       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+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)
       }

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,20 @@ export class MaleficesCommands {
       tirageDialog.render(true)
     }
   }
+  /* --------------------------------------------- */
+  static async tirerCarte(msg) {
+    let deck =  MaleficesUtility.getTarots()
+    let index = Math.round(Math.random() * (deck.length-1))
+    let selectedCard = deck[index]
+    selectedCard.system.ispositif = true
+    if ( selectedCard.system.isdualside) { // Cas des cartes pouvant avoir 2 sens
+      selectedCard.system.ispositif = (Math.random() > 0.5)
+    }
+    selectedCard.system.isgm = false
+    selectedCard.value = (selectedCard.system.ispositif)? selectedCard.system.numericvalueup : selectedCard.system.numericvaluedown
+    MaleficesUtility.createChatMessage(game.user.name, "", {
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
+    })
+  }
 
 }

modules/malefices-main.js

@@ -65,10 +65,12 @@ Hooks.once("init", async function () {
   Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true });
 
   MaleficesUtility.init()
+
 });
 
 /* -------------------------------------------- */
 function welcomeMessage() {
+  if (game.user.isGM) {
     ChatMessage.create({
       user: game.user.id,
       whisper: [game.user.id],
@@ -77,9 +79,9 @@ 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)` });
+  }
 }
-
 /* -------------------------------------------- */
 // Register world usage statistics
 function registerUsageCount(registerKey) {
@@ -120,16 +122,9 @@ Hooks.once("ready", function () {
     });
   }
 
-  // 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-summary-app.js

@@ -6,8 +6,13 @@ 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) {

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,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)
@@ -407,7 +404,7 @@ export class MaleficesUtility {
     console.log("Roll formula", diceFormula)
     let myRoll = new Roll(diceFormula).roll({ async: false })
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = myRoll
+    rollData.roll = duplicate(myRoll)
     rollData.total = myRoll.total
 
     this.computeResults(rollData)

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

styles/simple.css

@@ -235,6 +235,11 @@ table {border: 1px solid #7a7971;}
   object-position: 50% 0;
   border-width: 0px;
 }
+.profile-img-container {
+  margin-right: 0.2rem;
+  max-width: 140px;
+  width: 140px;
+}
 
 .button-img {
   vertical-align: baseline;
@@ -754,6 +759,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;
@@ -950,8 +959,6 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
   display: inline-block;
   background-position:center;
   background-size:cover;

system.json

@@ -46,14 +46,23 @@
       "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"
+    "verified": "11",
+    "maximum": "11"
   },
   "id": "fvtt-malefices",
   "primaryTokenAttribute": "secondary.health",
@@ -64,7 +73,7 @@
   ],
   "title": "Maléfices, le Jeu de Rôle",
   "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "10.0.23",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.23.zip",
+  "version": "11.0.0",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v11.0.0.zip",
   "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }

template.json

@@ -83,7 +83,8 @@
             "value": 0,
             "max": 0
           }
-        }
+        },
+        "equipementlibre": ""
       },
       "npccore": {
         "npctype": "",
@@ -131,7 +132,7 @@
       "description": ""
     },
     "arme": {
-      "armetype": 0,
+      "armetype": "",
       "porteecourte": "",
       "porteemoyenne": "",
       "dommagenormale": 0,

templates/actors/actor-sheet.hbs

@@ -4,7 +4,11 @@
   <header class="sheet-header">
     <div class="header-fields">
       <div class="flexrow">
+
+        <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>
 
@@ -145,6 +149,13 @@
     {{!-- Equipement Tab --}}
     <div class="tab equipements" data-group="primary" data-tab="equipements">
 
+      <span class="item-name-label-header items-title-bg">
+          <h3><label class="items-title-text">Equipements (saisie libre)</label></h3>
+      </span>
+      <div class="form-group small-editor">
+        {{editor equipementlibre target="system.equipementlibre" button=true owner=owner editable=editable}}
+      </div>
+
       <ul class="item-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
           <span class="item-name-label-header">
@@ -183,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>
@@ -328,7 +339,7 @@
             <label class="item-field-label-medium">Sens</label>
           </span>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
         </li>
         {{#each tarots as |tarot key|}}
@@ -347,6 +358,7 @@
         {{/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">
@@ -356,7 +368,7 @@
             <label class="item-field-label-medium">Sens</label>
           </span>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
         </li>
         {{#each tarotsCache as |tarot key|}}
@@ -374,6 +386,7 @@
         </li>
         {{/each}}
       </ul>
+      {{/if}}
 
   </div>
 

templates/chat/chat-generic-result.hbs

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