Preliminary rolls

css/bol.css

@@ -514,15 +514,6 @@
   min-width: 460px;
   min-height: 400px;
 }
-.bol.sheet.item .window-content {
-  background-color: white;
-  background-image: url("/systems/bol/ui/logo.webp");
-  background-repeat: no-repeat;
-  background-size: 190px 115px;
-  height: 100%;
-  padding: 5px;
-  overflow-y: hidden;
-}
 .bol.sheet.item .window-content form {
   height: 100%;
 }

lang/fr.json

@@ -1,5 +1,5 @@
 {
-  "BOL.attributes.vigor": "Force",
+  "BOL.attributes.vigor": "Vigueur",
   "BOL.attributes.agility": "Agilité",
   "BOL.attributes.mind": "Esprit",
   "BOL.attributes.appeal": "Aura",
@@ -50,5 +50,41 @@
   "rank": "Niveau",
   "attribut": "Attribut",
   "subtype": "Type",
-  "Language": "Langue"
+  "Language": "Langue",
+  "Level": "Niveau",
+  "Roll": "Lancer",
+  
+  "Melee": "Mêlée",
+  "Ranged": "Tir",
+  "Quantity": "Quantité",
+  "Weight":"Poids",
+  "Damage": "Dommages",
+  "Two Hands": "A Deux Mains",
+  "Thrown": "Peut-être lancé",
+  "Range": "Portée (m.)",
+  "Reload": "A Recharger",
+  "Reload Duration": "Durée de rechargement (rounds)"  ,
+  "Can be hidden": "Peut être cachée",
+  "Ignore Shield": "Ignore les boucliers",
+  "Improvised": "Improvisée",
+  "Properties": "Propriétés",
+  "Protection Roll": "Jet de Protection",
+  "Protection Fixed": "Protection statique (si pas de jet)",
+  "None": "Aucun",
+  "Social Malus": "Malus Social",
+  "Agility Malus":"Malus d'Agilité",
+  "Initiative Malus": "Malus d'Initiative",
+  "Power Cost": "Cout en Points de Pouvoir",
+  "Equipped": "Equipé",
+  "Attack with": "Attaque avec",
+  "Range Modifier": "Modificateur de portée",
+  "Point Blank": "Bout portant",
+  "Short": "Courte",
+  "Medium": "Moyenne",
+  "Long": "Long",
+  "Very Long": "Très longue",
+  "Extreme": "Extrême",
+  "Maximum": "Maximale",
+  "Defender": "Défenseur",
+  "Defense score": "Score de défense"
 }

module/actor/actor-sheet.js

@@ -26,7 +26,9 @@ export class BoLActorSheet extends ActorSheet {
     actor.data.attributes = Object.values(actor.data.data.attributes);
     actor.data.aptitudes = Object.values(actor.data.data.aptitudes);
     actor.data.resources = Object.values(actor.data.data.resources);
-    actor.data.equipment = actor.data.items.filter(i => i.type === "item");
+    actor.data.equipment = actor.data.items.filter(i => i.type === "item" || i.type == 'weapon' || i.type == 'armor');
+    actor.data.weapons = duplicate(actor.data.items.filter(i => i.type == 'weapon' ));
+    actor.data.armors = duplicate(actor.data.items.filter(i => i.type == 'armor' ));
     actor.data.features = {
       "origin" : actor.data.items.find(i => i.type === "feature" && i.data.subtype === "origin"),
       "race" : actor.data.items.find(i => i.type === "feature" && i.data.subtype === "race"),
@@ -34,10 +36,7 @@ export class BoLActorSheet extends ActorSheet {
       "boons" : actor.data.items.filter(i => i.type === "feature" && i.data.subtype === "boon"),
       "flaws" : actor.data.items.filter(i => i.type === "feature" && i.data.subtype === "flaw")
     };
-    // data.attributes = ["String", "Number", "Boolean"];
+
-    // for (let attr of Object.values(data.data.attributes)) {
-    //   attr.isCheckbox = attr.dtype === "Boolean";
-    // }
     return actor;
   }
 
@@ -58,11 +57,17 @@ export class BoLActorSheet extends ActorSheet {
       console.log(item);
       item.sheet.render(true);
     });
-
+    html.find('.roll-attribute').click(ev => {
+      this.actor.rollAttributeAptitude( $(ev.currentTarget).data("attr-key") );
+    });    
     html.find('.roll-career').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       this.actor.rollCareer( li.data("itemId") );
     });
+    html.find('.roll-weapon').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      this.actor.rollWeapon( li.data("itemId") );
+    });
     
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {

module/actor/actor.js

@@ -6,6 +6,7 @@ import { BoLUtility } from "../system/bol-utility.js";
  * @extends {Actor}
  */
 export class BoLActor extends Actor {
+  
   /** @override */
   prepareData() {
     super.prepareData();
@@ -19,22 +20,23 @@ export class BoLActor extends Actor {
 
     // Make separate methods for each Actor type (character, npc, etc.) to keep
     // things organized.
-    // if (actorData.type === 'character') this._prepareCharacterData(actorData);
+    if (actorData.type === 'character') {
+      this._prepareCharacterData(actorData);
+    }
   }
 
   // /**
   //  * Prepare Character type specific data
   //  */
-  // _prepareCharacterData(actorData) {
+  /* -------------------------------------------- */
-  //   const data = actorData.data;
+  _prepareCharacterData(actorData) {
-  //
+    let newVitality = 10 + this.data.data.attributes.vigor.value; 
-  //   // Make modifications to data here. For example:
+    if ( newVitality != this.data.data.resources.hp.max) {
-  ////   // Loop through ability scores, and add their modifiers to our sheet output.
+      this.data.data.resources.hp.max = newVitality;
-  //   for (let [key, ability] of Object.entries(data.abilities)) {
+      this.update( { 'data.resources.hp.max': newVitality});
-  //     // Calculate the modifier using d20 rules.
+    }
-  //     ability.mod = Math.floor((ability.value - 10) / 2);
+  }
-  //   }
+
-  // }
   /* -------------------------------------------- */
   getBoons() {
     return this.data.items.filter(i => i.type === "feature" && i.data.subtype === "boon");   
@@ -52,6 +54,35 @@ export class BoLActor extends Actor {
     this.currentRollData = rollData;
   }
 
+  /* -------------------------------------------- */
+  async rollAttributeAptitude( attrKey ) {
+    let attr = this.data.data.attributes[attrKey];
+    if ( !attr) {
+      attr = this.data.data.aptitudes[attrKey];
+    }
+    if (attr) {
+      let rollData = {
+        mode : "attribute",
+        actorId: this.id,
+        actorImg: this.img,
+        attribute: duplicate(attr),
+        boons :  this.getBoons(),
+        flaws :  this.getFlaws(),
+        d6Bonus: 0,
+        d6Malus: 0,
+        rollMode: game.settings.get("core", "rollMode"),
+        title: game.i18n.localize(attr.label),
+        optionsBonusMalus: BoLUtility.buildListOptions(-8, +2),
+        bonusMalus: 0
+      }
+      let rollDialog = await BoLRollDialog.create( this, rollData);
+      rollDialog.render( true );
+    } else {
+      ui.notifications.warn("Unable to find attribute " + attrKey );
+    }
+  }
+
+  /* -------------------------------------------- */
   async rollCareer( careerId ) {
     let career = BoLUtility.data(this.data.items.find( item => item.type == 'feature' && item.id == careerId));
     if (career) {
@@ -77,4 +108,49 @@ export class BoLActor extends Actor {
       ui.notifications.warn("Unable to find career for actor " + this.name + " - Career ID  " + careerId);
     }
   }
+
+  /* -------------------------------------------- */
+  async rollWeapon( weaponId ) {
+    let weapon = BoLUtility.data(this.data.items.find( item => item.type == 'weapon' && item.id == weaponId));
+    if (weapon) {
+      let target = BoLUtility.getTarget();
+      if ( !target) {
+        ui.notifications.warn("You must have a target to attack with a Weapon");
+        return;
+      }
+      let objectDefender = BoLUtility.data(game.actors.get(target.data.actorId));
+      objectDefender = mergeObject(objectDefender, target.data.actorData);
+      let rollData = {
+        mode : "weapon",
+        actorId: this.id,
+        actorImg: this.img,
+        weapon :  weapon,
+        target: target,
+        defender: objectDefender,
+        boons :  this.getBoons(),
+        flaws :  this.getFlaws(),
+        rollAttribute: 'agility',
+        attributes: duplicate(this.data.data.attributes), // For damage bonus
+        d6Bonus: 0,
+        d6Malus: 0,
+        rollMode: game.settings.get("core", "rollMode"),
+        title: weapon.name,
+        rangeModifier: 0,
+        optionsBonusMalus: BoLUtility.buildListOptions(-8, +2),
+        bonusMalus: 0
+      }
+      if ( weapon.data.type == 'melee') {
+        rollData.aptitude = duplicate(this.data.data.aptitudes.melee);
+      } else {
+        rollData.aptitude = duplicate(this.data.data.aptitudes.ranged);
+      }
+      console.log("WEAPON ! ", rollData);
+      let rollDialog = await BoLRollDialog.create( this, rollData);
+      rollDialog.render( true );
+    } else {
+      ui.notifications.warn("Unable to find weapon for actor " + this.name + " - Weapon ID  " + weaponId);
+    }
+  }
+
+  
 }

module/item/item-sheet.js

@@ -20,11 +20,11 @@ export class BoLItemSheet extends ItemSheet {
   get template() {
     const path = "systems/bol/templates/item";
     // Return a single sheet for all item types.
-    return `${path}/item-sheet.hbs`;
+    //return `${path}/item-sheet.hbs`;
     // Alternatively, you could use the following return statement to do a
     // unique item sheet by type, like `weapon-sheet.html`.
 
-    // return `${path}/${this.item.data.type}-sheet.html`;
+    return `${path}/item-${this.item.data.type}-sheet.hbs`;
   }
 
   /* -------------------------------------------- */

module/system/bol-utility.js

@@ -117,6 +117,15 @@ export class BoLUtility  {
       this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions);
     }
   
+  /* -------------------------------------------- */
+  static getTarget() {
+    if (game.user.targets && game.user.targets.size == 1) {
+      for (let target of game.user.targets) {
+        return target;
+      }
+    }
+    return undefined;
+  }
   
   /* -------------------------------------------- */
   static async rollBoL( rollData ) {
@@ -136,9 +145,19 @@ export class BoLUtility  {
     nbDice +=  d6BM;
 
     // Final modifier 
-    let modifier = Number(rollData.attributes[rollData.rollAttribute].value) + Number(rollData.career.data.rank) + Number(rollData.bonusMalus);
+    let modifier = Number(rollData.bonusMalus);
+    if ( rollData.mode == 'career') {
+      modifier += Number(rollData.attributes[rollData.rollAttribute].value) + Number(rollData.career.data.rank);
+    } else if ( rollData.mode == 'attribute' ) {
+      modifier += rollData.attribute.value;
+    } else if ( rollData.mode == 'weapon') {
+      modifier += Number(rollData.attributes[rollData.rollAttribute].value) + Number(rollData.aptitude.value) + Number(rollData.rangeModifier);
+      modifier -= rollData.defender.aptitudes.def.value;
+    }
+
     let formula = nbDice+"d6"+mode+"+"+modifier;
-    console.log("Goigin to roll ", formula, rollData.attributes, rollData.rollAttribute);
+
+    console.log("Going to roll ", formula, rollData.attributes, rollData.rollAttribute);
     let myRoll = new Roll(formula).roll( { async: false});
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode") );
     rollData.roll = myRoll;
@@ -152,7 +171,6 @@ export class BoLUtility  {
     this.createChatWithRollMode( rollData.alias, {
       content: await renderTemplate(`systems/bol/templates/roll/chat-generic-result.hbs`, rollData)
     });
-      // TODO
   }  
 
   /* -------------------------------------------- */

module/system/roll-dialog.js

@@ -18,12 +18,12 @@ export class BoLRollDialog extends Dialog {
       buttons: { 
         roll: {
             icon: '<i class="fas fa-check"></i>',
-            label: "Roll !",
+            label: game.i18n.localize("Roll"),
             callback: () => { this.roll() } 
           },
           cancel: {
             icon: '<i class="fas fa-times"></i>',
-            label: "Cancel",
+            label: game.i18n.localize("Cancel"),
             callback: () => { this.close() }
         } },
       default: "roll",

styles/bol.less

@@ -338,13 +338,6 @@
     }
     &.item {
       .window-content {
-        background-color: white;
-        background-image: url("/systems/bol/ui/logo.webp");
-        background-repeat: no-repeat;
-        background-size: @logo-width @logo-height;
-        height: 100%;
-        padding: 5px;
-        overflow-y: hidden;
 
         form {
           height: 100%;

system.json

@@ -2,10 +2,10 @@
   "name": "bol",
   "title": "Barbarians of Lemuria",
   "description": "The Barbarians of Lemuria system for FoundryVTT!",
-  "version": "0.8.8.3",
+  "version": "0.8.8.7",
   "minimumCoreVersion": "0.8.6",
-  "compatibleCoreVersion": "0.8.8",
+  "compatibleCoreVersion": "0.8.9",
-  "templateVersion": 4,
+  "templateVersion": 8,
   "author": "Zigmund",
   "esmodules": ["module/bol.js"],
   "styles": ["css/bol.css"],

template.json

@@ -128,7 +128,7 @@
     }
   },
   "Item": {
-    "types": ["item", "feature"],
+    "types": ["item", "feature", "weapon", "armor"],
     "templates": {
       "base": {
         "subtype" : "default",
@@ -168,6 +168,33 @@
       "quantity": 1,
       "weight": 0
     },
+    "weapon": {
+      "type": "",
+      "quantity": 1,
+      "weight": 0,
+      "damage": "",
+      "range": "",
+      "thrown": false,
+      "twohands": false,
+      "reload": false,
+      "reloadduration": 0,
+      "canbehidden": false,
+      "ignoreshield": false,
+      "improvised": false,
+      "equipped": false,
+      "description": ""
+    },
+    "armor": {
+      "type": "",
+      "protectionroll": "",
+      "protectionfixed": 0,
+      "socialmalus": false,
+      "agilitymalus": 0,
+      "initmalus": 0,
+      "powercost": 0,
+      "equipped": false,
+      "description": ""
+    },
     "feature": {
       "rank": 0,
       "templates": ["base"]

templates/actor/actor-sheet.hbs

@@ -25,7 +25,7 @@
             {{!-- Sheet Tab Navigation --}}
             <nav class="sheet-tabs tabs" data-group="primary">
                 <a class="item" data-tab="stats">Attributs</a>
-                <a class="item" data-tab="features">Traits</a>
+                <a class="item" data-tab="features">Actions</a>
                 <a class="item" data-tab="equipment">Equipement</a>
                 <a class="item" data-tab="description">Description</a>
             </nav>
@@ -35,7 +35,7 @@
                     <div class="attributes flexrow">
                         {{#each data.attributes as |attribute id|}}
                             <div class="attribute stat flex1 flex-group-center {{key}}">
-                                <label class="stat-label">{{localize label}}</label><br/>
+                                <label class="stat-label"><a class="roll-attribute" data-attr-key="{{key}}">{{localize label}}</a></label><br/>
                                 <input class="stat-value rounded" type="text" name="data.attributes.{{key}}.value" value="{{numberFormat value decimals=0 sign=true}}" data-dtype="Number"/><br/>
                                 <span  class="stat-roll malus rollable" title="2d6M" data-roll="3d6kh2+@attributes.{{key}}.value" data-label="{{key}}"><i class="fas fa-dice"></i></span>
                                 <span  class="stat-roll rollable" title="2d6" data-roll="2d6+@attributes.{{key}}.value" data-label="{{key}}"><i class="fas fa-dice"></i></span>
@@ -47,7 +47,7 @@
                     <div class="aptitudes flexrow">
                     {{#each data.aptitudes as |aptitude id|}}
                         <div class="aptitude stat flex1 flex-group-center">
-                            <label class="stat-label">{{localize label}}</label><br/>
+                            <label class="stat-label"><a class="roll-attribute" data-attr-key="{{key}}">{{localize label}}</a></label><br/>
                             <input class="stat-value rounded-border" type="text" name="data.aptitudes.{{key}}.value" value="{{numberFormat value decimals=0 sign=true}}" data-dtype="Number"/><br/>
                             <span class="stat-roll malus rollable" title="2d6M" data-roll="3d6kh2+@aptitudes.{{key}}.value" data-label="{{key}}"><i class="fas fa-dice"></i></span>
                             <span class="stat-roll rollable" title="2d6" data-roll="2d6+@aptitudes.{{key}}.value" data-label="{{key}}"><i class="fas fa-dice"></i></span>
@@ -66,20 +66,19 @@
                     {{/each}}
                     </div>
                 </div>
+
                 <div class="tab features" data-group="primary" data-tab="features">
                     <ol class="items-list">
                         <li class="item flexrow item-header">
                             <div class="item-image">{{localize "Careers"}}</div>
                             <div class="item-name">{{localize "Name"}}</div>
-<!--                            <div class="item-controls">-->
+                            <div class="item-name">{{localize "Level"}}</div>
-<!--                                <a class="item-control item-create" title="Create item" data-type="item"><i class="fas fa-plus"></i> Add item</a>-->
-<!--                            </div>-->
                         </li>
                         {{#each data.features.careers as |item id|}}
                             <li class="item flexrow" data-item-id="{{item._id}}">
                                 <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
                                 <h4 class="item-name"><a class="roll-career">{{item.name}}</a></h4>
-                                <span class="item-name">{{item.data.data.rank}}</span>
+                                <span class="item-name">{{item.data.rank}}</span>
                                 <div class="item-controls">
                                     <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                                     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -87,6 +86,26 @@
                             </li>
                         {{/each}}
                     </ol>
+
+                    <ol class="items-list">
+                        <li class="item flexrow item-header">
+                            <div class="item-image">{{localize "Weapons"}}</div>
+                            <div class="item-name">{{localize "Name"}}</div>
+                            <div class="item-name">{{localize "Damage"}}</div>
+                        </li>
+                        {{#each data.weapons as |weapon id|}}
+                            <li class="item flexrow" data-item-id="{{weapon._id}}">
+                                <div class="item-image"><img src="{{weapon.img}}" title="{{weapon.name}}" width="24" height="24"/></div>
+                                <h4 class="item-name"><a class="roll-weapon">{{weapon.name}}</a></h4>
+                                <span class="item-name">{{weapon.data.damage}}</span>
+                                <div class="item-controls">
+                                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                                </div>
+                            </li>
+                        {{/each}}
+                    </ol>
+
                     <ol class="items-list">
                         <li class="item flexrow item-header">
                             <div class="item-image">{{localize "Boons"}}</div>
@@ -140,6 +159,7 @@
                                 <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
                                 <h4 class="item-name">{{item.name}}</h4>
                                 <div class="item-controls">
+                                    <a class="item-control item-equip" title="Worn">{{#if weapon.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                                     <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                                     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
                                 </div>

templates/item/item-sheet.hbs

@@ -1,65 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-
-    {{!-- Sheet Tab Navigation --}}
-    <nav class="sheet-tabs tabs" data-group="primary">
-        <a class="item" data-tab="description">Description</a>
-        <a class="item" data-tab="properties">Properties</a>
-    </nav>
-
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
-        {{!-- Description Tab --}}
-        <div class="tab" data-group="primary" data-tab="description">
-  
-            <div class="property flexrow">
-              <label class="property-label">{{localize "subtype"}}</label>
-              <select name="data.subtype" value="{{data.subtype}}" data-dtype="String">
-                {{#select data.subtype}}
-                <option value="boon">{{localize "Avantage"}}</option>
-                <option value="flaw">{{localize "Flaw"}}</option>
-                <option value="career">{{localize "Career"}}</option>
-                <option value="language">{{localize "Language"}}</option>
-                {{/select}}
-              </select>
-            </div>
-
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-        </div>
-
-        {{!-- Attributes Tab --}}
-        <div class="tab properties" data-group="primary" data-tab="properties">
-            {{!-- As you add new fields, add them in here! --}}
-<!--            <div class="grid grid-2col">-->
-                {{#if (eq data.subtype "career")}}
-                <div class="property flexrow">
-                    <label class="property-label">{{localize "rank"}}</label>
-                    <input type="text" name="data.rank" value="{{data.rank}}" data-dtype="Number"/>
-                </div>
-                {{else}}
-                <div class="property flexrow">
-                    <label class="property-label">Quantity</label>
-                    <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
-                </div>
-                <div class="property flexrow">
-                    <label class="property-label">Weight</label>
-                    <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-                </div>
-                {{/if}}
-
-<!--            </div>-->
-            {{#each data.properties as |property key|}}
-                <div class="property flexrow">
-                    <label class="property-label">{{localize key}}</label>
-                    <label class="attribute-value checkbox"><input type="checkbox" name="data.properties.{{key}}" {{checked property}}/></label>
-                </div>
-            {{/each}}
-        </div>
-    </section>
-</form>

templates/roll/chat-generic-result.hbs

@@ -6,16 +6,19 @@
   <hr>
 
   <div>
-  <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+    <h3>
-    <h4>
+    {{#if (eq mode "attribute")}}
-    {{#if (eq mode "career")}}  
+      {{localize attribute.label}}
-    {{localize "Career"}} : {{career.name}}
     {{else}}  
-      {{#if (eq mode "weapon")}}
+      {{#if (eq mode "career")}}  
-      Weapon attack : {{weapon.name}}   
+      {{localize "Career"}} : {{career.name}}
+      {{else}}
+        {{#if (eq mode "weapon")}}
+        {{localize "Attack with"}} {{weapon.name}}   
+        {{/if}}
       {{/if}}
     {{/if}}
-    </h4>
+    </h3>
 
     <div>
     <ul>

templates/roll/roll-dialog-attribute.hbs

@@ -1,8 +1,39 @@
 <form class="skill-roll-dialog">
   <h2 class="dialog-roll-title">{{title}}</h2>
 
-  <div class="flexrow">
+  <div class="property flexrow">
+    <label class="property-label">{{localize "d6M"}}</label>
+    <select id="d6Malus" value="d6Malus">
+      {{#select d6Malus}}
+      <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>
+      {{/select}}
+    </select>
+  </div>
 
+  <div class="property flexrow">
+    <label class="property-label">{{localize "d6B"}}</label>
+    <select id="d6Bonus" value="d6Bonus">
+      {{#select d6Bonus}}
+      <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>
+      {{/select}}
+    </select>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "Modifier"}}</label>
+    <select id="bonusMalus" value="bonusMalus">
+      {{#select bonusMalus}}
+      {{{optionsBonusMalus}}}
+      {{/select}}
+    </select>
   </div>
 
 </form>

templates/roll/roll-dialog-weapon.hbs

@@ -1,8 +1,71 @@
 <form class="skill-roll-dialog">
   <h2 class="dialog-roll-title">{{title}}</h2>
 
-  <div class="flexrow">
+  <div class="property flexrow">
+    <label class="property-label">{{localize "attribut"}}</label>
+    <select id="rollAttribute" value="rollAttribute">
+      {{#select rollAttribute}}
+      <option value="vigor">{{localize "BOL.attributes.vigor"}}</option>
+      <option value="agility">{{localize "BOL.attributes.agility"}}</option>
+      {{/select}}
+    </select>
+  </div>
 
+  <div class="property flexrow">
+    <label class="property-label">{{localize "Defender"}} : </label>
+    <label class="property-label">{{defender.name}}</label>
+    <label class="property-label">{{localize "Defense score"}}</label>
+    <label class="property-label">{{defender.data.aptitudes.def.value}}</label>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "d6M"}}</label>
+    <select id="d6Malus" value="d6Malus">
+      {{#select d6Malus}}
+      <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>
+      {{/select}}
+    </select>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "d6B"}}</label>
+    <select id="d6Bonus" value="d6Bonus">
+      {{#select d6Bonus}}
+      <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>
+      {{/select}}
+    </select>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "Range Modifier"}}</label>
+    <select id="rangeModifier" value="rangeModifier">
+      {{#select rangeModifier}}
+      <option value="1">{{localize "Point Blank"}}</option>
+      <option value="0">{{localize "Short"}}</option>
+      <option value="-1">{{localize "Medium"}}</option>
+      <option value="-2">{{localize "Long"}}</option>
+      <option value="-4">{{localize "Very Long"}}</option>
+      <option value="-6">{{localize "Extreme"}}</option>
+      <option value="-8">{{localize "Maximum"}}</option>
+      {{/select}}
+    </select>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "Modifier"}}</label>
+    <select id="bonusMalus" value="bonusMalus">
+      {{#select bonusMalus}}
+      {{{optionsBonusMalus}}}
+      {{/select}}
+    </select>
   </div>
 
 </form>