Ajout arts obscurs

modules/heritiers-actor-sheet.js

@@ -63,6 +63,7 @@ export class HeritiersActorSheet extends ActorSheet {
       questions: await TextEditor.enrichHTML(this.object.system.biodata.questions, {async: true}),
       habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}),
       playernotes: await TextEditor.enrichHTML(this.object.system.biodata.playernotes, {async: true}),
+      magieList: this.actor.prepareMagie(),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -177,6 +178,11 @@ export class HeritiersActorSheet extends ActorSheet {
       let compId  = li.data("item-id")
       this.actor.rollCompetence(compId)
     })
+    html.find('.roll-sort').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let sortId  = li.data("item-id")
+      this.actor.rollSort(sortId)
+    })
     html.find('.roll-attaque-arme').click((event) => {
       const li = $(event.currentTarget).parents(".item")
       let armeId  = li.data("item-id")

modules/heritiers-actor.js

@@ -41,7 +41,7 @@ export class HeritiersActor extends Actor {
       const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.competences")
       data.items = []
       for (let skill of skills) {
-        if (skill.system.categorie == "utile") {
+        if (skill.system.categorie == "utile" && skill.system.profil != "magie") {
           data.items.push(skill.toObject())
         }
       }
@@ -146,6 +146,38 @@ export class HeritiersActor extends Actor {
     HeritiersUtility.sortArrayObjectsByName(pouvoirs)
     return pouvoirs
   }
+  getSorts() {
+    return this.getItemSorted(["sort"])
+  }
+  getCompetencesMagie() {
+    let comp = []
+    for (let item of this.items) {
+      if (item.type == "competence" && item.system.profil == "magie") {
+        let itemObj = foundry.utils.duplicate(item)
+        comp.push(itemObj)
+      }
+    }
+    HeritiersUtility.sortArrayObjectsByName(comp)
+    return comp
+  }
+  prepareMagie() {
+    let magieList = []
+    for (let item of this.items) {
+      if (item.type == "competence" && item.system.profil == "magie") {
+        let magie = {}
+        magie.name = item.name
+        magie.competence = foundry.utils.duplicate(item)
+        magie.sorts = []
+        for (let sort of this.items) {
+          if (sort.type == "sort" && sort.system.competence == item.name) {
+            magie.sorts.push(sort)
+          }
+        }
+        magieList.push(magie)
+      }
+    }
+    return magieList
+  }
 
   /* -------------------------------------------- */
   getSkills() {
@@ -258,12 +290,37 @@ export class HeritiersActor extends Actor {
 
   /* -------------------------------------------- */
   async prepareData() {
-    super.prepareData();
 
     let pvMax = (this.system.caracteristiques.con.rang * 3) + 9 + this.system.pv.mod
     if (this.system.pv.max != pvMax) {
       this.update({ 'system.pv.max': pvMax })
     }
+    if (this.system.biodata.magie || this.type == "pnj") {
+      let pointsAmes = this.system.caracteristiques.esp.rang + this.system.caracteristiques.san.rang + this.getMaxRangMagie()
+      if (this.system.magie.pointsame.max != pointsAmes) {
+        this.update({ 'system.magie.pointsame.max': pointsAmes })
+      }
+    }
+    
+    super.prepareData();
+  }
+
+  /* -------------------------------------------- */
+  getMaxRangMagie() {
+    let niv = 0
+    let bestMagie
+    for (let comp of this.items) {
+      if (comp.type == "competence" && comp.system.profil == "magie") {
+        if (comp.system.niveau > niv) {
+          bestMagie = comp
+          niv = comp.system.niveau
+        }
+      }
+    }
+    if (bestMagie) {
+      return Math.round(bestMagie.system.niveau / 2)
+    }
+    return 0
   }
 
   /* -------------------------------------------- */
@@ -627,6 +684,26 @@ export class HeritiersActor extends Actor {
     rollDialog.render(true)
   }
 
+  /* -------------------------------------------- */
+  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())
+    if (!comp) {
+      ui.notifications.warn("Compétence de magie associée non trouvée !")
+      return
+    }
+
+    let rollData = this.getCommonRollData(comp.id)
+    rollData.mode = "sort"
+    rollData.sort = foundry.utils.duplicate(sort)
+    rollData.sdValue = HeritiersUtility.getSDSortValue(sort.system.niveau)
+    rollData.sortPointsAme = sort.system.niveau
+    rollData.caracKey = sort.system.carac 
+    console.log("RollData", rollData)
+    let rollDialog = await HeritiersRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }
+  
   /* -------------------------------------------- */
   async rollAttaqueArme(armeId) {
     let arme = this.items.get(armeId)
@@ -727,7 +804,7 @@ export class HeritiersActor extends Actor {
           callback: () => {
             rollData.pouvoirPointsUsage = 1;
             HeritiersUtility.rollHeritiers(rollData);
-            }
+          }
         },
         two: {
           icon: '<i class="fas fa-check"></i>',
@@ -735,7 +812,7 @@ export class HeritiersActor extends Actor {
           callback: () => {
             rollData.pouvoirPointsUsage = 2;
             HeritiersUtility.rollHeritiers(rollData);
-            }
+          }
         },
         three: {
           icon: '<i class="fas fa-check"></i>',
@@ -743,7 +820,7 @@ export class HeritiersActor extends Actor {
           callback: () => {
             rollData.pouvoirPointsUsage = 3;
             HeritiersUtility.rollHeritiers(rollData);
-            }
+          }
         },
         four: {
           icon: '<i class="fas fa-check"></i>',
@@ -751,13 +828,13 @@ export class HeritiersActor extends Actor {
           callback: () => {
             rollData.pouvoirPointsUsage = 4;
             HeritiersUtility.rollHeritiers(rollData);
-            }
+          }
         },
         close: {
           icon: '<i class="fas fa-times"></i>',
           label: "Annuler",
           callback: () => {
-            }
+          }
         }
       },
       default: "one",
@@ -766,7 +843,7 @@ export class HeritiersActor extends Actor {
     });
     d.render(true);
   }
-  
+
   /* -------------------------------------------- */
   async rollPouvoir(pouvoirId) {
     let pouvoir = this.items.get(pouvoirId)
@@ -788,7 +865,7 @@ export class HeritiersActor extends Actor {
         if (pouvoir.system.istest && !pouvoir.system.carac) {
           ui.notifications.warn("Le pouvoir actif " + pouvoir.name + " n'a pas de caractéristique associée")
         }
-        if ( pouvoir.system.istest) { 
+        if (pouvoir.system.istest) {
           rollData.carac = foundry.utils.duplicate(this.system.caracteristiques[pouvoir.system.carac])
           rollData.caracKey = pouvoir.system.carac
         } else {

modules/heritiers-config.js

@@ -30,7 +30,8 @@ export const HERITIERS_CONFIG = {
     "combattant": {kind: "physical",name:"Combattant"},
     "erudit": {kind: "mental",name:"Erudit"},
     "savant": {kind: "mental",name:"Savant"},
-    "gentleman": {kind: "mental",name:"Gentleman"}
+    "gentleman": {kind: "mental",name:"Gentleman"},
+    "magie": {kind: "magical", name: "Magie"},
   },
   baseTestPouvoir: {
     "feerie": "Féerie",
@@ -193,6 +194,12 @@ export const HERITIERS_CONFIG = {
     {value: "5", label: "+5"},
     {value: "6", label: "+6"}
   ],
+  listNiveauSort: {
+    "1" : "1",
+    "2" : "2",
+    "3" : "3",
+    "4" : "4"
+  },
   listNiveau: {
     "0": "0",
     "1": "1",

modules/heritiers-item-sheet.js

@@ -76,6 +76,10 @@ export class HeritiersItemSheet extends ItemSheet {
         this.object.system.pointsusagecourant = formData.usageMax
       }
     }
+    if (this.object.type == 'sort' ) {
+      formData.competencesMagie = HeritiersUtility.getCompetencesMagie()
+    }
+
 
     //this.options.editable = !(this.object.origin == "embeddedItem");
     console.log("ITEM DATA", formData, this);

modules/heritiers-item.js

@@ -18,6 +18,7 @@ export const defaultItemImg = {
     fee: "systems/fvtt-les-heritiers/assets/icons/faery_type.webp",
     profil: "systems/fvtt-les-heritiers/assets/icons/profil.webp",
     equipement: "systems/fvtt-les-heritiers/assets/icons/equipement.webp",  
+    sort: "systems/fvtt-les-heritiers/assets/icons/sort.webp",
 }
 
 /**

modules/heritiers-utility.js

@@ -104,6 +104,8 @@ export class HeritiersUtility {
     const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.competences")
     this.skills = skills.map(i => i.toObject())
 
+    this.competencesMagie = this.skills.filter(s => s.system.profil == "magie") 
+
     game.settings.register("fvtt-les-heritiers", "heritiers-heritage", {
       name: "Points d'héritage",
       hint: "Points d'héritage du groupe",
@@ -114,6 +116,19 @@ export class HeritiersUtility {
     })
   }
 
+  /* -------------------------------------------- */
+  static getSDSortValue(niveau) {
+    if (niveau <= 2) return 12;
+    if (niveau <= 4) return 14;
+    if (niveau <= 6) return 16;
+    return 18;
+  }
+  
+  /* -------------------------------------------- */
+  static getCompetencesMagie() {
+    return this.competencesMagie
+  }
+
   /* -------------------------------------------- */
   static async loadCompendiumData(compendium) {
     const pack = game.packs.get(compendium);