Correction sur competences à 0 + diverses ameliorations

modules/heritiers-actor.js

@@ -73,7 +73,7 @@ export class HeritiersActor extends Actor {
   getOtherMeleeWeapons(excludeArme) {
     let armes = []
     for (let arme of this.items) {
-      if ( HeritiersUtility.isArmeMelee(arme) && arme.id != excludeArme._id) {
+      if (HeritiersUtility.isArmeMelee(arme) && arme.id != excludeArme._id) {
         armes.push(this.prepareArme(arme))
       }
     }
@@ -152,7 +152,7 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   prepareUtileSkill(item) {
     let specList = []
-    if (item && item.system.categorie && item.system.categorie == "utile") {
+    if (item?.system?.categorie == "utile") {
       for (let spec of item.system.specialites) {
         specList.push(spec.name)
       }
@@ -278,7 +278,7 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   async equipItem(itemId) {
     let item = this.items.find(item => item.id == itemId)
-    if (item && item.system) {
+    if (item?.system) {
       let update = { _id: item.id, "system.equipped": !item.system.equipped }
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
@@ -339,7 +339,7 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   async equipGear(equipmentId) {
     let item = this.items.find(item => item.id == equipmentId);
-    if (item && item.system.data) {
+    if (item?.system) {
       let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
@@ -501,7 +501,7 @@ export class HeritiersActor extends Actor {
   incDecTricherie(value) {
     let tricherie = this.system.rang.tricherie
     tricherie.value += value
-    if ( tricherie.value < 0 || tricherie.value > tricherie.max) {
+    if (tricherie.value < 0 || tricherie.value > tricherie.max) {
       ui.notifications.warn("Pas assez de points de Tricherie !")
       return false
     }
@@ -512,9 +512,9 @@ export class HeritiersActor extends Actor {
   }
   /* -------------------------------------------- */
   getPireCompetence(compName1, compName2) {
-    let comp1 = this.items.find( it => it.name == compName1)
-    let comp2 = this.items.find( it => it.name == compName2)
-    if ( comp1 && comp2 ) {
+    let comp1 = this.items.find(it => it.name == compName1)
+    let comp2 = this.items.find(it => it.name == compName2)
+    if (comp1 && comp2) {
       if (comp1.system.niveau > comp2.system.niveau) {
         return comp1
       } else {
@@ -547,7 +547,7 @@ export class HeritiersActor extends Actor {
     }
     if (compName) {
       rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
-      if (rollData.competence && rollData.competence.name) {
+      if (rollData.competence?.name) {
         this.prepareUtileSkill(rollData.competence)
         rollData.actionImg = rollData.competence?.img
       } else {
@@ -595,7 +595,6 @@ export class HeritiersActor extends Actor {
   async rollRootCompetence(compKey) {
     let rollData = this.getCommonRollData()
     rollData.mode = "competence"
-    console.log("Compkey", compKey)
     rollData.competence = { name: this.system.competences[compKey].label, system: { niveau: this.system.competences[compKey].niveau } }
     console.log("RollDatra", rollData)
     let rollDialog = await HeritiersRollDialog.create(this, rollData)
@@ -619,7 +618,7 @@ export class HeritiersActor extends Actor {
       arme.system.isMelee = HeritiersUtility.isArmeMelee(arme)
       let competenceName = "Tir"
       let key = "prec"
-      if (  arme.system.isMelee) {
+      if (arme.system.isMelee) {
         competenceName = "Mêlée"
         key = "agi"
       }
@@ -629,7 +628,7 @@ export class HeritiersActor extends Actor {
       rollData.arme = arme
       rollData.mode = "arme"
       rollData.armes = this.getOtherMeleeWeapons(arme)
-      if (rollData.defenderTokenId && arme.system.isMelee ) {
+      if (rollData.defenderTokenId && arme.system.isMelee) {
         rollData.cacheDifficulte = true
       }
       console.log(">>>> ARME", rollData)
@@ -651,7 +650,7 @@ export class HeritiersActor extends Actor {
       rollData.arme = duplicate(arme)
       rollData.mode = "attaquebrutale"
       rollData.armes = this.getOtherMeleeWeapons(arme)
-      rollData.rulesMalus.push({ name: "Attaque brutale", value: -2 } )
+      rollData.rulesMalus.push({ name: "Attaque brutale", value: -2 })
       let rollDialog = await HeritiersRollDialog.create(this, rollData)
       rollDialog.render(true)
     }
@@ -673,7 +672,7 @@ export class HeritiersActor extends Actor {
       rollDialog.render(true)
     }
   }
-  
+
   /* -------------------------------------------- */
   async rollAssomerArme(armeId) {
     let arme = this.items.get(armeId)

modules/heritiers-main.js

@@ -78,6 +78,17 @@ function welcomeMessage() {
     ` });
 }
 
+/* -------------------------------------------- */
+async function importDefaultScene() {
+  let exists = game.scenes.find(j => j.name == "Accueil");
+  if (!exists) {
+    const scenes = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.scenes")
+    let newDocuments = scenes.filter(i => i.name == "Accueil");
+    await game.scenes.documentClass.create(newDocuments);
+    game.scenes.find(i => i.name == "Accueil").activate();
+  }
+}
+
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -101,7 +112,8 @@ Hooks.once("ready", function () {
   }).catch(err=>
     console.log("No stats available, giving up.")
   )    
-  welcomeMessage()
+  welcomeMessage();
+  importDefaultScene();
 
 });
 
@@ -112,7 +124,7 @@ Hooks.on("chatMessage", (html, content, msg) => {
   if (content[0] == '/') {
     let regExp = /(\S+)/g;
     let commands = content.match(regExp);
-    if (game.system.mournblade.commands.processChatCommand(commands, content, msg)) {
+    if (game.system.lesheritiers.commands.processChatCommand(commands, content, msg)) {
       return false;
     }
   }

modules/heritiers-roll-dialog.js

@@ -18,18 +18,25 @@ export class HeritiersRollDialog extends Dialog {
         icon: '<i class="fas fa-check"></i>',
         label: "Lancer 1d8",
         callback: () => { this.roll("d8") }
-      },
-      rolld10: {
+      }
+    }
+    let enableD10D12 = true
+    if (rollData.competence?.system.niveau == 0) {
+      enableD10D12 = false
+    }
+    if (enableD10D12) {
+      buttons.rolld10 = {
         icon: '<i class="fas fa-check"></i>',
         label: "Lancer 1d10",
         callback: () => { this.roll("d10") }
-      },
-      rolld12: {
+      }
+      buttons.rolld12 =  {
         icon: '<i class="fas fa-check"></i>',
         label: "Lancer 1d12",
         callback: () => { this.roll("d12") }
       }
     }
+
     if (rollData.tricherie) {
       buttons["rollTricherie"] = {
         icon: '<i class="fas fa-check"></i>',
@@ -55,7 +62,7 @@ export class HeritiersRollDialog extends Dialog {
       buttons: buttons,
       close: close
     }
-    // Overwrite in case of carac only -> 1d10
+    // Overwrite in case of carac only -> 1d8
     if (rollData.mode == "carac") {
       conf.buttons = {
         rolld8: {

modules/heritiers-utility.js

@@ -485,7 +485,7 @@ export class HeritiersUtility {
       rangValue = rollData.rang.value
     }
     if (rollData.competence) {
-      let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
+      let compmod = 0 // Bonus de compétence à 0 dans Les Heritiers
       let specBonus = (rollData.useSpecialite) ? 1 : 0
       rollData.diceFormula += `+${rollData.carac.value}+${rangValue}+${rollData.competence.system.niveau}+${specBonus}+${rollData.bonusMalusContext}+${compmod}`
     } else if (rollData.pouvoirBase) {