Add competence roll

Ajout fenetre de roll + gestion de base des rolls
2022-06-04 21:06:33 +02:00 · 2022-06-04 21:06:01 +02:00 · 2022-06-03 08:15:39 +02:00 · 2022-06-01 22:40:32 +02:00
16 changed files with 414 additions and 599 deletions
--- a/modules/mournblade-actor-sheet.js
+++ b/modules/mournblade-actor-sheet.js
@ -27,7 +27,7 @@ export class MournbladeActorSheet extends ActorSheet {
  async getData() {
    const objectData = MournbladeUtility.data(this.object);
    
-    let actorData = duplicate(MournbladeUtility.templateData(this.object));
+    let actorData = duplicate(MournbladeUtility.templateData(this.object))

    let formData = {
      title: this.title,
@ -64,80 +64,27 @@ export class MournbladeActorSheet extends ActorSheet {
    // Everything below here is only needed if the sheet is editable
    if (!this.options.editable) return;
    
-    html.bind("keydown", function(e) { // Ignore Enter in actores sheet
-      if (e.keyCode === 13) return false;
-    });  
-
    // Update Inventory Item
    html.find('.item-edit').click(ev => {
      const li = $(ev.currentTarget).parents(".item")
      let itemId = li.data("item-id")
      const item = this.actor.items.get( itemId )
      item.sheet.render(true)
-    });
+    })      
    // Delete Inventory Item
    html.find('.item-delete').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
      MournbladeUtility.confirmDelete(this, li);
-    });
-    
-    html.find('.spec-group-activate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.specPowerActivate( itemId)
-    });      
-    html.find('.spec-group-deactivate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.specPowerDeactivate( itemId)
-    });      
-
-    html.find('.equip-activate').click(ev => {
+    })
+    html.find('.edit-item-data').change(ev => {
      const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id")
-      this.actor.equipActivate( itemId)
-    });      
-    html.find('.equip-deactivate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id")
-      this.actor.equipDeactivate( itemId)
-    });      
-
-    html.find('.effect-used').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.perkEffectUsed( itemId)
-    });      
-
-    html.find('.perk-status').change(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.updatePerkStatus( itemId, ev.currentTarget.value)
-    });
-    html.find('.power-cost-spent').change(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.updatePowerSpentCost( itemId, ev.currentTarget.value)
-    });
-    html.find('.perk-used').change(ev => {
-      const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id")
-      let index = Number($(ev.currentTarget).data("use-index") )
-      this.actor.updatePerkUsed( itemId, index, ev.currentTarget.checked )
-    });
-    
-    html.find('.subactor-edit').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let actorId = li.data("actor-id");
-      let actor = game.actors.get( actorId );
-      actor.sheet.render(true);
-    });
-    
-    html.find('.subactor-delete').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let actorId = li.data("actor-id");
-      this.actor.delSubActor(actorId);
-    });
+      let itemId    = li.data("item-id")
+      let itemType  = li.data("item-type")
+      let itemField = $(ev.currentTarget).data("item-field")
+      let dataType = $(ev.currentTarget).data("dtype")
+      let value = ev.currentTarget.value
+      this.actor.editItemField(itemId, itemType, itemField, dataType, value)
+    })
    
    html.find('.quantity-minus').click(event => {
      const li = $(event.currentTarget).parents(".item");
@ -148,49 +95,23 @@ export class MournbladeActorSheet extends ActorSheet {
      this.actor.incDecQuantity( li.data("item-id"), +1 );
    } );

-    html.find('.unarmed-attack').click((event) => {
-      this.actor.rollUnarmedAttack();
-    });
-    html.find('.generic-pool-roll').click((event) => {      
-      this.openGenericRoll()
-    } );
-    html.find('.attack-melee').click((event) => {
-      this.actor.rollPool( 'com');
-    });
-    html.find('.attack-ranged').click((event) => {
-      this.actor.rollPool( 'agi');
-    });
-    html.find('.defense-roll').click((event) => {
-      this.actor.rollPool( 'def', true);
-    });
-    html.find('.damage-melee').click((event) => {
-      this.actor.rollPool( 'str');
-    });
-    html.find('.damage-ranged').click((event) => {
-      this.actor.rollPool( 'per');
-    });
-    html.find('.damage-resistance').click((event) => {
-      this.actor.rollPool( 'phy');
-    });
-            
-    html.find('.roll-stat').click((event) => {
-      const statId = $(event.currentTarget).data("stat-key");
-      this.actor.rollStat(statId);
-    });
-    html.find('.roll-mr').click((event) => {
-      this.actor.rollMR();
-    });
+    html.find('.roll-attribut').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let attrKey = li.data("attr-key")
+      this.actor.rollAttribut(attrKey)
+    })
+    html.find('.roll-competence').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let attrKey = $(event.currentTarget).data("attr-key")
+      let compId  = li.data("item-id")
+      this.actor.rollCompetence(attrKey, compId)
+    })
    
    html.find('.roll-spec').click((event) => {
      const li = $(event.currentTarget).parents(".item");
      const specId = li.data("item-id");
      this.actor.rollSpec(specId);
    });
-    html.find('.power-roll').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
-      const powerId = li.data("item-id");
-      this.actor.rollPower(powerId);
-    });        
    html.find('.weapon-roll').click((event) => {
      const li = $(event.currentTarget).parents(".item");
      const weaponId = li.data("item-id");
@ -208,49 +129,15 @@ export class MournbladeActorSheet extends ActorSheet {
      this.actor.rollWeapon(weaponId, true);
    });
    
-    html.find('.weapon-damage').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
-      const weapon = this.actor.getOwnedItem(li.data("item-id"));
-      this.actor.rollDamage(weapon, 'damage');
-    });
-    
    html.find('.lock-unlock-sheet').click((event) => {
      this.options.editScore = !this.options.editScore;
      this.render(true);
    });    
-    html.find('.item-link a').click((event) => {
-      const itemId = $(event.currentTarget).data("item-id");
-      const item = this.actor.getOwnedItem(itemId);
-      item.sheet.render(true);
-    });    
    html.find('.item-equip').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
      this.actor.equipItem( li.data("item-id") );
      this.render(true);      
    });
-    html.find('.power-activate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      this.actor.activatePower( li.data("item-id") );
-      this.render(true); 
-    });
-    
-    html.find('.change-worstfear').change(ev => {
-      this.actor.manageWorstFear( ev.currentTarget.checked )
-    });
-    html.find('.change-desires').change(ev => {
-      this.actor.manageDesires( ev.currentTarget.checked )
-    });
-
-    html.find('.update-field').change(ev => {
-      const fieldName = $(ev.currentTarget).data("field-name");
-      let value = Number(ev.currentTarget.value);
-      this.actor.update( { [`${fieldName}`]: value } );
-    });    
-    html.find('.perk-active').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      this.actor.activatePerk( li.data("item-id") );
-      this.render(true);      
-    });

  }
  
--- a/modules/mournblade-actor.js
+++ b/modules/mournblade-actor.js
@ -54,7 +54,25 @@ export class MournbladeActor extends Actor {
  }
  /* -------------------------------------------- */
  getSkills() {
-    return this.data.items.filter(item => item.type == "competence" )
+    let comp = []
+    for( let item of this.data.items) {
+      item = duplicate(item)
+      if ( item.type == "competence") {
+        item.data.attribut1total = item.data.niveau + (this.data.data.attributs[item.data.attribut1]?.value || 0)
+        item.data.attribut2total = item.data.niveau + (this.data.data.attributs[item.data.attribut2]?.value || 0)
+        item.data.attribut3total = item.data.niveau + (this.data.data.attributs[item.data.attribut3]?.value || 0)
+        if (item.data.niveau == 0) {
+          item.data.attribut1total -= 3
+          item.data.attribut2total -= 3
+          item.data.attribut3total -= 3
+        }
+        item.data.attribut1label = this.data.data.attributs[item.data.attribut1]?.label || ""
+        item.data.attribut2label = this.data.data.attributs[item.data.attribut2]?.label || ""
+        item.data.attribut3label = this.data.data.attributs[item.data.attribut3]?.label || ""
+        comp.push( item )
+      } 
+    }
+    return comp
  }
  
  /* -------------------------------------------- */
@ -81,11 +99,6 @@ export class MournbladeActor extends Actor {
    super._preUpdate(changed, options, user);
  }

-  /* -------------------------------------------- */
-  getActivePerks() {
-    let perks = this.data.items.filter(item => item.type == 'perk' && item.data.data.active);
-    return perks;
-  }
  /* -------------------------------------------- */
  getItemById(id) {
    let item = this.data.items.find(item => item.id == id);
@ -104,6 +117,21 @@ export class MournbladeActor extends Actor {
    }
  }

+  /* -------------------------------------------- */
+  editItemField(itemId, itemType, itemField, dataType, value) {
+    let item= this.data.items.find(item => item.id == itemId)
+    if (item) {
+      console.log("Item ", item, itemField, dataType, value)
+      if (dataType.toLowerCase() == "number") {
+        value = Number(value)
+      } else {
+        value = String(value)
+      }
+      let update = { _id: item.id, [`data.${itemField}`]: value };
+      this.updateEmbeddedDocuments( "Item", [update])
+    }
+  }
+
  /* -------------------------------------------- */
  compareName(a, b) {
    if (a.name < b.name) {
@ -117,7 +145,7 @@ export class MournbladeActor extends Actor {

  /* -------------------------------------------- */
  getAttribute(attrKey) {
-    return this.data.data.attributes[attrKey];
+    return this.data.data.attributes[attrKey]
  }

  /* -------------------------------------------- */
@ -164,39 +192,37 @@ export class MournbladeActor extends Actor {
  }

  /* -------------------------------------------- */
-  getCommonRollData(statKey = undefined, useShield = false) {
+  getCommonRollData(attrKey = undefined, compId = undefined) {
    let rollData = MournbladeUtility.getBasicRollData()
    rollData.alias = this.name
    rollData.actorImg = this.img
    rollData.actorId = this.id
    rollData.img = this.img
-    rollData.activePerks = duplicate(this.getActivePerks())

-    if (statKey) {
-      rollData.statKey = statKey
-      rollData.stat = this.getStat(statKey)
-      rollData.statDicesLevel = rollData.stat.value
-      rollData.statMod = rollData.stat.mod
-      rollData.specList = this.getRelevantSpec(statKey)
-      rollData.selectedSpec = "0"
+    if (attrKey) {
+      rollData.attrKey = attrKey
+      rollData.attr = duplicate(this.data.data.attributs[attrKey])
+    }
+    if (compId) {
+      rollData.competence = duplicate(this.data.items.get(compId) || {})
    }
-
-    this.addEffects(rollData)
-    this.addArmorsShields(rollData, statKey, useShield)
-    this.addWeapons(rollData, statKey, useShield)
-    this.addEquipments(rollData, statKey)
-
    return rollData
  }

  /* -------------------------------------------- */
-  async startRoll(rollData) {
-    this.syncRoll(rollData);
-    //console.log("ROLL DATA", rollData)
-    let rollDialog = await MournbladeRollDialog.create(this, rollData);
-    console.log(rollDialog);
-    rollDialog.render(true);
+  async rollAttribut(attrKey) {
+    let rollData = this.getCommonRollData(attrKey)
+    console.log("RollDatra", rollData)
+    let rollDialog = await MournbladeRollDialog.create(this, rollData)
+    rollDialog.render(true)
+  }

+  /* -------------------------------------------- */
+  async rollCompetence(attrKey, compId) {
+    let rollData = this.getCommonRollData(attrKey, compId)
+    console.log("RollDatra", rollData)
+    let rollDialog = await MournbladeRollDialog.create(this, rollData)
+    rollDialog.render(true)
  }

 }
--- a/modules/mournblade-item-sheet.js
+++ b/modules/mournblade-item-sheet.js
@ -124,21 +124,10 @@ export class MournbladeItemSheet extends ItemSheet {
      item.sheet.render(true);
    });

-    html.find('.delete-spec').click(ev => {
-      this.object.update({ "data.specialisation": [{ name: 'None' }] });
-    });
-
    html.find('.delete-subitem').click(ev => {
      this.deleteSubitem(ev);
    });

-    html.find('.stat-choice-flag').click(ev => {
-      let idx = $(ev.currentTarget).data("stat-idx");
-      let array = duplicate(this.object.data.data.statincreasechoice);
-      array[Number(idx)].flag = !array[Number(idx)].flag;
-      this.object.update({ "data.statincreasechoice": array });
-    });
-
    // Update Inventory Item
    html.find('.item-delete').click(ev => {
      const li = $(ev.currentTarget).parents(".item");
--- a/modules/mournblade-roll-dialog.js
+++ b/modules/mournblade-roll-dialog.js
@ -14,17 +14,22 @@ export class MournbladeRollDialog extends Dialog {
  /* -------------------------------------------- */
  constructor(actor, rollData, html, options, close = undefined) {
    let conf = {
-      title: (rollData.mode == "skill") ? "Skill" : "Roll",
+      title: "Test de Capacité",
      content: html,
      buttons: { 
-        roll: {
+        rolld10: {
            icon: '<i class="fas fa-check"></i>',
-            label: "Roll !",
-            callback: () => { this.roll() } 
+            label: "Lancer 1d10",
+            callback: () => { this.roll("1d10") } 
+          },
+          rolld20: {
+            icon: '<i class="fas fa-check"></i>',
+            label: "Lancer 1d20",
+            callback: () => { this.roll("1d20") } 
          },
          cancel: {
            icon: '<i class="fas fa-times"></i>',
-            label: "Cancel",
+            label: "Annuler",
            callback: () => { this.close() }
        } },
      close: close
@ -32,148 +37,17 @@ export class MournbladeRollDialog extends Dialog {

    super(conf, options);

-    this.actor = actor;
-    this.rollData = rollData;
+    this.actor = actor
+    this.rollData = rollData
  }

  /* -------------------------------------------- */
-  roll () {
+  roll ( dice) {
+    this.rollData.mainDice = dice
    MournbladeUtility.rollMournblade( this.rollData )
  }


-  /* -------------------------------------------- */
-  manageEffects( effectIdx, toggled) {
-    let effect = this.rollData.effectsList[effectIdx]
-    if (effect) {
-      effect.applied = toggled
-
-      let level, genre, idVal
-      if (effect.type == 'hindrance' ) {
-        level = effect.value
-        genre = 'positive'
-        idVal = "#hindranceDicesLevel" 
-      }
-      if (effect.type == 'effect' ) {
-        let effectData = effect.effect 
-        level = effectData.data.effectlevel
-        genre = effectData.data.genre
-        effectData.data.isUsed = toggled
-        if (effectData.data.bonusdice) {
-          idVal = "#bonusDicesLevel" 
-        }
-        if (effectData.data.reducedicevalue || effectData.data.statdice) {
-          idVal = "#statDicesLevel" 
-        }
-        if (effectData.data.otherdice) {
-          idVal = "#otherDicesLevel" 
-        }
-        if (effectData.data.hindrance) {
-          idVal = "#hindranceDicesLevel" 
-          genre = 'positive' // Dynamic fix
-        }
-      }
-      // Now process the dice level update
-      let newLevel = Number($(idVal).val())
-      console.log("Ongoing", newLevel, toggled, idVal )
-      if (toggled) { 
-        if ( genre == 'positive') {
-          newLevel += Number(level)
-        }else {
-          newLevel -= Number(level)
-        }
-      }else {
-        if ( genre == 'positive') {
-          newLevel -= Number(level)
-        }else {
-          newLevel += Number(level)
-        }
-      }
-      newLevel = (newLevel<0) ? 0 : newLevel
-      $(idVal).val(newLevel)
-    }
-    //console.log("Effect", effect, toggled)  
-    this.rollData.statDicesLevel = Number($('#statDicesLevel').val())
-    this.rollData.specDicesLevel = Number($('#specDicesLevel').val())
-    this.rollData.bonusDicesLevel = Number($('#bonusDicesLevel').val())
-    this.rollData.hindranceDicesLevel = Number($('#hindranceDicesLevel').val())
-    this.rollData.otherDicesLevel = Number($('#otherDicesLevel').val())
-  }
-
-  /* -------------------------------------------- */
-  manageArmors( armorIdx, toggled) {
-    let armor = this.rollData.armorsList[armorIdx]
-    if (armor) {
-      armor.applied = toggled
-      if (armor.type == 'other' ) {
-        if (toggled) {
-          this.rollData.otherDicesLevel += Number(armor.value)
-        } else {
-          this.rollData.otherDicesLevel -= Number(armor.value)
-          this.rollData.otherDicesLevel = (this.rollData.otherDicesLevel<0) ? 0 : this.rollData.otherDicesLevel
-        }
-        $("#otherDicesLevel").val(this.rollData.otherDicesLevel)
-      }
-    }
-    console.log("Armor", armorIdx, toggled)  
-  }
-
-  /* -------------------------------------------- */
-  manageWeapons( weaponIdx, toggled) {
-    let weapon = this.rollData.weaponsList[weaponIdx]
-    if (weapon) {
-      if (toggled) {
-        this.rollData.weaponName = weapon.weapon.name
-      } else {
-        this.rollData.weaponName = undefined
-      }
-      weapon.applied = toggled
-      if (weapon.type == 'damage'  || weapon.type == 'enhanced' ) {
-        if (toggled) {
-          this.rollData.otherDicesLevel += Number(weapon.value)
-        } else {
-          this.rollData.weaponName = undefined
-          this.rollData.otherDicesLevel -= Number(weapon.value)
-          this.rollData.otherDicesLevel = (this.rollData.otherDicesLevel<0) ? 0 : this.rollData.otherDicesLevel
-        }
-        $("#otherDicesLevel").val(this.rollData.otherDicesLevel)
-      }
-    }
-    console.log("Weapon", weaponIdx, toggled, this.rollData.otherDicesLevel, weapon)  
-  }
-
-  /* -------------------------------------------- */
-  manageEquip( equipIdx, toggled) {
-    let equip = this.rollData.equipmentsList[equipIdx]
-    if (equip) {
-      equip.applied = toggled
-      let idVal = "#otherDicesLevel" // Default
-      if (equip.equip.data.bonusdice) {
-        idVal = "#bonusDicesLevel" 
-      }
-      if (equip.equip.data.statdice) {
-        idVal = "#statDicesLevel" 
-      }
-      if (equip.equip.data.otherdice) {
-        idVal = "#otherDicesLevel" 
-      }
-      let newLevel = Number($(idVal).val())
-      if (toggled) {
-         newLevel += Number(equip.value)
-      } else  {
-        newLevel -= Number(equip.value)
-      }
-      newLevel = (newLevel <0) ? 0 : newLevel
-      $(idVal).val(newLevel)
-      // Then refresh
-      this.rollData.statDicesLevel = Number($('#statDicesLevel').val())
-      this.rollData.specDicesLevel = Number($('#specDicesLevel').val())
-      this.rollData.bonusDicesLevel = Number($('#bonusDicesLevel').val())
-      this.rollData.hindranceDicesLevel = Number($('#hindranceDicesLevel').val())
-      this.rollData.otherDicesLevel = Number($('#otherDicesLevel').val())
-    }
-  }
-
  /* -------------------------------------------- */
  activateListeners(html) {
    super.activateListeners(html);
@ -183,57 +57,12 @@ export class MournbladeRollDialog extends Dialog {
    }
    $(function () { onLoad(); });
    
-    html.find('#specList').change(async (event) =>  {
-      this.rollData.selectedSpec = event.currentTarget.value
-      let spec = this.rollData.specList.find(item => item._id == this.rollData.selectedSpec)
-      if ( spec) {
-        this.rollData.specDiceLevel = spec.data.level
-        this.rollData.specName = spec.name
-        $('#specDicesLevel').val(this.rollData.specDiceLevel)
-      } else {
-        this.rollData.specName = undefined
-        $('#specDicesLevel').val(0)
-      }
-      const content = await renderTemplate("systems/fvtt-Mournblade-rpg/templates/roll-dialog-generic.html", this.rollData)
-      this.data.content = content
-      this.render(true)
-    });
-    html.find('#statDicesLevel').change((event) => {
-      this.rollData.statDicesLevel = Number(event.currentTarget.value)
-    });
-    html.find('#specDicesLevel').change((event) => {
-      this.rollData.specDicesLevel = Number(event.currentTarget.value)
-    });
-    html.find('#bonusDicesLevel').change((event) => {
-      this.rollData.bonusDicesLevel = Number(event.currentTarget.value)
-    });
-    html.find('#hindranceDicesLevel').change((event) => {
-      this.rollData.hindranceDicesLevel = Number(event.currentTarget.value)
-    });
-    html.find('#otherDicesLevel').change((event) => {
-      this.rollData.otherDicesLevel = Number(event.currentTarget.value)
-    });
-    html.find('.effect-clicked').change((event) => {
-      let toggled = event.currentTarget.checked
-      let effectIdx = $(event.currentTarget).data("effect-idx")
-      this.manageEffects( effectIdx, toggled)
-    });
-    html.find('.armor-clicked').change((event) => {
-      let toggled = event.currentTarget.checked
-      let armorIdx = $(event.currentTarget).data("armor-idx")
-      this.manageArmors( armorIdx, toggled)
-    });
-    html.find('.weapon-clicked').change((event) => {
-      let toggled = event.currentTarget.checked
-      let weaponIdx = $(event.currentTarget).data("weapon-idx")
-      this.manageWeapons( weaponIdx, toggled)
-    });
-    html.find('.equip-clicked').change((event) => {
-      let toggled = event.currentTarget.checked
-      let equipIdx = $(event.currentTarget).data("equip-idx")
-      this.manageEquip( equipIdx, toggled)
-    });
-    
-      
+    html.find('#modificateur').change(async (event) =>  {
+      this.rollData.modificateur = Number(event.currentTarget.value)
+    })
+    html.find('#difficulte').change(async (event) =>  {
+      this.rollData.difficulte = Number(event.currentTarget.value)
+    })
+         
  }
 }
--- a/modules/mournblade-utility.js
+++ b/modules/mournblade-utility.js
@ -22,23 +22,38 @@ export class MournbladeUtility {

    Handlebars.registerHelper('count', function (list) {
      return list.length;
-    });
+    })
    Handlebars.registerHelper('includes', function (array, val) {
      return array.includes(val);
-    });
+    })
    Handlebars.registerHelper('upper', function (text) {
      return text.toUpperCase();
-    });
+    })
+    Handlebars.registerHelper('lower', function (text) {
+      return text.toLowerCase()
+    })
    Handlebars.registerHelper('upperFirst', function (text) {
      if (typeof text !== 'string') return text
      return text.charAt(0).toUpperCase() + text.slice(1)
-    });
+    })
    Handlebars.registerHelper('notEmpty', function (list) {
      return list.length > 0;
-    });
+    })
+    Handlebars.registerHelper('mul', function (a, b) {
+      return parseInt(a) * parseInt(b);
+    })

  }

+  /* -------------------------------------------- */
+  static getModificateurOptions() {
+    let opt = []
+    for (let i = -15; i <= 15; i++) {
+      opt.push( `<option value="${i}">${i}</option>` )
+    }
+    return opt.concat("\n")
+  }
+
  /* -------------------------------------------- */
  static getAttributs() {
    return { adr: "Adresse", pui: "Puissance", cla: "Clairvoyance", pre: "Présence", tre: "Trempe"}
@ -87,7 +102,8 @@ export class MournbladeUtility {

    const templatePaths = [
    'systems/fvtt-mournblade/templates/editor-notes-gm.html',
-    'systems/fvtt-mournblade/templates/partial-item-description.html'
+    'systems/fvtt-mournblade/templates/partial-item-description.html',
+    'systems/fvtt-mournblade/templates/partial-list-niveau.html'
    ]
    return loadTemplates(templatePaths);
  }
@ -247,8 +263,44 @@ export class MournbladeUtility {
  /* -------------------------------------------- */
  static async rollMournblade(rollData) {

+    rollData.diceFormula = rollData.mainDice
+    if  (rollData.competence) {
+      let compmod = (rollData.competence.data.niveau == 0) ? -3 : 0
+      rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.data.niveau}+${rollData.modificateur}+${compmod}`
+    } else {
+      rollData.diceFormula += `+${rollData.attr.value}*2+${rollData.modificateur}`
+    }
+
+    let myRoll = rollData.roll
+    if (!myRoll) { // New rolls only of no rerolls
+      myRoll = new Roll(rollData.diceFormula).roll({ async: false });
+      console.log("ROLL : ", rollData.diceFormula)
+      await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"));
+      rollData.roll = myRoll
+    }
+    console.log(">>>> ", myRoll)
+
+    rollData.finalResult = myRoll.total
+    if ( rollData.mainDice == "1d20") {
+      let diceValue = myRoll.terms[0].results[0].result
+      console.log("PAIR/IMP", diceValue)
+      if ( diceValue % 2 == 1) {
+        console.log("PAIR/IMP2", diceValue)
+        rollData.finalResult -= myRoll.terms[0].results[0].result // Substract value
+        if (diceValue == 1 ||  diceValue == 11) {
+          rollData.isDramatique = true
+          rollData.isSuccess = false    
+        }
+      }
+    }
+    
+    if (rollData.difficulte > 0 && !rollData.isDramatique) {
+      rollData.isSuccess = (myRoll.finalResult >= rollData.difficulte)
+      rollData.isHeroique = ((myRoll.finalResult - rollData.difficulte) >= 10)
+      rollData.isDramatique = ((myRoll.finalResult - rollData.difficulte) <= -10)
+    }
    this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-Mournblade-rpg/templates/chat-generic-result.html`, rollData)
+      content: await renderTemplate(`systems/fvtt-mournblade/templates/chat-generic-result.html`, rollData)
    });

    // And save the roll
@ -291,7 +343,7 @@ export class MournbladeUtility {
    } else {
      item = game.items.get(dataItem.id)
    }
-    return item;
+    return item
  }

  /* -------------------------------------------- */
@ -338,6 +390,9 @@ export class MournbladeUtility {
    let rollData = {
      rollId: randomID(16),
      rollMode: game.settings.get("core", "rollMode"),
+      modificateursOptions : this.getModificateurOptions(),
+      difficulte: 0,
+      modificateur: 0,
    }
    MournbladeUtility.updateWithTarget(rollData)
    return rollData
--- a/packs/armes.db
+++ b/packs/armes.db
@ -0,0 +1,42 @@
+{"name":"Fouet","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contactjet","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1d4 + 1","deuxmains":false,"courte":3,"moyenne":0,"longue":0,"tr":0,"rarete":4,"prix":40},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Qb1h25U88mTM4h72"}},"_id":"0swiE8k5zfUIqmXu"}
+{"name":"Hache des mers","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"2d6","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":7,"prix":150},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.mGYFgteaWBDo10Xb"}},"_id":"2BSVJXr0FGZZJ9fh"}
+{"name":"Fléau d’armes","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1D10+1","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":7,"prix":70},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.PHQabMgfk1GNOjKo"}},"_id":"2qezkR1BdC0DcRIl"}
+{"name":"Arbalète","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"tir","bonusmaniementoff":1,"bonusmaniementdef":0,"degats":"2d6","deuxmains":false,"courte":25,"moyenne":50,"longue":75,"tr":3,"rarete":10,"prix":500},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.WYp8ojQN8HYJwUJc"}},"_id":"2zIdrBK88iuMbOF0"}
+{"name":"Cimeterre","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":1,"bonusmaniementdef":1,"degats":"1d10","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":100},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.RYxEg0gJfAlIZ4mw"}},"_id":"3Iv1oLpZcPEJVaI4"}
+{"name":"Fronde","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"tir","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1D4","deuxmains":false,"courte":10,"moyenne":25,"longue":50,"tr":1,"rarete":2,"prix":1},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.TgVuNnytO9k2K0Xe"}},"_id":"4To8rLxv4efsoZK0"}
+{"name":"Pierre","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contactjet","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1D4","deuxmains":false,"courte":3,"moyenne":6,"longue":15,"tr":1,"rarete":0,"prix":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.3YS9IfQddECnoagK"}},"_id":"4yKlK8MeSj5Zk8lM"}
+{"name":"Grand marteau","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":1,"bonusmaniementdef":0,"degats":"2D6+2","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":7,"prix":120},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.vjic4cPkJ0iMCIt5"}},"_id":"6e1JHoD1Jrz020R7"}
+{"name":"Arc de cavalerie","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"tir","bonusmaniementoff":1,"bonusmaniementdef":0,"degats":"1d6","deuxmains":false,"courte":25,"moyenne":50,"longue":75,"tr":1,"rarete":7,"prix":100},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.5EWrgNQjJMx1t2v1"}},"_id":"88UuW1bdpFuCmkqb"}
+{"name":"Épée de maître","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":1,"degats":"1d8+ 2","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":7,"prix":120},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.kX3MbDFu9uYZVNf2"}},"_id":"9Eo9mRbPPZHN98Cr"}
+{"name":"Lance ilmioréenne","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"<p>La lance ilmior&eacute;enne est un solide b&acirc;ton de combat surmont&eacute; d&rsquo;une pointe sur lequel est fi x&eacute; quasi perpendiculairement un fer de hache plat et &eacute;troit. Un contrepoids fi x&eacute; &agrave; l&rsquo;autre extr&eacute;mit&eacute; sert &agrave; &eacute;quilibrer l&rsquo;arme qui peut &ecirc;tre mani&eacute;e &agrave; la fois comme une lance et comme une hache &agrave; deux mains, ce qui permet de maintenir ses ennemis &agrave; distance ou de leur porter des coups d&eacute;vastateurs. Ces lances furent invent&eacute;es &agrave; l&rsquo;&eacute;poque de la tribu d&rsquo;Ilm, quand les lances et &eacute;p&eacute;es &eacute;taient d&eacute;clar&eacute;es ill&eacute;gales par les gouverneurs melnibon&eacute;ens de la r&eacute;gion. Certaines &eacute;coles militaires ilmior&eacute;ennes enseignent toujours le Style Imar, qui m&ecirc;le en une seule et m&ecirc;me technique le combat &agrave; deux mains &agrave; la lance et le combat au b&acirc;ton.</p>","typearme":"contact","bonusmaniementoff":0,"bonusmaniementdef":2,"degats":"1d8 + 2","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":100},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.8ApbiVgkx79OHVp2"}},"_id":"9xPd4ITtyk3nmMoN"}
+{"name":"Masse lourde","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d10 + 1","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":5,"prix":80},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.DPfXgFj3gpjJ3nbR"}},"_id":"CeC5lAKs7NdPF05l"}
+{"name":"Gourdin","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1D6","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":0,"prix":5},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.CBIfq9eRd2RmoI4H"}},"_id":"CqP80SQFQOefpGgd"}
+{"name":"Rapière","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":3,"bonusmaniementdef":1,"degats":"1d8+ 1","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":150},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.XIStcClTnmLoSwyR"}},"_id":"CupT9m8L909l4Fo5"}
+{"name":"Hachette / Hache de lancer","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contactjet","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d4 + 1","deuxmains":false,"courte":5,"moyenne":10,"longue":15,"tr":1,"rarete":5,"prix":50},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.5NHbRanxXA5vUE3B"}},"_id":"DzkeP7jbruqW4nQH"}
+{"name":"Lance légère","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d8","deuxmains":false,"courte":10,"moyenne":25,"longue":50,"tr":1,"rarete":5,"prix":5},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.LIVeq22E9EanRS9L"}},"_id":"FDeRBkxXwoZIuL9B"}
+{"name":"Arc de chasse","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"tir","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d6 - 1","deuxmains":false,"courte":25,"moyenne":50,"longue":75,"tr":1,"rarete":8,"prix":250},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.TrYZ9BxYukS1mbBX"}},"_id":"Hrm08cpgAMMV6Jpq"}
+{"name":"Coup de pied / poing / tête","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":3,"bonusmaniementdef":0,"degats":"1d4","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":0,"prix":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.nBPKHsYIM0HgMcBy"}},"_id":"Iw3j4oC6H8HJ9MFQ"}
+{"name":"Lance lourde","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":1,"bonusmaniementdef":2,"degats":"1d10","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":5,"prix":50},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Kcl07bs7TOcne37W"}},"_id":"KY22L6Lx5WxgvyGD"}
+{"name":"Arc du Désert des Larmes","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"<p>Cet arc composite fait de bois, d&rsquo;andouillers de cerf et/ou d&rsquo;os est un arc court et tr&egrave;s recourb&eacute; utilis&eacute; par les barbares du D&eacute;sert des Larmes pour la chasse. On peut &eacute;galement trouver ce type d&rsquo;arcs &agrave; Pikarayd et au Dorel.</p>","typearme":"tir","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d6 + 1","deuxmains":false,"courte":25,"moyenne":50,"longue":75,"tr":1,"rarete":8,"prix":250},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.QmYjdRCAk3MnxKJg"}},"_id":"MDpFpqmXpIX5VV80"}
+{"name":"Hache de bataille dite lormyrienne","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"<p>Cette double hache parfaitement &eacute;quilibr&eacute;e et proportionn&eacute;e est l&rsquo;arme favorite des chevaliers lormyriens. Il s&rsquo;agit de l&rsquo;arme id&eacute;ale pour trancher, d&eacute;couper les lances ennemies et fendre les cr&acirc;nes.</p>","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"2d6 + 2","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":250},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Lpa6kesbzgKVtogn"}},"_id":"MP49mYF7FVuW9ALB"}
+{"name":"Couteau / Dague","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contactjet","bonusmaniementoff":3,"bonusmaniementdef":0,"degats":"1d4","deuxmains":false,"courte":3,"moyenne":6,"longue":15,"tr":1,"rarete":1,"prix":10},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.5a9GKIvNgbbXBq3s"}},"_id":"N5BbO2lGwzQnpvH0"}
+{"name":"Pique filkharienne","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"<p>Cette longue pique &agrave; grande lame de pr&egrave;s de trois m&egrave;tres de long est l&rsquo;arme de pr&eacute;dilection des piquiers de l&rsquo;arm&eacute;e de Filkhar. Tr&egrave;s effi cace pour lutter contre des cavaliers ou des ennemis en train de charger, elle l&rsquo;est beaucoup moins en combat rapproch&eacute;.</p>","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d8 + 2","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":150},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.dF9LxfA1crZBmT92"}},"_id":"QwrZbFeJUQv2OBqI"}
+{"name":"Masse légère","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d6 + 2","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":5,"prix":5},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.xrWRNZBrEzkUQzRG"}},"_id":"SzgkzHvzma8NiMd5"}
+{"name":"Sabre d’abordage","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":1,"bonusmaniementdef":0,"degats":"1d8","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":5,"prix":50},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.aNUqO9OZT0GBszvv"}},"_id":"U8CoqFhGuT3ZHeq1"}
+{"name":"Javelot","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"jet","bonusmaniementoff":1,"bonusmaniementdef":0,"degats":"1d6","deuxmains":false,"courte":25,"moyenne":50,"longue":75,"tr":1,"rarete":5,"prix":30},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Zwiz9E3TbeUP8qHH"}},"_id":"aELvOR7A9DIJKgBk"}
+{"name":"Fourche / Faux de paysan","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1D6","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":1,"prix":10},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.K5Ayim6mPKZoCSCc"}},"_id":"aJBVfqQ3JQNyVL7c"}
+{"name":"Arme improvisée","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1d6","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":0,"prix":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.E7gcmnNQK2t5OQjv"}},"_id":"c6l49ZmEBjUxfI3W"}
+{"name":"Arc de guerre","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"tir","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1d10 + 1","deuxmains":false,"courte":30,"moyenne":50,"longue":100,"tr":1,"rarete":6,"prix":70},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Tq6lUFPTkBN5cBwn"}},"_id":"cKf5z3fajUnxJh0r"}
+{"name":"Main gauche","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":0,"bonusmaniementdef":3,"degats":"1d4 + 1","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":10},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.BBii0qi1unvSRNO4"}},"_id":"fLHX6ut131CQI630"}
+{"name":"Marteau de guerre","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":0,"bonusmaniementdef":0,"degats":"1d8 + 2","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":6,"prix":70},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.6n2uSdYfRAsSqQnA"}},"_id":"freCCeiYGfWmUAQU"}
+{"name":"Sabre de Pan Tang","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"<p>Ce long sabre effi l&eacute; sert aux Cavaliers d&eacute;moniaques de Pan Tang pour couper les t&ecirc;tes depuis le dos de leurs monstrueuses montures reptiliennes &agrave; six pattes.</p>","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d10 + 2","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":120},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.l3ffzso7GyHMKguD"}},"_id":"j5659PJlrHz56V1k"}
+{"name":"Hallebarde","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":0,"bonusmaniementdef":2,"degats":"2d6","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":7,"prix":150},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.ZTdyIoMzE9kqm4e6"}},"_id":"lYtm5MwP96numskx"}
+{"name":"Lance melnibonéenne","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"<p>La lance melnibon&eacute;enne, faite pour le combat &agrave; cheval ou &agrave; dos de dragon, ressemble &agrave; une lance ordinaire. Son fer est cependant plus fi n et plus &eacute;troit. Avant la chute d&rsquo;Imrryr, il est quasi impossible de se procurer de telles armes sur les march&eacute;s des Jeunes Royaumes. Elles peuvent &ecirc;tre mani&eacute;es &agrave; une main comme lors des joutes &agrave; cheval ou &agrave; deux mains au c&oelig;ur des m&ecirc;l&eacute;es.</p>","typearme":"contact","bonusmaniementoff":1,"bonusmaniementdef":2,"degats":"2d6+ 4","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":10,"prix":70},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.KAl5qXHeYDoYRU6G"}},"_id":"mQGT0vmDjoTZCW5u"}
+{"name":"Arc en os","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"<p>Arc composite recourb&eacute; fait de bois, d&rsquo;os et d&rsquo;acier, l&rsquo;arc en os melnibon&eacute;en est une arme extraordinairement puissante entre les mains d&rsquo;un guerrier melnibon&eacute;en ou d&rsquo;un archer esclave du Glorieux Empire. On peut se le procurer dans les Jeunes Royaumes apr&egrave;s la chute d&rsquo;Imrryr.</p>","typearme":"tir","bonusmaniementoff":3,"bonusmaniementdef":0,"degats":"1d8 + 1","deuxmains":false,"courte":30,"moyenne":60,"longue":125,"tr":2,"rarete":10,"prix":500},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Dy9dzVhXbNAVm3zn"}},"_id":"nzve5qucVN6FC5wn"}
+{"name":"Bâton ferré ou lesté","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":1,"bonusmaniementdef":2,"degats":"1D8","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":0,"prix":1},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.zoBHSbvJPnjbtPh6"}},"_id":"sHj90bPcMaDlOw51"}
+{"name":"Épée courte / Glaive","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":1,"degats":"1D6+1","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":4,"prix":40},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Mxv5gMHRvRrsuhPA"}},"_id":"sju2r73hUHyGbHYg"}
+{"name":"Faucheur","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":1,"degats":"1d4 + 1","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":7,"prix":100},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.OlmzE29fh9DFd8TF"}},"_id":"t2uQcWe7kirUOp3D"}
+{"name":"Fléau lourd","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":1,"bonusmaniementdef":0,"degats":"1d10+ 3","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":7,"prix":150},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.vDDw0qqM1Kg7Pu6T"}},"_id":"uatjBTFCE5ZCqhAd"}
+{"name":"Hache","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"1d6 + 2","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":2,"prix":30},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.2MwgptY2kE4tgYBe"}},"_id":"v7ymzlEALvsk0poA"}
+{"name":"Épée large","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":1,"degats":"1d6+ 2","deuxmains":false,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":5,"prix":70},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.iuAizxCvnUxmsjrn"}},"_id":"wWk0Wfer06Ttmouv"}
+{"name":"Épée longue","type":"arme","img":"systems/fvtt-mournblade/assets/icons/arme.webp","data":{"description":"","typearme":"contact","bonusmaniementoff":2,"bonusmaniementdef":0,"degats":"2d6 + 1","deuxmains":true,"courte":0,"moyenne":0,"longue":0,"tr":0,"rarete":8,"prix":250},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.yiYtZ0sCUpMihvzz"}},"_id":"wv5EiePmPTpqFutt"}
--- a/packs/protection.db
+++ b/packs/protection.db
@ -0,0 +1,11 @@
+{"name":"Armure de plaques melnibonéenne","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"<p>Cette armure orn&eacute;e et fi nement grav&eacute;e est ajust&eacute;e aux mensurations de celui qui la porte. On ne peut en trouver en dehors d&rsquo;Imrryr avant sa chute. L&rsquo;armure couvre tout le corps des pieds &agrave; la t&ecirc;te. Le casque est toujours surmont&eacute; d&rsquo;une sculpture en forme de dragon ou de serpent de mer. Des motifs complexes et imbriqu&eacute;s recouvrent la surface de tous les &eacute;l&eacute;ments de l&rsquo;armure. Apr&egrave;s la chute d&rsquo;Imrryr, quelques pi&egrave;ces d&rsquo;armure melnibon&eacute;ennes apparaissent de temps en temps sur les march&eacute;s mais les armures enti&egrave;res restent rarissimes. Si elle a &eacute;t&eacute; sp&eacute;cialement con&ccedil;ue pour son porteur, une armure de plaques melnibon&eacute;enne n&rsquo;impose pas de p&eacute;nalit&eacute; d&rsquo;encombrement &agrave; ce dernier.</p>","typeprotection":"armure","protection":6,"degats":"","rarete":10,"prix":1000},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.09OukepQ8Oep0642"}},"_id":"FFX0dFDZoVXFzyXk"}
+{"name":"Armure de plates, harnois","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":5,"degats":"","rarete":10,"prix":500},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.7JErvrlTYaFbCvoR"}},"_id":"so7x8hK8qEc5QqnQ"}
+{"name":"Armure du Désert des Larmes","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"<p>Les barbares et les nomades du D&eacute;sert des Larmes ont cr&eacute;&eacute; des armures de bois prot&eacute;geant l&rsquo;abdomen, la poitrine et les bras. Ces armures sont faites &agrave; partir du bois de l&rsquo;arbre Fal, originaire de plateaux pluvieux situ&eacute;s au-del&agrave; du d&eacute;sert. Les barbares d&eacute;corent souvent leurs armures de symboles tribaux et en prot&egrave;gent la surface avec de la laque. Con&ccedil;ue en bois, cette armure a la particularit&eacute; de pouvoir flotter quoiqu&rsquo;un s&eacute;jour prolong&eacute; dans l&rsquo;eau risque de la d&eacute;t&eacute;riorer tr&egrave;s rapidement. Elle n&rsquo;en reste pas moins une protection tr&egrave;s recherch&eacute;e par ceux qui ont &agrave; s&rsquo;aventurer sur les flots.</p>","typeprotection":"armure","protection":2,"degats":"","rarete":8,"prix":200},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.b1JGc5OlrIzlQbTO"}},"_id":"ZzzXZUn5PU1lnP0X"}
+{"name":"Bouclier d’infanterie","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":2,"degats":"1D6","rarete":5,"prix":50},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.Xn1tVJgKinG0hc10"}},"_id":"I2X36O7hkpigZmJo"}
+{"name":"Broigne, cotte de maille","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":3,"degats":"","rarete":7,"prix":150},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.th6blCtgBmsWSYdY"}},"_id":"veoS6Gtzj6Dq087V"}
+{"name":"Cuir bouilli, cuir clouté","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":2,"degats":"","rarete":5,"prix":50},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.T9RAyLXDPSHlvoDR"}},"_id":"kis2lI7oEtdWzJbQ"}
+{"name":"Cuirasse, armure de demi-plaques","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":4,"degats":"","rarete":8,"prix":200},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.FvufSkzJOSftZhYt"}},"_id":"2hD1DQVeCIQIXFU7"}
+{"name":"Écu d’acier","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":3,"degats":"1D8","rarete":9,"prix":100},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.TAA8qb6POO0HyhU5"}},"_id":"zqKOtmrDNrDYBu2z"}
+{"name":"Pavois","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"<p>Le pavois se plante dans le sol au d&eacute;but du combat et ne peut normalement plus &ecirc;tre d&eacute;plac&eacute; jusqu&rsquo;&agrave; son issue.</p>","typeprotection":"armure","protection":3,"degats":"","rarete":7,"prix":50},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.y1kNQJYRCEol83IA"}},"_id":"2uqB1doLYK4S2EN2"}
+{"name":"Targe","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":1,"degats":"1D4","rarete":4,"prix":20},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.dyTeMFfvg5mAKT2n"}},"_id":"WH1m35jgm7ilTTuG"}
+{"name":"Tenues rembourrées, cuir souple, fourrures","type":"protection","img":"systems/fvtt-mournblade/assets/icons/protection.webp","data":{"description":"","typeprotection":"armure","protection":1,"degats":"","rarete":2,"prix":10},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"RiMAsQHaUMojde7N":3},"flags":{"core":{"sourceId":"Item.5dV4DORRrNdAd2Z5"}},"_id":"SqyKvR1GJMJvgHCJ"}
--- a/styles/simple.css
+++ b/styles/simple.css
@ -1,15 +1,23 @@
  /* ==================== (A) Fonts ==================== */
+  /* ==================== (A) Fonts ==================== */
+  @font-face {
+    font-family: "Charlemagne";
+    src: url('../assets/fonts/CharlemagneStd-Bold.otf') format("otf");
+  }
  
  :root {
  /* =================== 1. ACTOR SHEET FONT STYLES =========== */
+    --window-header-font-family: Charlemagne;
    --window-header-title-font-size: 1.3rem;
    --window-header-title-font-weight: normal;
    --window-header-title-color: #f5f5f5;

+    --major-button-font-family: Charlemagne;
    --major-button-font-size: 1.05rem;
    --major-button-font-weight: normal;
    --major-button-color: #dadada;

+    --tab-header-font-family: Charlemagne;
    --tab-header-font-size: 1.0rem;
    --tab-header-font-weight: 700;
    --tab-header-color: #403f3e;
@ -43,9 +51,11 @@

 /* Fonts */
 .sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item {
+  font-family: "Charlemagne";
  font-size: 1.0rem;
 } /* For title, sidebar character and scene */
 .sheet nav.sheet-tabs {
+  font-family: "Charlemagne";
  font-size: 0.8rem;
 } /* For nav and title */
 .window-app input, .foundryvtt-vadentis .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
@ -1181,6 +1191,44 @@ ul, li {
  border: 2px ridge #846109;
 }

+/*************************************************************/
+.competence-name {
+  padding-top: 7px;
+  padding-left: 4px;
+  margin-left: 4px;
+  flex-grow: 2;
+}
+
+/*************************************************************/
+.competence-niveau {
+  flex-grow: 1;
+  min-width: 64px;
+  max-width: 64px;
+}
+
+/*************************************************************/
+.button-roll-competence {
+  min-width: 64px;
+  max-width: 64px;
+  background-color: rgb(211, 221, 187);
+  padding-top: 7px;
+  padding-left: 4px;
+  margin-left: 4px;
+  margin-right: 4px;
+  border-radius: 12px;
+}
+
+/*************************************************************/
+.button-roll-competence-empty {
+  min-width: 64px;
+  max-width: 64px;
+  padding-top: 7px;
+  padding-left: 4px;
+  margin-left: 4px;
+  margin-right: 4px;
+  border-radius: 12px;
+}
+
 /*************************************************************/
 .item-name-img {
  flex-grow:1;
--- a/system.json
+++ b/system.json
@ -17,7 +17,7 @@
  "library": false,
  "license": "LICENSE.txt",
  "manifest": "https://www.uberwald.me/gitea/public/fvtt-mournblade/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-mournblade/archive/fvtt-mournblade-0.0.5.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-mournblade/archive/fvtt-mournblade-0.0.9.zip",
  "manifestPlusVersion": "1.0.0",
  "media": [],
  "minimumCoreVersion": "0.8.0",
@ -36,8 +36,8 @@
    {
      "type": "Item",
      "label": "Armes",
-      "name": "weapons",
-      "path": "./packs/weapons.db",
+      "name": "armes",
+      "path": "./packs/armes.db",
      "system": "fvtt-mournblade",
      "tags": [
        "arme"
@ -70,9 +70,9 @@
  "styles": [
    "styles/simple.css"
  ],
-  "templateVersion": 4,
+  "templateVersion": 7,
  "title": "Mournblade",
  "url": "",
-  "version": "0.0.5",
+  "version": "0.0.9",
  "background": "./images/ui/mournblade_welcome.webp"
 }
--- a/template.json
+++ b/template.json
@ -87,10 +87,10 @@
        "description": ""
      }
    },
-    "character": {
+    "personnage": {
      "templates": [ "biodata", "core" ]
    },
-    "npc": {
+    "pnj": {
      "templates": [ "npccore" ]
   }
  },
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@ -4,23 +4,22 @@
  <header class="sheet-header">
    <div class="header-fields">
      <div class="flexrow">
-        <div>
-          <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-          {{!-- Sheet Tab Navigation --}}
-          <nav class="sheet-tabs tabs" data-group="primary">
-            <a class="item" data-tab="principal">Principal</a>
-            <a class="item" data-tab="competences">Compétences</a>
-            <a class="item" data-tab="combat">Combat</a>
-            <a class="item" data-tab="traits">Traits/Pactes</a>
-            <a class="item" data-tab="equipement">Equipement</a>
-            <a class="item" data-tab="biodata">Bio&Notes</a>
-          </nav>
-        </div>
        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
      </div>
    </div>
  </header>

+  {{!-- Sheet Tab Navigation --}}
+  <nav class="sheet-tabs tabs" data-group="primary">
+    <a class="item" data-tab="principal">Principal</a>
+    <a class="item" data-tab="competences">Compétences</a>
+    <a class="item" data-tab="combat">Combat</a>
+    <a class="item" data-tab="traits">Traits/Pactes</a>
+    <a class="item" data-tab="equipement">Equipement</a>
+    <a class="item" data-tab="biodata">Bio&Notes</a>
+  </nav>  
+
  {{!-- Sheet Body --}}
  <section class="sheet-body">

@ -32,9 +31,14 @@
        <div class="sheet-box color-bg-archetype">
          <ul class="item-list alternate-list">
            {{#each data.attributs as |attr key|}}
-            <li class="item flexrow " data-item-id="{{equip._id}}">
-              <span class="item-name-label">{{attr.label}}</span>
-              <span class="item-field-label-short">{{attr.value}}</span>
+            <li class="item flexrow " data-attr-key="{{key}}">
+              <span class="item-name-label"><a class="roll-attribut">{{attr.label}}</a></span>
+              <select class="status-small-label color-class-common" type="text" name="data.attributs.{{key}}.value"
+                value="{{attr.value}}" data-dtype="Number">
+                {{#select attr.value}}
+                {{> systems/fvtt-mournblade/templates/partial-list-niveau.html}}
+                {{/select}}
+              </select>
            </li>
            {{/each}}
          </ul>
@ -89,10 +93,31 @@
              <div class="item-filler">&nbsp;</div>
            </li>
            {{#each skills as |skill key|}}
-            <li class="item flexrow " data-item-id="{{skill._id}}">
+            <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
              <img class="item-name-img" src="{{skill.img}}" />
-              <span class="item-name-label">{{skill.name}}</span>
-              <span class="item-field-label-short">{{skill.data.niveau}}</span>
+              <span class="item-name-label competence-name">{{skill.name}}</span>
+              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text" data-item-field="niveau"
+                value="{{skill.data.niveau}}" data-dtype="Number">
+                {{#select skill.data.niveau}}
+                {{> systems/fvtt-mournblade/templates/partial-list-niveau.html}}
+                {{/select}}
+              </select>
+
+              {{#if (ne skill.data.attribut1 "none")}}
+              <span class="item-field-label-short button-roll-competence"><a class="roll-competence" data-attr-key="{{skill.data.attribut1}}">{{upper skill.data.attribut1}} : {{skill.data.attribut1total}}</a></span>
+              {{else}}
+              <span class="item-field-label-short button-roll-competence-empty" >&nbsp;</span>
+              {{/if}}
+              {{#if (ne skill.data.attribut2 "none")}}
+              <span class="item-field-label-short  button-roll-competence"><a class="roll-competence" data-attr-key="{{skill.data.attribut2}}">{{upper skill.data.attribut2}} : {{skill.data.attribut2total}}</a></span>
+              {{else}}
+              <span class="item-field-label-short button-roll-competence-empty">&nbsp;</span>
+              {{/if}}
+              {{#if (ne skill.data.attribut3 "none")}}
+              <span class="item-field-label-short  button-roll-competence"><a class="roll-competence" data-attr-key="{{skill.data.attribut3}}">{{upper skill.data.attribut3}} : {{skill.data.attribut3total}}</a></span>
+              {{else}}
+              <span class="item-field-label-short button-roll-competence-empty">&nbsp;</span>
+              {{/if}}

              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
@ -113,20 +138,18 @@
      <div class="grid grid-3col">
        <div>
          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <label class="generic-label">Imperium</label>
-              <input type="text" class="" name="data.biodata.imperium" value="{{data.biodata.imperium}}"
-                data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">ADM ID</label>
-              <input type="text" class="" name="data.biodata.admid" value="{{data.biodata.admid}}"
-                data-dtype="String" />
-            </li>
            <li class="item flexrow">
              <label class="generic-label">Age</label>
              <input type="text" class="" name="data.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Taille</label>
+              <input type="text" class="" name="data.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Cheveux</label>
+              <input type="text" class="" name="data.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+            </li>
          </ul>
        </div>
        <div>
@ -140,10 +163,6 @@
              <label class="generic-label">Sexe</label>
              <input type="text" class="" name="data.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Taille</label>
-              <input type="text" class="" name="data.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
-            </li>
          </ul>
        </div>
        <div>
@ -156,76 +175,10 @@
            <input type="text" class="" name="data.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
              data-dtype="String" />
          </li>
-          <li class="item flexrow">
-            <label class="generic-label">Cheveux</label>
-            <input type="text" class="" name="data.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
-          </li>
        </div>
      </div>

-      <div class="flexrow">
-        <div>
-          <h3>Apparence actuelle : </h3>
-          <div class="form-group small-editor">
-            {{editor content=data.biodata.appactual target="data.biodata.appactual" button=true owner=owner
-            editable=editable}}
-          </div>
-        </div>
-        <div>
-          <h3>Autres identités : </h3>
-          <div class="form-group small-editor">
-            {{editor content=data.biodata.identities target="data.biodata.identities" button=true owner=owner
-            editable=editable}}
-          </div>
-        </div>
-      </div>

-      <div class="flexrow">
-        <div>
-          <h3>Traits particuliers : </h3>
-          <div class="form-group small-editor">
-            {{editor content=data.biodata.traits target="data.biodata.traits" button=true owner=owner
-            editable=editable}}
-          </div>
-        </div>
-        <div>
-          <h3>Souvenirs quantiques : </h3>
-          <div class="form-group small-editor">
-            {{editor content=data.biodata.memories target="data.biodata.memories" button=true owner=owner
-            editable=editable}}
-          </div>
-        </div>
-      </div>
-
-      <div class="flexrow">
-        <div>
-          <h3>Rebuild : </h3>
-          <div class="form-group small-editor">
-            {{editor content=data.biodata.rebuild target="data.biodata.rebuild" button=true owner=owner
-            editable=editable}}
-          </div>
-        </div>
-        <div>
-          <h3>Relations, contacts et acolytes : </h3>
-          <div class="form-group small-editor">
-            {{editor content=data.biodata.contacts target="data.biodata.contacts" button=true owner=owner
-            editable=editable}}
-          </div>
-        </div>
-      </div>
-
-      <h3>Qui suis-je : </h3>
-      <div class="form-group editor">
-        {{editor content=data.biodata.whoami target="data.biodata.whoami" button=true owner=owner
-        editable=editable}}
-      </div>
-      <hr>
-      <h3>Notes : </h3>
-      <div class="form-group editor">
-        {{editor content=data.biodata.notes target="data.biodata.notes" button=true owner=owner editable=editable}}
-      </div>
-      <hr>
-      </article>
    </div>

  </section>
--- a/templates/chat-generic-result.html
+++ b/templates/chat-generic-result.html
@ -5,50 +5,48 @@
  <h4 class=chat-actor-name>{{alias}}</h4>
 </div>

-  <hr>
-  
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
+<hr>

-  <div class="flexcol">
-    </div>
+{{#if img}}
+<div>
+  <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+</div>
+{{/if}}

-    <div>
-      <ul>
-        {{#if power}}  
-        <li>Power : {{power.name}}</li>
-        {{/if}}
-        {{#if isDamage}}
-        <li>Weapon Damage Dice : {{weapon.data.damageDice}}</li>
-        {{/if}}
-        {{#if isResistance}}
-        <li>Armor Resistance  Dice : {{armor.data.resistanceDice}}</li>
-        {{/if}}
-        {{#if stat}}  
-        <li>Statistic : {{stat.label}}</li>
-        {{/if}}
-        {{#if spec}}  
-        <li>Specialisation : {{spec.name}}</li>
-        {{/if}}
+<div class="flexcol">
+</div>

-        {{#if weaponName}}  
-        <li>Weapon : {{weaponName}}</li>
-        {{/if}}
+<div>
+  <ul>
+    <li>Attribut : {{attr.label}}</li>

-        {{#if isResistance}}
-        <li><strong>Defense Result : {{finalScore}}</strong>
-        {{else}}
-          {{#if isDamage}}
-          <li><strong>Damages : {{finalScore}}</strong>
-          {{else}}
-          <li><strong>Final Result : {{finalScore}}</strong>
-          {{/if}}
-        {{/if}}
-        
-      </ul>  
-    </div>
+    {{#if competence}}
+    <li>Compétence : {{competence.name}}</li>
+    {{/if}}

-  </div>
+    {{#if weaponName}}
+    <li>Weapon : {{weaponName}}</li>
+    {{/if}}
+
+    <li>Formule : {{diceFormula}}</li>
+    <li>Total : {{finalResult}}</li>
+
+    {{#if difficulte}}
+    {{#if isSuccess}}
+    <li>Succés!!!</li>
+    {{else}}
+    <li>Echec ...</li>
+    {{/if}}
+    {{/if}}
+
+    {{#if isHeroique}}
+    <li>Succés Héroïque!!!</li>
+    {{/if}}
+    {{#if isDramatique}}
+    <li>Succés Dramatique!!!</li>
+    {{/if}}
+
+  </ul>
+</div>
+
+</div>
--- a/templates/item-competence-sheet.html
+++ b/templates/item-competence-sheet.html
@ -12,8 +12,8 @@
    <div class="flexcol">
      <span class="flexrow">
        <label class="generic-label">Niveau : </label>
-        <input type="text" class="padd-right status-small-label color-class-common" name="data.type" value="{{data.type}}"
-        data-dtype="String" />
+        <input type="text" class="padd-right status-small-label color-class-common" name="data.niveau" value="{{data.niveau}}"
+        data-dtype="Number" />
      </span>
      <span class="flexrow">
        <label class="generic-label">Attribut 1 : </label>
--- a/templates/item-don-sheet.html
+++ b/templates/item-don-sheet.html
@ -26,7 +26,9 @@
      </span>
      <span class="flexrow">
        <label class="generic-label">Sacrifice : </label>
-        <input type="text" class="padd-right status-small-label color-class-common" name="data.sacrifice" value="{{data.sacrifice}}" data-dtype="String" />
+        <div class="small-editor item-text-long-line">
+          {{editor content=data.sacrifice target="data.sacrifice" button=true owner=owner editable=editable}}
+        </div>      
      </span>

      {{> systems/fvtt-mournblade/templates/partial-item-description.html}}
--- a/templates/partial-list-niveau.html
+++ b/templates/partial-list-niveau.html
@ -0,0 +1,11 @@
+<option value="0">0</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
--- a/templates/roll-dialog-generic.html
+++ b/templates/roll-dialog-generic.html
@ -3,86 +3,50 @@
    {{#if img}}
    <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
    {{/if}}
-    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>  
+    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
  </header>

-  <div class="grid grid-2col">
+  <div class="flexcol">

-    <div class="flexcol">
-
-      <div class="flexrow">
-        <span class="roll-dialog-label" >Stat Dice : </span>      
-        <select class="roll-dialog-label" id="statDicesLevel" type="text" name="statDicesLevel" value="{{statDicesLevel}}" data-dtype="Number"
-        {{#if statKey}}disabled{{/if}}>
-          {{#select statDicesLevel}}
-          {{{optionsDiceList}}}
-          {{/select}}
-        </select> 
-        <span class="small-label">&nbsp;+&nbsp;{{statMod}}</span>
-      </div>
-      
-      {{#if specList}}
-      <div class="flexrow">
-        <span class="roll-dialog-label" >Spec : </span>        
-        <select class="roll-dialog-label" id="specList" type="text" name="selectedSpec" value="{{selectedSpec}}" data-dtype="String">
-          {{#select selectedSpec}}
-          <option value="0">None</option>
-            {{#each specList as |spec idx|}}
-              <option value="{{spec._id}}">{{spec.name}}</option>
-            {{/each}}
-          {{/select}}
-        </select> 
-        <span class="small-label">&nbsp;</span>
-      </div>
-      {{/if}}
-
-      <div class="flexrow">
-        <span class="roll-dialog-label" >Spec Dice : </span>      
-        <select class="roll-dialog-label" id="specDicesLevel" type="text" name="specDicesLevel" value="{{specDicesLevel}}" data-dtype="Number"
-          {{#if specList}}disabled{{/if}}>
-          {{#select specDicesLevel}}
-          {{{optionsDiceList}}}
-          {{/select}}
-        </select> 
-        <span class="small-label">&nbsp;</span>
-      </div>
-      
-      <div class="flexrow">
-        <span class="roll-dialog-label" >Bonus Dice : </span>      
-        <select class="roll-dialog-label" id="bonusDicesLevel" type="text" name="bonusDicesLevel" value="{{bonusDicesLevel}}" data-dtype="Number">
-          {{#select bonusDicesLevel}}
-          {{{optionsDiceList}}}
-          {{/select}}
-        </select> 
-        <span class="small-label">&nbsp;</span>
-      </div>
-      
-      <div class="flexrow">
-        <span class="roll-dialog-label" >Hindrance Dice :</span>
-          <select class="roll-dialog-label" id="hindranceDicesLevel" type="text" name="hindranceDicesLevel" value="{{hindranceDicesLevel}}" data-dtype="Number">
-            {{#select hindranceDicesLevel}}
-            {{{optionsDiceList}}}
-            {{/select}}
-          </select> 
-          <span class="small-label">&nbsp;</span>
-        </div>
-      
-      <div class="flexrow">
-        <span class="roll-dialog-label" >Other Dice :</span>
-          <select class="roll-dialog-label" id="otherDicesLevel" type="text" name="otherDicesLevel" value="{{otherDicesLevel}}" data-dtype="Number">
-            {{#select otherDicesLevel}}
-            {{{optionsDiceList}}}
-            {{/select}}
-          </select> 
-          <span class="small-label">&nbsp;</span>
-        </div>
-      
+    <div class="flexrow">
+      <span class="roll-dialog-label">{{attr.label}}</span>
+      <span class="small-label">{{attr.value}}</span>
    </div>

-    <div>
-      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
+    {{#if competence}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">{{competence.name}}</span>
+      <span class="small-label">{{competence.data.niveau}}</span>
    </div>
+    {{/if}}
+
+    <div class="flexrow">
+      <span class="roll-dialog-label">Modificateur : </span>
+      <select class="roll-dialog-label" id="modificateur" type="text" name="modificateur" value="{{modificateur}}"
+        data-dtype="Number">
+        {{#select modificateur}}
+        {{{modificateursOptions}}}
+        {{/select}}
+      </select>
+    </div>
+
+    <div class="flexrow">
+      <span class="roll-dialog-label">Difficulté : </span>
+      <select class="roll-dialog-label" id="difficulte" type="text" name="difficulte" value="{{difficulte}}"
+        data-dtype="Number">
+        {{#select difficulte}}
+        <option value="0">Aucune/Inconnue</option>
+        <option value="5">Facile (5)</option>
+        <option value="10">Moyenne (10)</option>
+        <option value="15">Ardue (15)</option>
+        <option value="20">Hasardeuse (20)</option>
+        <option value="25">Insensée (25)</option>
+        <option value="30">Pure Folie (30)</option>
+        {{/select}}
+      </select>
+    </div>
+

  </div>
-  
-</form>
+
+</form>
Author	SHA1	Message	Date
sladecraven	7654401f37	Add competence roll	2022-06-04 21:06:33 +02:00
sladecraven	2ee6c285ea	Add competence roll	2022-06-04 21:06:01 +02:00
sladecraven	eda51dec7f	Ajout fenetre de roll + gestion de base des rolls	2022-06-03 08:15:39 +02:00
sladecraven	cca4383c33	Enhance interface	2022-06-01 22:40:32 +02:00