Préparation roll-dialog attaques

Les attaques ne sont plus des armes modifiées

templates/actor/combat.hbs

@@ -6,26 +6,31 @@
     <span class="competence-value"></span>
     <span class="initiative-value">Initiative</span>
   </li>
-{{#each combat as |arme key|}}
+{{#each combat as |action key|}}
   <li class="item flexrow list-item"
-      data-item-id="{{arme._id}}"
-      data-arme-name="{{arme.name}}"
-      data-competence-name="{{arme.system.competence}}"
-      data-tooltip="{{arme.name}}: niveau {{plusMoins arme.system.niveau}}">
+      data-item-id="{{action._id}}"
+      data-arme-name="{{action.arme.name}}"
+      data-competence-name="{{action.comp.name}}"
+      data-tooltip="{{action.name}}: niveau {{plusMoins action.comp.system.niveau}}">
     <span class="list-item-label flexrow">
       <a class="roll-arme flexrow">
-        {{#if arme.img}}
-        <img class="sheet-competence-img" src="{{arme.img}}" data-tooltip="{{arme.name}}"/>
+        {{#if action.arme.img}}
+        <img class="sheet-competence-img" src="{{action.arme.img}}" data-tooltip="{{action.arme.name}}"/>
         {{/if}}
-        <span>{{arme.name}}</span>
+        <span>{{action.name}}</span>
       </a>
-      ({{arme.system.competence}})
-      {{>"systems/foundryvtt-reve-de-dragon/templates/item/icon-arme-broken.hbs" arme}}
+      ({{action.comp.name}})
+      {{>"systems/foundryvtt-reve-de-dragon/templates/item/icon-arme-broken.hbs" action.arme}}
     </span>
-    <span class="competence-value">{{plusMoins arme.system.niveau}}</span>
-    <span class="competence-value">{{plusMoins arme.system.dommagesReels}}</span>
+    <span class="competence-value">{{plusMoins action.comp.system.niveau}}</span>
+    <span class="competence-value">{{plusMoins action.dmg}}</span>
     <span class="competence-value"></span>
-    <span class="initiative-value"><a class="roll-init-arme" data-tooltip="{{arme.name}}: initiative {{arme.system.initiative}}">{{arme.system.initiative}}</a></span>
+    <span class="initiative-value">
+      <a class="roll-init-arme" 
+          data-tooltip="{{action.name}}: initiative {{action.initiative}}">
+        {{action.initiative}}
+      </a>
+    </span>
   </li>
   {{/each}}
   {{#each esquives as |esq key|}}

templates/actor/export-scriptarium/actor-encart-sheet.hbs

@@ -72,12 +72,9 @@
     </div>
   <hr>
     <div>
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme.hbs" name='' niveau='Niv' init='Init' dommages='+dom'}}
-      {{#each context.armes as |arme|}}
-        {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme.hbs"
-          name=arme.name niveau=arme.niveau init=arme.init dommages=arme.dommages
-          arme=arme.arme competence=arme.competence
-        }}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme-titre.hbs"}}
+      {{#each attaques as |attaque|}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme.hbs" attaque=attaque}}
       {{/each}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/esquive.hbs" name='Esquive' niveau=context.esquive.value competence=context.esquive.competence}}
       {{#if (gt export.malue_armure.value 0)}}

templates/actor/export-scriptarium/arme-titre.hbs

@@ -0,0 +1,8 @@
+<div class="flexrow item">
+  <div></div>
+  <div class="flexrow">
+    <div>Niv.</div>
+    <div>Init.</div>
+    <div>+dom</div>
+  </div>
+</div>

templates/actor/export-scriptarium/arme.hbs

@@ -1,24 +1,22 @@
 <div class="flexrow item"
-      data-item-id="{{arme._id}}"
-      data-arme-name="{{arme.name}}"
-      data-competence-name="{{competence.name}}">
-      {{#if name}}
-      <a class="roll-arme">{{upperFirst name}}</a>
+      data-item-id="{{attaque.arme._id}}"
+      data-arme-name="{{attaque.arme.name}}"
+      data-competence-name="{{attaque.comp.name}}">
+      {{#if attaque.name}}
+      <a class="roll-arme">{{upperFirst attaque.name}}</a>
       {{else}}
       <div></div>
       {{/if}}
   <div class="flexrow">
-    <div>{{niveau}}</div>
-    {{#if init}}
-    {{#if name}}
-      <div><a class="roll-init-arme">{{init}}</a></div>
-    {{else}}
-      <div>{{init}}</div>
-    {{/if}}
-    <div>{{dommages}}</div>
-    {{else}}
-    <div></div>
+    <div>{{plusMoins attaque.comp.system.niveau}}</div>
+    <div><a class="roll-init-arme">{{attaque.initiative}}</a></div>
+    {{#if (eq arme.system.mortalite 'empoignade')}}
     <div></div>
+    {{else if (eq arme.system.mortalite 'non-mortel')}}
+    <div>({{plusMoins attaque.dmg}})</div>
+    {{else}}
+    <div>{{plusMoins attaque.dmg}}</div>
     {{/if}}
+
   </div>
 </div>