Enhance sheets

templates/actors/actor-sheet.hbs

@@ -30,21 +30,22 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="main">Main</a>
     <a class="item" data-tab="combat">Combat</a>
+    <a class="item" data-tab="biodata">Background</a>
+    <a class="item" data-tab="char">Char</a>
     <a class="item" data-tab="skills">Skills</a>
-    <a class="item" data-tab="powers">Powers/Perks</a>
+    <a class="item" data-tab="perks">Perks</a>
+    <a class="item" data-tab="talents">Talents</a>
+    <a class="item" data-tab="martial">Martial Arts</a>
+    <a class="item" data-tab="powers">Powers</a>
+    <a class="item" data-tab="complications">Complications</a>
     <a class="item" data-tab="equipment">Equipment</a>
-    <a class="item" data-tab="biodata">Biography</a>
+    <a class="item" data-tab="notes">Notes</a>
   </nav>
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
 
-    {{!-- Main Tab --}}
-    <div class="tab main" data-group="primary" data-tab="main">
-
-    </div>
 
     {{!-- Combat Tab --}}
     <div class="tab combat" data-group="primary" data-tab="combat">
@@ -117,30 +118,42 @@
           </ul>
         </div>
 
-        <div>
-          <ul class="stat-list alternate-list">
-            <li class="item flexrow list-item items-title-bg">
-              <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Conditions</label></h3>
-              </span>
-            </li>
-            {{#each conditions as |condition key|}}
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{condition._id}}">
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                  src="{{condition.img}}" /></a>
-              <span class="item-name-label-long">{{condition.name}}</span>
-              <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
-
       </div>
     </div>
 
+    {{!-- Char Tab --}}
+    <div class="tab char" data-group="primary" data-tab="char">
+
+      <div class="charac-item">
+        <ul>
+          <li class="item flexrow list-item items-title-bg">
+          <span class="items-title-medium">
+            <h3><label class="items-title-medium">CHAR</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Value</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Base</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Notes</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+
+        </li>
+
+          {{#each characteristics as |charac key|}}
+              {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-full-charac.hbs charac=charac key=key}}
+          {{/each}}
+        </ul>            
+      </div>
+
+    </div>
+
     {{!-- Skills Tab --}}
     <div class="tab skills" data-group="primary" data-tab="skills">
 
@@ -150,20 +163,20 @@
             <h3><label class="items-title-text">Skills</label></h3>
           </span>
           <span class="item-field-label-short">
-            <label class="short-label">Charac.</label>
+            <label class="short-label">CHAR</label>
           </span>
           <span class="item-field-label-short">
             <label class="short-label">Roll</label>
           </span>
+          <div class="item-filler">&nbsp;</div>
         </li>
         {{#each skills as |skill key|}}
         <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{skill._id}}">
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{skill.img}}" /></a>
-          <span class="item-name-label"><a class="roll-skill">{{skill.name}}</a></span>
+          <span class="item-name-label">{{skill.name}}</span>
           <span class="item-field-label-short">{{upper skill.system.characteristic}}</span>
-          <span class="item-field-label-short">{{skill.system.base}}</span>
-          <span class="item-field-label-long">&nbsp;-&nbsp;</span>
+          <span class="item-field-label-short"><a class="roll-item" data-type="skill"><i class="fas fa-dice"></i>{{skill.system.base}}-</a></span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -173,7 +186,100 @@
       </ul>
     </div>
 
-    {{!-- Skills Tab --}}
+    {{!-- Perks Tab --}}
+    <div class="tab perks" data-group="primary" data-tab="perks">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Perks</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each perks as |perk key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{perk._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{perk.img}}" /></a>
+          <span class="item-name-label">{{perk.name}}</span>
+          {{#if perk.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{perk.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Talents Tab --}}
+    <div class="tab talents" data-group="primary" data-tab="talents">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Talents</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each talents as |talent key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{talent._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{talent.img}}" /></a>
+          <span class="item-name-label">{{talent.name}}</span>
+          {{#if talent.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{talent.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Martial Tab --}}
+    <div class="tab martial" data-group="primary" data-tab="martial">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Martial Arts</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each talents as |talent key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{talent._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{talent.img}}" /></a>
+          <span class="item-name-label"><a class="roll-item" data-type="talent">{{talent.name}}</a></span>
+          {{#if talent.system.hasroll}}          
+          <span class="item-field-label-short">{{talent.system.roll}}-</span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Powers Tab --}}
     <div class="tab powers" data-group="primary" data-tab="powers">
 
       <ul class="stat-list alternate-list item-list">
@@ -181,9 +287,6 @@
           <span class="item-name-label-header">
             <h3><label class="items-title-text">Powers</label></h3>
           </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Charac</label>
-          </span>
           <span class="item-field-label-short">
             <label class="short-label">Roll</label>
           </span>
@@ -192,10 +295,43 @@
         <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>
-          <span class="item-name-label"><a class="roll-skill">{{power.name}}</a></span>
-          <span class="item-field-label-short">{{upper power.system.ability}}</span>
-          <span class="item-field-label-short">{{power.system.skilldice}}</span>
-          <span class="item-field-label-long">&nbsp;-&nbsp;</span>
+          <span class="item-name-label">{{power.name}}</span>
+          {{#if power.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{power.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Complications Tab --}}
+    <div class="tab complications" data-group="primary" data-tab="complications">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Complications</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each complications as |comp key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{comp._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{comp.img}}" /></a>
+          <span class="item-name-label">{{comp.name}}</span>
+          {{#if comp.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{comp.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -395,8 +531,8 @@
         <div>
           <ul class="item-list alternate-list">
             <li class="item flexrow">
-              <label class="generic-label">Origin</label>
-              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
+              <label class="generic-label">Alternate IDs</label>
+              <input type="text" class="" name="system.biodata.alternateids" value="{{data.biodata.origin}}"
                 data-dtype="String" />
             </li>
             <li class="item flexrow">
@@ -420,51 +556,96 @@
        <div>
           <ul>
             <li class="flexrow item">
-              <label class="generic-label">Size</label>
-              <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
-                {{#select data.biodata.size}}
-                <option value="1">Tiny</option>
-                <option value="2">Small</option>
-                <option value="3">Medium</option>
-                <option value="4">Large</option>
-                <option value="5">Huge</option>
-                <option value="6">Gargantuan</option>
-                {{/select}}
-              </select> 
+              <label class="generic-label">Campaign name</label>
+              <input type="text" class="" name="system.biodata.campaign" value="{{data.biodata.campaign}}" data-dtype="String" />
             </li>
             <li class="flexrow item">
-              <label class="generic-label">Sex</label>
-              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
+              <label class="generic-label">Gender</label>
+              <input type="text" class="" name="system.biodata.gender" value="{{data.biodata.gender}}" data-dtype="String" />
             </li>
             <li class="flexrow item">
-              <label class="generic-label">Preferred Hand</label>
-              <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
+              <label class="generic-label">Player</label>
+              <input type="text" class="" name="system.biodata.player" value="{{data.biodata.player}}"
                 data-dtype="String" />
             </li>
-            <li class="flexrow item" data-item-id="{{race._id}}">
-              <label class="generic-label">Race</label>
-              <a class="item-edit"><img class="stat-icon" src="{{race.img}}"></a>
-              <input type="text" class="" name="system.biodata.racename" value="{{data.biodata.racename}}" data-dtype="String" />
+            <li class="flexrow item">
+              <label class="generic-label">GM</label>
+              <input type="text" class="" name="system.biodata.gm" value="{{data.biodata.gm}}"
+                data-dtype="String" />
             </li>
           </ul>
         </div>
       </div>
 
-
-      <hr>
-      <h3>Background : </h3>
+      <h3>Background/History : </h3>
       <div class="form-group editor">
         {{editor description target="system.biodata.description" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
-      <h3>Notes : </h3>
+      <h3>Personality/Motivation : </h3>
       <div class="form-group editor">
-        {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
+        {{editor motivation target="system.biodata.motivation" button=true owner=owner
+        editable=editable}}
       </div>
       <hr>
-      </article>
+      <h3>Quote : </h3>
+      <div class="form-group editor">
+        {{editor quote target="system.biodata.quote" button=true owner=owner
+        editable=editable}}
+      </div>
+      <h3>Powers/Tactics : </h3>
+      <div class="form-group editor">
+        {{editor tactics target="system.biodata.tactics" button=true owner=owner
+        editable=editable}}
+      </div>
+      <h3>Campaign Use : </h3>
+      <div class="form-group editor">
+        {{editor campaignuse target="system.biodata.campaignuse" button=true owner=owner
+        editable=editable}}
+      </div>
+      <h3>Appearance : </h3>
+      <div class="form-group editor">
+        {{editor appearance target="system.biodata.appearance" button=true owner=owner
+        editable=editable}}
+      </div>
     </div>
 
+    {{!-- Notes Tab --}}
+    <div class="tab notes" data-group="primary" data-tab="notes">
+      <h3>Notes 1 : </h3>
+      <div class="form-group editor">
+        {{editor notes1 target="system.biodata.notes1" button=true owner=owner
+        editable=editable}}
+      </div>      
+      <hr>
+      <h3>Notes 2 : </h3>
+      <div class="form-group editor">
+        {{editor notes2 target="system.biodata.notes2" button=true owner=owner
+        editable=editable}}
+      </div>
+      <hr>
+      <h3>Notes 3 : </h3>
+      <div class="form-group editor">
+        {{editor notes3 target="system.biodata.notes3" button=true owner=owner
+        editable=editable}}
+      </div>
+      <hr>
+      <h3>Notes 4 : </h3>
+      <div class="form-group editor">
+        {{editor notes4 target="system.biodata.notes4" button=true owner=owner
+        editable=editable}}
+      </div>
+      <hr>
+      <h3>Notes 5 : </h3>
+      <div class="form-group editor">
+        {{editor notes5 target="system.biodata.notes5" button=true owner=owner
+        editable=editable}}
+      </div>
+
+    </div>
+
+  </div>
+
   </section>
 </form>

templates/apps/roll-dialog-generic.hbs

@@ -15,10 +15,23 @@
     </div>
     {{/if}}
 
+    {{#if item}}    
+    <div class="flexrow">
+      <span class="item-field-label-long margin-item-list">{{upperFirst item.type}} : </span>
+      <span class="item-field-label-medium margin-item-list">{{item.system.roll}}-</span>
+    </div>
+    {{/if}}
+
     <div class="flexrow">
       <span class="item-field-label-long margin-item-list">Bonus/Malus : </span>
       <select class="item-field-label-medium" type="text" id="bonusMalus" value="{{bonusMalus}}" data-dtype="Number" >
         {{#select bonusMalus}}
+        <option value="-10">-10</option>
+        <option value="-9">-9</option>
+        <option value="-8">-8</option>
+        <option value="-7">-7</option>
+        <option value="-6">-6</option>
+        <option value="-5">-5</option>
         <option value="-4">-4</option>
         <option value="-3">-3</option>
         <option value="-2">-2</option>
@@ -28,6 +41,12 @@
         <option value="2">2</option>
         <option value="3">3</option>
         <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
         {{/select}}
       </select>
     </div>

templates/chat/chat-generic-result.hbs

@@ -22,13 +22,20 @@
         </li>
 
         {{#if charac}}  
-        <li>Charac : {{charac.label}}
-        </li>
+        <li>CHAR : {{charac.label}}</li>
         {{/if}}
+
+        {{#if item}}  
+        <li>{{item.name}} ({{upperFirst item.type}})</li>
+        {{/if}}
+
         <li>Bonus/Malus : {{bonusMalus}}
         </li>
 
         <li><strong>Result : {{result}}</strong>  ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})</li>
+        {{#if isSuccess}}
+        <li><strong>Margin : {{margin}}</strong>
+        {{/if}}
 
       </ul>  
     </div>

templates/partials/partial-actor-characteristic-block.hbs

@@ -1,8 +1,9 @@
 <li class="item flexrow list-item" data-attr-key="{{key}}">
   <span class="item-field-label-medium" name="{{key}}">
-    <h4 class="item-field-label-medium margin-item-list"><a class="roll-charac" data-charac-key="{{key}}">{{charac.label}}</a></h4>
+    <h4 class="item-field-label-medium margin-item-list">{{charac.label}}</a></h4>
   </span>
-  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>
-  <h4 class="item-field-label-short margin-item-list">{{charac.total}}</h4>
-  <h4 class="item-field-label-short margin-item-list"><a class="roll-charac" data-charac-key="{{key}}">{{charac.roll}}-</a></h4>
+  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  
+  &nbsp;
+  <!-- <h4 class="item-field-label-short margin-item-list">{{charac.total}}</h4>-->
+  <h4 class="item-field-label-short margin-item-list"><a class="roll-charac" data-charac-key="{{key}}"><i class="fas fa-dice"></i>{{charac.roll}}-</a></h4>
 </li>

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

@@ -0,0 +1,13 @@
+<li class="item flexrow list-item" data-attr-key="{{key}}">
+  <span class="item-field-label-medium" name="{{key}}">
+    <h4 class="item-field-label-medium margin-item-list">{{charac.label}}</a></h4>
+  </span>
+  {{#if (eq charac.category "main")}}
+  <h4 class="item-field-label-short margin-item-list">{{charac.base}}</h4>
+  {{else}}
+  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  
+  {{/if}}
+  &nbsp;<h4 class="item-field-label-short margin-item-list">{{charac.base}}</h4>
+  <h4 class="item-field-label-short margin-item-list">{{charac.total}}</h4>
+  <input type="text" class="item-field-label-long2" name="system.characteristics.{{key}}.notes" value="{{charac.notes}}" data-dtype="String"/>  
+</li>