Gestion attaques v2 et initiative

templates/actor/combat.hbs

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

templates/actor/export-scriptarium/arme.hbs

@@ -2,8 +2,8 @@
       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>
+      {{#if attaque.label}}
+      <a class="roll-arme">{{upperFirst attaque.label}}</a>
       {{else}}
       <div></div>
       {{/if}}