Various/changes from 30th may requestsé

templates/actors/actor-sheet.hbs

@@ -125,11 +125,22 @@
               <label class="item-field-label-medium">STR Dice</label>
               <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" disabled data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
               <label class="item-field-label-short">&nbsp;</label>
+            </li>
+            <li class="item">
               <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" />
+              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.strend" disabled value="{{characteristics.str.strend}}" data-dtype="Number" />
+              <select class="actor-computer-str-end" name="system.characteristics.str.strendmode" value="{{system.characteristics.str.strendmode}}">
+                {{#select system.characteristics.str.strendmode}}
+                  <option value="str20">STR/20 (half normal)</option>
+                  <option value="str10">STR/10 (normal, half heroic)</option>
+                  <option value="str5">STR/5 (heroic)</option>
+                  <option value="0">0</option>
+                {{/select}}
+              </select> 
             </li>
             <li class="flexrow item">
               <label class="item-field-label-long">Presence attack</label>
@@ -220,10 +231,10 @@
                   <label class="">Defenses</label>
                 </span>
                 <span class="item-field-label-short">
-                  <label class="short-label">Val</label>
+                  <label class="short-label">Normal</label>
                 </span>
                 <span class="item-field-label-short">
-                  <label class="short-label">Res</label>
+                  <label class="short-label">Resistant</label>
                 </span>
                 </li>
                 {{#each characteristics as |char key|}} 
@@ -286,7 +297,9 @@
                 </span>
                 </li>
                   <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
-                    <span class="item-field-label-long">Perception Roll</span>
+                    <span class="item-field-label-long">
+                      <a class="roll-perception"><i class="fas fa-dice"></i>Perception Roll</a>
+                    </span>
                     <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.int.perceptionroll" value="{{characteristics.int.perceptionroll}}" data-dtype="Number" />
                   </li>
               </ul>
@@ -514,11 +527,11 @@
           <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 class="item-field-label-long3">
+            <label class="item-field-label-long3">Name</label>
           </span>
-          <span class="item-field-label-long4">
-            <label class="item-field-label-long4">Display</label>
+          <span class="item-field-label-long2">
+            <label class="item-field-label-long2">Display</label>
           </span>
           <span class="item-field-label-medium">
             <label class="item-field-label-medium">Effect</label>
@@ -535,8 +548,8 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{power.img}}" /></a>              
           <span class="item-field-label-short">{{power.system.cost}}</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-long3">{{power.name}}</span>
+          <span class="item-field-label-long2">{{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>
@@ -651,31 +664,31 @@
     {{!-- Notes Tab --}}
     <div class="tab notes" data-group="primary" data-tab="notes">
       <h3>Notes 1 : </h3>
-      <div class="form-group editor">
+      <div class="medium-editor ">
         {{editor notes1 target="system.biodata.notes1" button=true owner=owner
         editable=editable}}
       </div>      
       <hr>
       <h3>Notes 2 : </h3>
-      <div class="form-group editor">
+      <div class="small-editor">
         {{editor notes2 target="system.biodata.notes2" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
       <h3>Notes 3 : </h3>
-      <div class="form-group editor">
+      <div class="small-editor">
         {{editor notes3 target="system.biodata.notes3" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
       <h3>Notes 4 : </h3>
-      <div class="form-group editor">
+      <div class="small-editor">
         {{editor notes4 target="system.biodata.notes4" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
       <h3>Notes 5 : </h3>
-      <div class="form-group editor">
+      <div class="small-editor">
         {{editor notes5 target="system.biodata.notes5" button=true owner=owner
         editable=editable}}
       </div>

templates/apps/roll-dialog-generic.hbs

@@ -9,10 +9,10 @@
   <div class="flexcol">
 
     {{#if charac}}    
-    <div class="flexrow">
-      <span class="item-field-label-long margin-item-list">Characteristic : </span>
-      <span class="item-field-label-medium margin-item-list">{{charac.roll}}-</span>
-    </div>
+      <div class="flexrow">
+        <span class="item-field-label-long margin-item-list">{{#if isPerception}}Perception{{else}}Characteristic{{/if}} : </span>
+        <span class="item-field-label-medium margin-item-list">{{charac.roll}}-</span>
+      </div>
     {{/if}}
 
     {{#if item}}    

templates/chat/chat-hr-roll.hbs

@@ -0,0 +1,3 @@
+<div>
+  BODY : {{bodyValue}}
+</div>

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

@@ -19,6 +19,7 @@
     <div>
       <ul>
         <li>Lift dice formula : {{diceFormula}}</li>
+        <li>BODY : {{bodyValue}}</li>
 
         <li><strong>Result : {{result}}</strong></li>
         

templates/items/item-equipment-sheet.hbs

@@ -1,9 +1,9 @@
 <form class="{{cssClass}}" autocomplete="off">
   <header class="sheet-header">
-      <img class="item-sheet-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>
+    <img class="item-sheet-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>
 
   {{> systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs}}
@@ -16,33 +16,54 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
 
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
-
-      <li class="flexrow"><label class="item-field-label-long">Subtype</label>
-        <select class="item-field-label-long" type="text" name="system.subtype" value="{{system.subtype}}" data-dtype="String">
-          {{#select system.subtype}}
-            {{#each config.equipmentSubType as |name key|}}
-              <option value="{{key}}">{{name}}</option>
-            {{/each}}
-          {{/select}}
-        </select> 
-      </li>
-
         <li class="flexrow"><label class="item-field-label-long">Equipped ?</label>
-          <label class="item-field-label-medium"><input type="checkbox" name="system.equipped" {{checked system.equipped}}/></label>
+          <label class="item-field-label-medium"><input type="checkbox" name="system.equipped" {{checked
+              system.equipped}} /></label>
+        </li>
+
+        <li class="flexrow"><label class="item-field-label-long">Quantity</label>
+          <input type="text" class="item-field-label-short" name="system.quantity" value="{{system.quantity}}"
+            data-dtype="Number" />
+        </li>
+
+        <li class="flexrow">
+          <label class="item-field-label-long">Value</label>
+          <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.value"
+            value="{{system.value}}" data-dtype="Number" />
+          &nbsp;
+          <label class="item-field-label-long">Total Value</label>
+          <label class="item-field-label-long">{{mul system.value system.quantity}}</label>
         </li>
 
         <li class="flexrow"><label class="item-field-label-long">Weight</label>
-          <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.weight" value="{{system.weight}}" data-dtype="Number"/>
+          <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.weight"
+            value="{{system.weight}}" data-dtype="Number" />
+          &nbsp;
+          <label class="item-field-label-long">Total Weight</label>
+          <label class="item-field-label-long">{{mul system.weight system.quantity}}</label>
         </li>
-        <li class="flexrow"><label class="item-field-label-long">Value</label>
-          <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.value" value="{{system.value}}" data-dtype="Number"/>
+
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs quantityDone=1}}
+
+        <li class="flexrow"><label class="item-field-label-long">Subtype</label>
+          <select class="item-field-label-long" type="text" name="system.subtype" value="{{system.subtype}}"
+            data-dtype="String">
+            {{#select system.subtype}}
+            {{#each config.equipmentSubType as |name key|}}
+            <option value="{{key}}">{{name}}</option>
+            {{/each}}
+            {{/select}}
+          </select>
         </li>
 
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+
+
+
         {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
 
       </ul>
     </div>
 
   </section>
-</form>
+</form>

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

@@ -3,10 +3,10 @@
           <span class="item-name-img">
             <label class="">&nbsp;</label>
           </span>
-          <span class="item-field-label-long-img">
-            <label class="">{{title}}</label>
+          <span class="item-field-label-long3">
+            <label class="item-field-label-long3">{{title}}</label>
           </span>
-          <span class="item-field-label-long4">
+          <span class="item-field-label-long">
             <label class="item-field-label-long4">Display</label>
           </span>
           <span class="item-field-label-short">
@@ -15,9 +15,16 @@
           <span class="item-field-label-short">
             <label class="item-field-label-short">Roll</label>
           </span>
-          <span class="item-field-label-medium">
-            <label class="item-field-label-medium">END</label>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">END</label>
           </span>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">Value</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">Weight</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

@@ -1,8 +1,8 @@
 <li class="item flexrow list-item list-item-shadow" data-item-id="{{equip._id}}">
   <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-long3">{{equip.name}}</span>
 
-  <span class="item-field-label-long4"><label>{{equip.system.displayname}}
+  <span class="item-field-label-long"><label>{{equip.system.displayname}}
   </label>
   </span>          
 
@@ -16,9 +16,11 @@
   <span class="item-field-label-short">&nbsp;</span>
   {{/if}}
 
-  <span class="item-field-label-medium"><label>{{equip.system.endurance}}
-  </label>
-  </span>          
+  <span class="item-field-label-short"><label>{{equip.system.endurance}}</label>  </span>          
+
+  <span class="item-field-label-short"><label>{{equip.system.value}}</label>  </span>          
+
+  <span class="item-field-label-short"><label>{{equip.system.weight}}</label>  </span>          
 
   <div class="item-filler">&nbsp;</div>
   <div class="item-controls item-controls-fixed">

templates/partials/partial-item-description.hbs

@@ -6,7 +6,7 @@
   
   <div>
     <label class="generic-label">Notes</label>
-    <div class="medium-editor item-text-long-line">
+    <div class="small-editor item-text-long-line">
     {{editor notes target="system.notes" button=true owner=owner editable=editable}}
     </div>
   </div>

templates/partials/partial-power-equipment-cost.hbs

@@ -31,6 +31,9 @@
       <li class="flexrow"><label class="item-field-label-long">Endurance</label>
         <input type="text" class="item-field-label-short" name="system.endurance" value="{{system.endurance}}" data-dtype="Number"/>
       </li>
+      {{#if quantityDone}}
+      {{else}}
       <li class="flexrow"><label class="item-field-label-long">Quantity</label>
         <input type="text" class="item-field-label-short" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
       </li>
+      {{/if}}