Enable links in editor

README.md

@@ -1,4 +1,23 @@
-# fvtt-mournblade
+# Système Foundry pour Mournblade (French RPG, Titam France/Sombres Projets)
 
-FoundryVTT system for Mournblade from Sombres Projets
+## EN
 
+Unofficial system for Mournblade (French version from Titam France).
+
+Books are mandatory to play and are available at : http://www.titam-france.fr
+
+## FR
+
+Système non-officiel pour le JDR Mournblade (Titam France).
+
+Ce système a été autorisé par Ludospherik ( http://www.ludospherik.fr/ ), merci à eux !
+
+Les livres du jeu sont nécessaires pour jouer, et sont disponibles ici : http://www.titam-france.fr
+
+# Credits 
+
+Mournblade, le jeu de rôle de Sword & Sorcery, is a property of Titam France/Sombres Projets.
+
+# Developmement 
+
+LeRatierBretonnien

modules/mournblade-actor-sheet.js

@@ -44,6 +44,8 @@ export class MournbladeActorSheet extends ActorSheet {
       protections: duplicate(this.actor.getArmors()),
       dons: duplicate(this.actor.getDons()),
       alignement: this.actor.getAlignement(),
+      aspect: this.actor.getAspect(),
+      marge: this.actor.getMarge(),
       tendances:duplicate(this.actor.getTendances()),
       runes:duplicate(this.actor.getRunes()),
       origine: duplicate(this.actor.getOrigine() || {}),
@@ -51,6 +53,7 @@ export class MournbladeActorSheet extends ActorSheet {
       metier: duplicate(this.actor.getMetier()  || {}),
       combat: this.actor.getCombatValues(),      
       equipements: duplicate(this.actor.getEquipments()),
+      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,

modules/mournblade-actor.js

@@ -145,6 +145,12 @@ export class MournbladeActor extends Actor {
   }
 
   /* -------------------------------------------- */
+  getAspect() {
+    return (this.system.balance.loi > this.system.balance.chaos) ? this.system.balance.loi : this.system.balance.chaos    
+  }
+  getMarge() {
+    return Math.abs( this.system.balance.loi - this.system.balance.chaos)
+  }
   getAlignement() {
     return (this.system.balance.loi > this.system.balance.chaos) ? "loyal" : "chaotique"
   }
@@ -188,11 +194,11 @@ export class MournbladeActor extends Actor {
     if (this.type == 'personnage') {
       let newSante = this.system.sante.bonus + (this.system.attributs.pui.value + this.system.attributs.tre.value) * 2 + 5
       if (this.system.sante.base != newSante) {
-        this.update({ 'data.sante.base': newSante })
+        this.update({ 'system.sante.base': newSante })
       }
       let newAme = (this.system.attributs.cla.value + this.system.attributs.tre.value) * this.system.biodata.amemultiplier + 5
       if (this.system.ame.fullmax != newAme) {
-        this.update({ 'data.ame.fullmax': newAme })
+        this.update({ 'system.ame.fullmax': newAme })
       }
     }
 
@@ -218,7 +224,7 @@ export class MournbladeActor extends Actor {
   async equipItem(itemId) {
     let item = this.items.find(item => item.id == itemId);
     if (item && item.system.data) {
-      let update = { _id: item.id, "data.equipped": !item.system.equipped };
+      let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -233,7 +239,7 @@ export class MournbladeActor extends Actor {
       } else {
         value = String(value)
       }
-      let update = { _id: item.id, [`data.${itemField}`]: value };
+      let update = { _id: item.id, [`system.${itemField}`]: value };
       this.updateEmbeddedDocuments("Item", [update])
     }
   }
@@ -247,7 +253,7 @@ export class MournbladeActor extends Actor {
   changeBonneAventure(value) {
     let newBA = this.system.bonneaventure.actuelle
     newBA += value
-    this.update({ 'data.bonneaventure.actuelle': newBA })
+    this.update({ 'system.bonneaventure.actuelle': newBA })
   }
 
   /* -------------------------------------------- */
@@ -259,7 +265,7 @@ export class MournbladeActor extends Actor {
   changeEclat(value) {
     let newE = this.system.eclat.value
     newE += value
-    this.update({ 'data.eclat.value': newE })
+    this.update({ 'system.eclat.value': newE })
   }
 
   /* -------------------------------------------- */
@@ -274,7 +280,7 @@ export class MournbladeActor extends Actor {
     } else {
       ame.currentmax -= value
     }
-    this.update( {'data.ame': ame})
+    this.update( {'system.ame': ame})
   }
 
   /* -------------------------------------------- */
@@ -302,7 +308,7 @@ export class MournbladeActor extends Actor {
   async equipGear(equipmentId) {
     let item = this.items.find(item => item.id == equipmentId);
     if (item && item.system.data) {
-      let update = { _id: item.id, "data.equipped": !item.system.equipped };
+      let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -319,7 +325,7 @@ export class MournbladeActor extends Actor {
   async addSubActor(subActorId) {
     let subActors = duplicate(this.system.subactors);
     subActors.push(subActorId);
-    await this.update({ 'data.subactors': subActors });
+    await this.update({ 'system.subactors': subActors });
   }
   /* -------------------------------------------- */
   async delSubActor(subActorId) {
@@ -329,7 +335,7 @@ export class MournbladeActor extends Actor {
         newArray.push(id);
       }
     }
-    await this.update({ 'data.subactors': newArray });
+    await this.update({ 'system.subactors': newArray });
   }
 
   /* -------------------------------------------- */
@@ -337,7 +343,7 @@ export class MournbladeActor extends Actor {
     let objetQ = this.items.get(objetId)
     if (objetQ) {
       let newQ = objetQ.system.quantity + incDec;
-      const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'data.quantity': newQ }]); // pdates one EmbeddedEntity
+      const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantity': newQ }]); // pdates one EmbeddedEntity
     }
   }
 
@@ -351,7 +357,12 @@ export class MournbladeActor extends Actor {
     let comp = this.items.get(compId)
     let pred = duplicate(comp.system.predilections)
     pred[predIdx].used = true
-    await this.updateEmbeddedDocuments('Item', [{ _id: compId, 'data.predilections': pred }])
+    await this.updateEmbeddedDocuments('Item', [{ _id: compId, 'system.predilections': pred }])
+  }
+
+  /* -------------------------------------------- */
+  getInitiativeScore( ) {
+    return Number(this.system.attributs.adr.value) + Number(this.system.combat.initbonus)
   }
 
   /* -------------------------------------------- */
@@ -403,7 +414,7 @@ export class MournbladeActor extends Actor {
   async rollRune(runeId) {    
     let rollData = this.getCommonRollData("cla", undefined, "Savoir : Runes")
     rollData.rune =  duplicate(this.items.get(runeId) || {})
-    rollData.difficulte = rollData.rune?.data?.seuil || 0
+    rollData.difficulte = rollData.rune?.system?.seuil || 0
     rollData.runemode = "prononcer"
     rollData.runeame  = 1
     console.log("runeData", rollData)

modules/mournblade-combat.js

@@ -9,8 +9,11 @@ export class MournbladeCombat extends Combat {
     for (let cId = 0; cId < ids.length; cId++) {
       const c = this.combatants.get(ids[cId]);
       let id = c._id || c.id;
-      let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1;
+      let initBonus = c.actor ? c.actor.getInitiativeScore() : 0
-      await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]);
+      let roll = new Roll("1d10 + "+initBonus).roll({ async: false})      
+      await MournbladeUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"))
+      //console.log("Init bonus", initBonus, roll.total)
+      await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: roll.total } ]);
     }
 
     return this;

modules/mournblade-item-sheet.js

@@ -63,10 +63,14 @@ export class MournbladeItemSheet extends ItemSheet {
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
+      description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
       mr: (this.object.type == 'specialisation'),
       isGM: game.user.isGM
     }
 
+    if (  objectData.type =="don") {
+      sacrifice = await TextEditor.enrichHTML(this.object.system.sacrifice, {async: true})
+    }
     //this.options.editable = !(this.object.origin == "embeddedItem");
     console.log("ITEM DATA", formData, this);
     return formData;

modules/mournblade-main.js

@@ -67,9 +67,37 @@ function welcomeMessage() {
     whisper: [game.user.id],
     content: `<div id="welcome-message-Mournblade"><span class="rdd-roll-part">
     <strong>Bienvenue dans les Jeunes Royaumes de Mournblade !</strong>
+    <p>Les livres de Mournblade sont nécessaires pour jouer : https://www.titam-france.fr</p>
+    <p>Mournblade est jeude rôle publié par Titam France/Sombres projets, tout les droits leur appartiennent.<p>
     ` });
 }
 
+/* -------------------------------------------- */
+// Register world usage statistics
+function registerUsageCount( registerKey ) {
+  if ( game.user.isGM ) {
+    game.settings.register(registerKey, "world-key", {
+      name: "Unique world key",
+      scope: "world",
+      config: false,
+      default: "",
+      type: String
+    });
+
+    let worldKey = game.settings.get(registerKey, "world-key")
+    if ( worldKey == undefined || worldKey == "" ) {
+      worldKey = randomID(32)
+      game.settings.set(registerKey, "world-key", worldKey )
+    }
+    // Simple API counter
+    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
+    //$.ajaxSetup({
+      //headers: { 'Access-Control-Allow-Origin': '*' }
+    //})
+    $.ajax(regURL)
+  }
+}
+
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -90,7 +118,7 @@ Hooks.once("ready", function () {
     let sidebar = document.getElementById("sidebar");
     sidebar.style.width = "min-content";
   }
-
+  registerUsageCount('fvtt-mournblade')
   welcomeMessage();
 });
 

modules/mournblade-utility.js

@@ -327,7 +327,7 @@ export class MournbladeUtility {
     }
 
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
-    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"));
+    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
     rollData.roll = myRoll
     console.log(">>>> ", myRoll)
 

system.json

@@ -1,10 +1,11 @@
 {
   "id": "fvtt-mournblade",
   "description": "Mournblade RPG for FoundryVTT",
-  "version": "10.0.1",
+  "version": "10.0.6",
   "authors": [
     {
-      "name": "Uberwald/LeRatierBretonnien"
+      "name": "Uberwald/LeRatierBretonnien",
+      "flags": {}
     }
   ],
   "esmodules": [
@@ -12,136 +13,117 @@
   ],
   "gridDistance": 5,
   "gridUnits": "m",
-  "languages": [
-  ],
-  "library": false,
   "license": "LICENSE.txt",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-mournblade/raw/branch/v10/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-mournblade/archive/fvtt-mournblade-10.0.1.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-mournblade/archive/fvtt-mournblade-10.0.6.zip",
-  "manifestPlusVersion": "1.0.0",
-  "media": [],
   "packs": [
     {
       "type": "Item",
       "label": "Compétences",
       "name": "skills",
-      "path": "./packs/skills.db",
+      "path": "packs/skills.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "skill",
+      "flags": {}
-        "competence"
-      ]
     },
     {
       "type": "Item",
       "label": "Armes",
       "name": "armes",
-      "path": "./packs/armes.db",
+      "path": "packs/armes.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "arme"
+      "flags": {}
-      ]
     },
     {
       "type": "Item",
       "label": "Protections",
       "name": "protection",
-      "path": "./packs/protection.db",
+      "path": "packs/protection.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "armor",
+      "flags": {}
-        "shield"
-      ]
     },
     {
       "type": "Item",
       "label": "Equipement",
       "name": "equipement",
-      "path": "./packs/equipement.db",
+      "path": "packs/equipement.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "equipement"
+      "flags": {}
-      ]
     },
     {
       "label": "Dons",
       "type": "Item",
       "name": "dons",
-      "path": "./packs/dons.db",
+      "path": "packs/dons.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "don"
+      "flags": {}
-      ]
     },
     {
       "type": "Item",
       "label": "Origines",
       "name": "origines",
-      "path": "./packs/origines.db",
+      "path": "packs/origines.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "originess"
+      "flags": {}
-      ]
     },
     {
       "type": "Item",
       "label": "Héritages",
       "name": "heritages",
-      "path": "./packs/heritages.db",
+      "path": "packs/heritages.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "héritage"
+      "flags": {}
-      ]
     },
     {
       "type": "Item",
       "label": "Métiers",
       "name": "metiers",
-      "path": "./packs/metiers.db",
+      "path": "packs/metiers.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "metier"
+      "flags": {}
-      ]
     },
     {
       "type": "Item",
       "label": "Tendances",
       "name": "tendances",
-      "path": "./packs/tendances.db",
+      "path": "packs/tendances.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "tendance"
+      "flags": {}
-      ]
     },
     {
       "type": "Item",
       "label": "Traits chaotiques",
       "name": "traits-chaotiques",
-      "path": "./packs/traits-chaotiques.db",
+      "path": "packs/traits-chaotiques.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "traits chaotiques"
+      "flags": {}
-      ]
     },
     {
       "type": "Item",
       "label": "Runes",
       "name": "runes",
-      "path": "./packs/runes.db",
+      "path": "packs/runes.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "runes"
+      "flags": {}
-      ]
     },
     {
       "type": "RollTable",
       "label": "Tables",
       "name": "tables",
-      "path": "./packs/tables.db",
+      "path": "packs/tables.db",
       "system": "fvtt-mournblade",
-      "tags": [
+      "private": false,
-        "tables"
+      "flags": {}
-      ]
     }
   ],
   "primaryTokenAttribute": "secondary.health",
@@ -150,8 +132,12 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 18,
   "title": "Mournblade",
   "url": "https://www.uberwald.me/gitea/public/fvtt-mournblade",
-  "background": "systems/fvtt-mournblade/assets/ui/fond_mournblade.webp"
+  "background": "systems/fvtt-mournblade/assets/ui/fond_mournblade.webp",
+  "compatibility": {
+    "minimum": "10",
+    "verified": "10.286",
+    "maximum": "10"
+  }
 }

templates/actor-sheet.html

@@ -8,25 +8,41 @@
         <div class="flexcol">
           <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
           <div class="flexrow">
-            <span class="flexrow">
+
-              <h4 class="item-name-label competence-name item-field-label-short">{{upperFirst alignement}}</h4>
+            <ul class="item-list alternate-list">
-              <label class="item-name-label competence-name item-field-label-short">Loi</label>
+              <li class="item flexrow ">
+                <label class="item-name-label competence-name item-field-label-short"><strong>Loi</strong></label>
+              
+                <label class="item-name-label competence-name item-field-label-short">Niveau</label><input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                name="system.balance.loi" value="{{data.balance.loi}}" data-dtype="Number" />
+  
+                <label class="item-name-label competence-name item-field-label-short">Points</label>
                 <select class="status-small-label color-class-common item-field-label-short" type="text"
-                name="system.balance.loi" value="{{data.balance.loi}}" data-dtype="Number">
+                  name="system.balance.pointsloi" value="{{data.balance.pointsloi}}" data-dtype="Number">
-                {{#select data.balance.loi}}
+                  {{#select data.balance.pointsloi}}
                   {{> systems/fvtt-mournblade/templates/partial-list-niveau.html}}
                   {{/select}}
                 </select>
-              <label class="item-name-label competence-name item-field-label-short">Chaos</label>
+
-              <select class="status-small-label color-class-common item-field-label-short" type="text"
+                <label class="item-name-label competence-name item-field-label-medium">Aspect {{aspect}}</label>
-                name="system.balance.chaos" value="{{data.balance.chaos}}" data-dtype="Number">
+              </li>
-                {{#select data.balance.chaos}}
+
+              <li class="item flexrow ">
+                <label class="item-name-label competence-name item-field-label-short"><strong>Chaos</strong></label>
+
+                <label class="item-name-label competence-name item-field-label-short">Niveau</label><input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
+                name="system.balance.chaos" value="{{data.balance.chaos}}" data-dtype="Number" />
+  
+                <label class="item-name-label competence-name item-field-label-short">Points</label><select class="status-small-label color-class-common item-field-label-short" type="text"
+                  name="system.balance.pointschaos" value="{{data.balance.pointschaos}}" data-dtype="Number">
+                  {{#select data.balance.pointschaos}}
                   {{> systems/fvtt-mournblade/templates/partial-list-niveau.html}}
                   {{/select}}
                 </select>
-            </span>
+                <label class="item-name-label competence-name item-field-label-medium">Marge {{marge}}</label>
-          </div>
+              </li>
-          <div class="flexrow">
+              
+              <li class="item flexrow ">
                 <h4 class="item-name-label competence-name">Bonne Aventure</h4>
                 <label class="item-name-label competence-name item-field-label-short">Base</label>
                 <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
@@ -34,8 +50,10 @@
                 <label class="item-name-label competence-name item-field-label-short">Actuelle</label>
                 <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
                   name="system.bonneaventure.actuelle" value="{{data.bonneaventure.actuelle}}" data-dtype="Number" />
-          </div>
+              </li>
-          <div class="flexrow">
+
+              <li class="item flexrow ">
+                <h4 class="item-name-label competence-name">Alignement {{alignement}}</h4>
                 <h4 class="item-name-label competence-name item-field-label-short">Eclat</h4>
                 <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
                   name="system.eclat.value" value="{{data.eclat.value}}" data-dtype="Number" />
@@ -43,6 +61,9 @@
                 <h4 class="item-name-label competence-name item-field-label-medium">Expérience</h4>
                 <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
                   name="system.experience.value" value="{{data.experience.value}}" data-dtype="Number" />
+
+                </li>
+            </ul>
           </div>
 
         </div>
@@ -511,7 +532,7 @@
         <h3>Description</h3>
       </span>
       <div class="medium-editor item-text-long-line">
-        {{editor data.biodata.description target="system.biodata.description" button=true owner=owner editable=editable}}
+        {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
       </div>
 
     </div>

templates/item-competence-sheet.html

@@ -64,7 +64,7 @@
           <li class="prediction-item item flexrow" data-prediction-index="{{key}}">
               <input type="text" class="padd-right color-class-common edit-prediction"
                 name="system.predilections[{{key}}]" value="{{predilection.name}}" data-dtype="String" />
-                <input class="use-prediction" type="checkbox" name="predilection.used" value="{{predilection.used}}" {{checked predilection.used}} />
+                <label class="generic-label">Utilisée ? <input class="use-prediction" type="checkbox" name="predilection.used" value="{{predilection.used}}" {{checked predilection.used}} /></label>
                 <a class="item-control delete-prediction" title="Supprimer une predilection"><i class="fas fa-trash"></i></a>
           </li>
           {{/each}}

templates/item-don-sheet.html

@@ -32,7 +32,7 @@
       </span>
     
       <div class="small-editor item-text-long-line">
-        {{editor data.sacrifice target="system.sacrifice" button=true owner=owner editable=editable}}
+        {{editor sacrifice target="system.sacrifice" button=true owner=owner editable=editable}}
       </div>      
     
       {{> systems/fvtt-mournblade/templates/partial-item-description.html}}

templates/partial-item-description.html

@@ -2,5 +2,5 @@
     <h3>Description</h3>
   </span>
   <div class="medium-editor item-text-long-line">
-    {{editor data.description target="system.description" button=true owner=owner editable=editable}}
+    {{editor description target="system.description" button=true owner=owner editable=editable}}
   </div>