module/actor/actor-sheet.js

@@ -185,6 +185,9 @@ export class BoLActorSheet extends ActorSheet {
       case "aptitude" :
         BoLRoll.aptitudeCheck(this.actor, actorData, dataset, event);
         break;
+      case "weapon": 
+        console.log("ROLL WEAPON !!!"); // TODO
+        break;
       default : break;
     }
   }

module/system/settings.js

@@ -10,4 +10,14 @@ export const registerSystemSettings = function() {
         onChange: lang => window.location.reload()
     });
     
+    game.settings.register("bol", "rollArmor", {
+      name: "Effectuer des jets pour les armures",
+      hint: "Effectue un jet de dés pour les armures (valeur fixe si désactivé)",
+      scope: "world",
+      config: true,
+      default: true,
+      type: Boolean,
+      onChange: lang => window.location.reload()
+  });
+
 };

templates/actor/parts/tabs/actor-actions.hbs

@@ -5,3 +5,24 @@
     <li class="item flexrow"><div class="item-image roll-weapon"><img src="icons/skills/melee/unarmed-punch-fist.webp" title="Attaque à mains nues"/></div><h4 class="item-name flex2"><a class="item-edit">Attaque à mains nues</a></h4></li>
 </ol>
 
+{{#each combat as |combatType id|}}
+        <ol class="items-list">
+            <li class="item flexrow item-header">
+                <div class="item-name flex2">{{localize combatType.label}}</div>
+                {{#if protection}}<div class="item-field">{{localize "BOL.ui.protection"}}</div>{{/if}}
+                {{#if blocking}}<div class="item-field">{{localize "BOL.ui.blocking"}}</div>{{/if}}
+                {{#if weapon}}<div class="item-field">{{localize "BOL.ui.damages"}}</div>{{/if}}
+                {{#if ranged}}<div class="item-field">{{localize "BOL.ui.range"}}</div>{{else}}<div class="item-field"></div>{{/if}}
+            </li>
+            {{#each combatType.items as |item id|}}
+                <li class="item flexrow" data-item-id="{{item._id}}">
+                    <div class="item-image" ><img src="{{item.img}}" title="{{item.name}}"/></div>
+                    <h4 class="item-name flex2">{{#if ../weapon}}<a class="rollable" data-roll-type="weapon">{{/if}}{{item.name}}{{#if ../weapon}}</a>{{/if}}</h4>
+                    {{#if ../protection}}<div class="item-field">{{item.data.properties.soak.value}}</div>{{/if}}
+                    {{#if ../blocking}}<div class="item-field">{{item.data.properties.blocking.malus}}</div>{{/if}}
+                    {{#if ../weapon}}<div class="item-field">{{item.data.properties.damage}}</div>{{/if}}
+                    {{#if ../ranged}}<div class="item-field">{{item.data.properties.range}}</div>{{else}}<div class="item-field"></div>{{/if}}
+                </li>
+            {{/each}}
+        </ol>
+{{/each}}

templates/actor/parts/tabs/actor-combat.hbs

@@ -8,17 +8,16 @@
     </li>
 </ol>
 
-{{#each data.combat as | combat id|}}
+{{#each combat as |combatType id|}}
-    {{#if (gt (count combat.items) 0)}}
         <ol class="items-list">
             <li class="item flexrow item-header">
-                <div class="item-name flex2">{{localize combat.label}}</div>
+                <div class="item-name flex2">{{localize combatType.label}}</div>
                 {{#if protection}}<div class="item-field">{{localize "BOL.ui.protection"}}</div>{{/if}}
                 {{#if blocking}}<div class="item-field">{{localize "BOL.ui.blocking"}}</div>{{/if}}
                 {{#if weapon}}<div class="item-field">{{localize "BOL.ui.damages"}}</div>{{/if}}
                 {{#if ranged}}<div class="item-field">{{localize "BOL.ui.range"}}</div>{{else}}<div class="item-field"></div>{{/if}}
             </li>
-            {{#each combat.items as |item id|}}
+            {{#each combatType.items as |item id|}}
                 <li class="item flexrow" data-item-id="{{item._id}}">
                     <div class="item-image {{#if ../weapon}}roll-weapon{{/if}}"><img src="{{item.img}}" title="{{item.name}}"/></div>
                     <h4 class="item-name flex2"><a class="item-edit">{{item.name}}</a></h4>
@@ -29,5 +28,4 @@
                 </li>
             {{/each}}
         </ol>
-    {{/if}}
 {{/each}}