Ajout/upgrade des arts obscurs

modules/heritiers-actor.js

@@ -17,8 +17,8 @@ export class HeritiersActor extends Actor {
   /**
    * Override the create() function to provide additional SoS functionality.
    *
-   * This overrided create() function adds initial items 
-   * Namely: Basic skills, money, 
+   * This overrided create() function adds initial items
+   * Namely: Basic skills, money,
    *
    * @param {Object} data        Barebones actor data which this function adds onto.
    * @param {Object} options     (Unused) Additional options which customize the creation workflow.
@@ -203,6 +203,28 @@ export class HeritiersActor extends Actor {
     item.specList = specList.toString()
   }
 
+  /* -------------------------------------------- */
+  organizeMagicSkills() {
+    let comp = {}
+    for (let key in game.system.lesheritiers.config.competenceProfil) {
+      if (game.system.lesheritiers.config.competenceProfil[key].kind == "magical")
+        comp[key] = { skills: [], niveau: 0 }
+    }
+    for (let item of this.items) {
+      if (item.type == "competence") {
+        if (item.system.categorie == "utile" && comp[item.system.profil]) {
+          this.prepareUtileSkill(item)
+          comp[item.system.profil].skills.push(item)
+        }
+      }
+    }
+
+    for (let key in comp) {
+      HeritiersUtility.sortArrayObjectsByName(comp[key].skills)
+    }
+    return Object.fromEntries(Object.entries(comp).sort())
+  }
+
   /* -------------------------------------------- */
   organizeUtileSkills(kind = "mental") {
     let comp = {}
@@ -224,6 +246,7 @@ export class HeritiersActor extends Actor {
     }
     return Object.fromEntries(Object.entries(comp).sort())
   }
+
   /* -------------------------------------------- */
   organizeContacts() {
     let contactList = {}
@@ -301,7 +324,7 @@ export class HeritiersActor extends Actor {
         this.update({ 'system.magie.pointsame.max': pointsAmes })
       }
     }
-    
+
     super.prepareData();
   }
 
@@ -687,7 +710,7 @@ export class HeritiersActor extends Actor {
   /* -------------------------------------------- */
   async rollSort(sortId) {
     let sort = this.items.get(sortId)
-    let comp = this.items.find(it => it.type =="competence" && it.name.toLowerCase() == sort.system.competence.toLowerCase())
+    let comp = this.items.find(it => it.type == "competence" && it.name.toLowerCase() == sort.system.competence.toLowerCase())
     if (!comp) {
       ui.notifications.warn("Compétence de magie associée non trouvée !")
       return
@@ -698,12 +721,21 @@ export class HeritiersActor extends Actor {
     rollData.sort = foundry.utils.duplicate(sort)
     rollData.sdValue = HeritiersUtility.getSDSortValue(sort.system.niveau)
     rollData.sortPointsAme = sort.system.niveau
-    rollData.caracKey = sort.system.carac 
+    if (sort.system.carac2 != "none") {
+      // get the best carac between carac1 and carac2
+      if (this.system.caracteristiques[sort.system.carac1].value > this.system.caracteristiques[sort.system.carac2].value) {
+        rollData.caracKey = sort.system.carac1
+      } else {
+        rollData.caracKey = sort.system.carac2
+      }
+      rollData.caracMessage = "Ce sort peut être lancé avec " + game.system.lesheritiers.config.caracList[sort.system.carac1] + " ou " + game.system.lesheritiers.config.caracList[sort.system.carac2] + ". La meilleure caractéristique a été selectionnée."
+    }
     console.log("RollData", rollData)
     let rollDialog = await HeritiersRollDialog.create(this, rollData)
     rollDialog.render(true)
   }
-  
+
+
   /* -------------------------------------------- */
   async rollAttaqueArme(armeId) {
     let arme = this.items.get(armeId)