All fixes requested

templates/actors/actor-sheet.hbs

@@ -4,7 +4,13 @@
   <header class="sheet-header">
     <div class="header-fields">
       <div class="flexrow">
-        <img class="profile-img margin-image-right" src="{{img}}" data-edit="img" title="{{name}}" />
+        
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        
+        <div class="fixed-separator">
+          &nbsp;
+        </div>
+        
         <div class="flexcol">
           <h1 class="charname "><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
           
@@ -117,10 +123,10 @@
           <ul class="item-list alternate-list">
             <li class="item">
               <label class="item-field-label-medium">STR Dice</label>
-              <a class="roll-direct" data-roll-source="STR Dice" data-roll-formula="{{characteristics.str.strdice.rollFormula}}"><i class="fas fa-dice"></i>{{characteristics.str.strdice.displayFormula}}</a>
+              <a class="roll-lift-dice"><i class="fas fa-dice"></i>{{characteristics.str.strdice}}</a>
               <label class="item-field-label-short">&nbsp;</label>
               <label class="item-field-label-medium">Lift</label>
-              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
+              <input type="text" class="item-field-label-short update-field" disabled data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
               <label class="item-field-label-short">&nbsp;</label>
               <label class="item-field-label-medium">STR END</label>
               <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.strend" value="{{characteristics.str.strend}}" data-dtype="Number" />
@@ -508,8 +514,14 @@
           <span class="item-field-label-short">
             <label class="item-field-label-short">Cost</label>
           </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Name</label>
+          </span>
           <span class="item-field-label-long4">
-            <label class="item-field-label-long4">Power</label>
+            <label class="item-field-label-long4">Display</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Effect</label>
           </span>
           <span class="item-field-label-short">
             <label class="item-field-label-short">Roll</label>
@@ -521,10 +533,11 @@
         {{#each powers as |power key|}}
         <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{power._id}}">
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{power.img}}" /></a>
+              src="{{power.img}}" /></a>              
           <span class="item-field-label-short">{{power.system.cost}}</span>
-          <span class="item-field-label-long4">{{{power.enrichDescription}}}
-          </span>
+          <span class="item-field-label-medium">{{power.name}}</span>
+          <span class="item-field-label-long4">{{power.system.displayname}}</span>
+          <span class="item-field-label-medium"><a class="roll-damage" data-type="power"><i class="fas fa-dice"></i>{{power.system.damage}}</a></span>
           {{#if power.system.hasroll}}          
           <span class="item-field-label-short"><a class="roll-item" data-type="power"><i class="fas fa-dice"></i>{{power.system.roll}}-</a></span>
           {{else}}

templates/chat/chat-damage-result.hbs

@@ -0,0 +1,30 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class=chat-actor-name>{{alias}}</h4>
+</div>
+
+  <hr>
+  
+  {{#if img}}
+  <div >
+    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+  </div>
+  {{/if}}
+
+  <div class="flexcol">
+    </div>
+
+    <div>
+      <ul>
+        <li>Damage formula : {{diceFormula}}</li>
+
+        <li><strong>Result : {{result}}</strong></li>
+
+        <li><strong>BODY : {{bodyValue}}</strong></li>
+        
+      </ul>  
+    </div>
+
+  </div>

templates/chat/chat-lift-dice-result.hbs

@@ -0,0 +1,28 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class=chat-actor-name>{{alias}}</h4>
+</div>
+
+  <hr>
+  
+  {{#if img}}
+  <div >
+    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+  </div>
+  {{/if}}
+
+  <div class="flexcol">
+    </div>
+
+    <div>
+      <ul>
+        <li>Lift dice formula : {{diceFormula}}</li>
+
+        <li><strong>Result : {{result}}</strong></li>
+        
+      </ul>  
+    </div>
+
+  </div>

templates/items/item-power-sheet.hbs

@@ -18,7 +18,7 @@
         <ul>
           {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
 
-          {{> systems/fvtt-hero-system-6/templates/partials/partial-power-maneuver-effect.hbs}}
+          <!-- {{> systems/fvtt-hero-system-6/templates/partials/partial-power-maneuver-effect.hbs}} -->
 
           {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
 

templates/partials/partial-actor-equipment-section.hbs

@@ -1,16 +1,16 @@
       <ul class="item-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-img">
+            <label class="">&nbsp;</label>
+          </span>
           <span class="item-field-label-long-img">
             <label class="">{{title}}</label>
           </span>
-          <span class="item-field-label-medium">
-            <label class="item-field-label-medium">Value</label>
+          <span class="item-field-label-long4">
+            <label class="item-field-label-long4">Display</label>
           </span>
-          <span class="item-field-label-medium">
-            <label class="item-field-label-medium">Mass</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="item-field-label-medium">Quantity</label>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">Effect</label>
           </span>
           <span class="item-field-label-short">
             <label class="item-field-label-short">Roll</label>
@@ -18,7 +18,6 @@
           <span class="item-field-label-medium">
             <label class="item-field-label-medium">END</label>
           </span>
-          <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>

templates/partials/partial-actor-equipment.hbs

@@ -2,17 +2,13 @@
   <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{equip.img}}" /></a>
   <span class="item-name-label">{{equip.name}}</span>
 
-  <span class="item-field-label-medium"><label>{{equip.system.value}}
+  <span class="item-field-label-long4"><label>{{equip.system.displayname}}
   </label>
   </span>          
 
-  <span class="item-field-label-medium"><label>{{equip.system.weight}}
+  <span class="item-field-label-short"><label><a class="roll-damage" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.damage}}</a>
   </label>
-  </span>          
-
-  <span class="item-field-label-medium"><label>{{equip.system.quantity}}
-  </label>
-  </span>          
+  </span>
 
   {{#if equip.system.hasroll}}          
   <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.roll}}-</a></span>

templates/partials/partial-actor-full-charac.hbs

@@ -17,4 +17,10 @@
 
   <input type="text" class="item-field-label-long2" name="system.characteristics.{{key}}.notes" value="{{charac.notes}}" data-dtype="String"/>  
 
+  {{#if charac.lift}}
+    <h4 class="item-field-label-short margin-item-list">&nbsp;&nbsp;</h4>
+    <h4 class="item-field-label-short margin-item-list">{{charac.lift}}</h4>
+    <h4 class="item-field-label-short margin-item-list"><a class="roll-lift-dice" data-charac-key="{{key}}"><i class="fas fa-dice"></i>{{charac.liftDice}}</a></h4>
+  {{/if}}
+
 </li>

templates/partials/partial-item-description.hbs

@@ -3,16 +3,18 @@
     <label class="item-field-label-medium">Display name</label>
     <input type="text" class="" name="system.displayname" value="{{system.displayname}}" data-dtype="string"/>
   </div>
-  <div>
-    <label class="generic-label">Description</label>
-    <div class="medium-editor item-text-long-line">
-    {{editor description target="system.description" button=true owner=owner editable=editable}}
-    </div>
-  </div>
+  
   <div>
     <label class="generic-label">Notes</label>
     <div class="medium-editor item-text-long-line">
     {{editor notes target="system.notes" button=true owner=owner editable=editable}}
     </div>
   </div>
+  
+  <div>
+    <label class="generic-label">Description</label>
+    <div class="medium-editor item-text-long-line">
+    {{editor description target="system.description" button=true owner=owner editable=editable}}
+    </div>
+  </div>
 </div>

templates/partials/partial-item-hasroll.hbs

@@ -7,7 +7,8 @@
           <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
         </li>
 
-        <li class="flexrow"><label class="item-field-label-long">Computes BODY ?</label>
+        <!-- <li class="flexrow"><label class="item-field-label-long">Computes BODY ?</label>
           <label class="item-field-label-medium"><input type="checkbox" name="system.computebody" {{checked system.computebody}}/></label>
-        </li>
+        </li> -->
+        
         {{/if}}