Some fixes

modules/hero6-actor-sheet.js

@@ -39,16 +39,14 @@ export class Hero6ActorSheet extends ActorSheet {
       limited: this.object.limited,
       skills: this.actor.getSkills( ),
       perks: this.actor.getPerks( ),
-      powers: this.actor.getPowers( ),
+      powers: await this.actor.getPowers( ),
       talents: this.actor.getTalents( ),
       complications: this.actor.getComplications( ),
+      martialarts: this.actor.getMartialArts( ),
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
       armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
       shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
       equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
-      equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ),
-      equippedArmor: this.actor.getEquippedArmor(),
-      equippedShield: this.actor.getEquippedShield(),
       subActors: duplicate(this.actor.getSubActors()),
       race: duplicate(this.actor.getRace()),
       moneys: duplicate(this.actor.getMoneys()),

modules/hero6-actor.js

@@ -43,8 +43,8 @@ export class Hero6Actor extends Actor {
     }
 
     if (data.type == 'character') {
-      const skills = await Hero6Utility.loadCompendium("fvtt-hero-system-6.skills");
+      //const skills = await Hero6Utility.loadCompendium("fvtt-hero-system-6.skills");
-      data.items = skills.map(i => i.toObject())
+      //data.items = skills.map(i => i.toObject())
     }
     if (data.type == 'npc') {
     }
@@ -175,8 +175,11 @@ export class Hero6Actor extends Actor {
     Hero6Utility.sortArrayObjectsByName(comp)
     return comp
   }
-  getPowers() {
+  async getPowers() {
     let comp = duplicate(this.items.filter(item => item.type == 'power') || [])
+    for(let c of comp) {
+      c.enrichDescription = c.name + "<br>" + await TextEditor.enrichHTML(c.system.description, {async: true})
+    }
     Hero6Utility.sortArrayObjectsByName(comp)
     return comp
   }
@@ -185,6 +188,11 @@ export class Hero6Actor extends Actor {
     Hero6Utility.sortArrayObjectsByName(comp)
     return comp
   }
+  getMartialArts() {
+    let comp = duplicate(this.items.filter(item => item.type == 'martialart') || [])
+    Hero6Utility.sortArrayObjectsByName(comp)
+    return comp
+  }  
   getComplications() {
     let comp = duplicate(this.items.filter(item => item.type == 'complication') || [])
     Hero6Utility.sortArrayObjectsByName(comp)
@@ -227,11 +235,20 @@ export class Hero6Actor extends Actor {
 
   /* ------------------------------------------- */
   getEquipments() {
-    return this.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment");
+  }
+  getWeapons() {
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
+  }
+  getArmors() {
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "armor");
+  }
+  getShields() {
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "shield");
   }
   /* ------------------------------------------- */
   getEquipmentsOnly() {
-    return duplicate(this.items.filter(item => item.type == "equipment") || [])
+    return duplicate(this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment") || [])
   }
 
   /* ------------------------------------------- */

modules/hero6-config.js

@@ -1,6 +1,11 @@
 
 export const Hero6_CONFIG = {
-
+  equipmentSubType: {
+    equipment: "Equipment",
+    weapon: "Weapon",
+    armor: "Armor",
+    shield: "Shield"
+  },
   rollCharac  : {
     "str": "Strength",
     "dex": "Dexterity",

modules/hero6-item-sheet.js

@@ -145,6 +145,16 @@ export class Hero6ItemSheet extends ItemSheet {
       let itemType = li.data("item-type");
     });
 
+    html.find('.item-skill-profiency').click(ev => {
+      this.object.update( {'system.levels': 12, 'system.cost': 2} )
+    } )
+    html.find('.item-skill-familiarity').click(ev => {
+      this.object.update( {'system.levels': 10, 'system.cost': 1} )
+    } )
+    html.find('.item-skill-everyman').click(ev => {
+      this.object.update( {'system.levels': 8, 'system.cost': 0} )
+    } )
+
     html.find('.view-subitem').click(ev => {
       this.viewSubitem(ev);
     });

modules/hero6-utility.js

@@ -52,7 +52,6 @@ export class Hero6Utility {
       return false
     })    
 
-
     this.gameSettings()
 
   }
@@ -163,6 +162,8 @@ export class Hero6Utility {
       'systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs'
     ]
     return loadTemplates(templatePaths);
   }

styles/simple.css

@@ -51,7 +51,7 @@
   background: rgba(66, 66, 64, 0.95);  
 } /* For title, sidebar character and scene */
 .sheet nav.sheet-tabs {
-  font-size: 0.8rem;
+  font-size: 0.7rem;
   color: rgba(224, 208, 197, 0.9);
   background: rgba(66, 66, 64, 0.95);
 } /* For nav and title */
@@ -466,7 +466,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 .sheet nav.sheet-tabs {
   font-size: 0.70rem;
   font-weight: bold;
-  height: 3rem;
+  height: 2.5rem;
   flex: 0 0 3rem;
   margin: 0;
   padding: 0 0 0 0.25rem;
@@ -483,7 +483,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 
 nav.sheet-tabs .item {
   position: relative;
-  padding: 0 0.25rem;
+  padding: 0 0.15rem;
 }
 
 nav.sheet-tabs .item:after {
@@ -1425,6 +1425,11 @@ Focus FOC: #ff0084
   max-width: 16rem;
   min-width: 16rem;
 }
+.item-field-label-long4 {
+  flex-grow:1;
+  max-width: 40rem;
+  min-width: 40rem;
+}
 .item-control-end {
   align-self: flex-end;
 }

system.json

@@ -91,7 +91,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.10",
+  "version": "10.0.13",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
@@ -99,7 +99,7 @@
   },
   "title": "Hero System v6 for FoundrtVTT (Official)",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.10.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.13.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/hro6_welcome_page.webp",
   "id": "fvtt-hero-system-6"

template.json

@@ -14,6 +14,7 @@
           "gm": "",
           "gender": 0,
           "character": "",
+          "mass":"",
           "religion": "",
           "weight": "",
           "height": "",
@@ -204,6 +205,7 @@
       "talent",
       "power",
       "advantage",
+      "martialart",
       "limitation",
       "complication",
       "equipment"
@@ -252,6 +254,10 @@
       "base": "",
       "levelscost": 0,
       "levels": 0,
+      "skilllevelonly": false,
+      "skillfamiliarity": false,
+      "skilleveryman": false,
+      "skillprofiency": false,
       "templates": [
         "common"
       ]
@@ -267,6 +273,7 @@
         "common",
         "power"
       ],
+      "subtype": "equipment",
       "value": 0,
       "weight": 0,
       "moneycost": 0

templates/actors/actor-sheet.hbs

@@ -9,19 +9,57 @@
           <h1 class="charname margin-image-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
           
           <div class="flexrow">
-            <div class="charac-item">
+            <ul class="item-list alternate-list">
-              <ul>
+              <li class="item flexrow">
-                {{#each characteristics as |charac key|}}
+                <label class="generic-label">Alternate IDs</label>
-                  {{#if (eq charac.category "main")}}
+                <input type="text" class="" name="system.biodata.alternateids" value="{{system.biodata.origin}}"
-                    {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-characteristic-block.hbs charac=charac key=key}}
+                  data-dtype="String" />
-                  {{/if}}
+              </li>
-                {{/each}}
+            </ul>
+
+            <div class="grid grid-2col">
+            <div>
+            <li class="flexrow item">
+              <label class="generic-label">Campaign name</label>
+              <input type="text" class="" name="system.biodata.campaign" value="{{system.biodata.campaign}}" data-dtype="String" />
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">Gender</label>
+              <input type="text" class="" name="system.biodata.gender" value="{{system.biodata.gender}}" data-dtype="String" />
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">Player</label>
+              <input type="text" class="" name="system.biodata.player" value="{{system.biodata.player}}"
+                data-dtype="String" />
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">GM</label>
+              <input type="text" class="" name="system.biodata.gm" value="{{system.biodata.gm}}"
+                data-dtype="String" />
+            </li>
+          </ul>
+        </div>
+       <div>
+          <ul>
+            <li class="item flexrow">
+              <label class="generic-label">Height</label>
+              <input type="text" class="" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Mass</label>
+              <input type="text" class="" name="system.biodata.mass" value="{{system.biodata.mass}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Eyes</label>
+              <input type="text" class="" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Hair</label>
+              <input type="text" class="" name="system.biodata.hair" value="{{system.biodata.hair}}" data-dtype="String" />
+            </li>
           </ul>
         </div>
-
-            <div class="charac-item">
             </div>
-
           </div>
         </div>
       </div>
@@ -30,17 +68,17 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="combat">Combat</a>
+    <a class="" data-tab="combat">Combat</a>
-    <a class="item" data-tab="biodata">Background</a>
+    <a class="" data-tab="biodata">Background</a>
-    <a class="item" data-tab="char">Char</a>
+    <a class="" data-tab="char">Characteristics</a>
-    <a class="item" data-tab="skills">Skills</a>
+    <a class="" data-tab="skills">Skills</a>
-    <a class="item" data-tab="perks">Perks</a>
+    <a class="" data-tab="perks">Perks</a>
-    <a class="item" data-tab="talents">Talents</a>
+    <a class="" data-tab="talents">Talents</a>
-    <a class="item" data-tab="martial">Martial Arts</a>
+    <a class="" data-tab="martial">Martial Arts</a>
-    <a class="item" data-tab="powers">Powers</a>
+    <a class="" data-tab="powers">Powers</a>
-    <a class="item" data-tab="complications">Complications</a>
+    <a class="" data-tab="complications">Complications</a>
-    <a class="item" data-tab="equipment">Equipment</a>
+    <a class="" data-tab="equipment">Equipment</a>
-    <a class="item" data-tab="notes">Notes</a>
+    <a class="" data-tab="notes">Notes</a>
   </nav>
 
   {{!-- Sheet Body --}}
@@ -127,11 +165,11 @@
       <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>
+            <h3><label class="item-field-label-short">Value</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Label</label>
           </span>
           <span class="item-field-label-short">
             <label class="short-label">Base</label>
@@ -143,7 +181,6 @@
             <label class="short-label">Notes</label>
           </span>
           <div class="item-filler">&nbsp;</div>
-
         </li>
 
           {{#each characteristics as |charac key|}}
@@ -260,13 +297,13 @@
             <label class="short-label">Roll</label>
           </span>
         </li>
-        {{#each talents as |talent key|}}
+        {{#each martialarts as |martial key|}}
-        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{talent._id}}">
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{martial._id}}">
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{talent.img}}" /></a>
+              src="{{martial.img}}" /></a>
-          <span class="item-name-label"><a class="roll-item" data-type="talent">{{talent.name}}</a></span>
+          <span class="item-name-label"><a class="roll-item" data-type="talent">{{martial.name}}</a></span>
-          {{#if talent.system.hasroll}}          
+          {{#if martial.system.hasroll}}          
-          <span class="item-field-label-short">{{talent.system.roll}}-</span>
+          <span class="item-field-label-short">{{martial.system.roll}}-</span>
           {{else}}
           <span class="item-field-label-short">&nbsp;</span>
           {{/if}}
@@ -284,23 +321,33 @@
 
       <ul class="stat-list alternate-list item-list">
         <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
+          <span class="item-name-img sheet-competence-img">&nbsp;</span>
-            <h3><label class="items-title-text">Powers</label></h3>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">Cost</label>
+          </span>
+          <span class="item-field-label-long4">
+            <label class="item-field-label-long4">Power</label>
           </span>
           <span class="item-field-label-short">
-            <label class="short-label">Roll</label>
+            <label class="item-field-label-short">Roll</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">END</label>
           </span>
         </li>
         {{#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>
-          <span class="item-name-label">{{power.name}}</span>
+          <span class="item-field-label-short">{{power.system.cost}}</span>
+          <span class="item-field-label-long4">{{{power.enrichDescription}}}
+          </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}}
+          <span class="item-field-label-medium">{{power.system.endurance}}</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>
@@ -399,127 +446,13 @@
         {{/each}}
       </ul>
 
-      <ul class="item-list alternate-list">
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" items=weapons}}
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Weapons</label></h3>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Attack</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Damage</label>
-          </span>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each weapons as |weapon key|}}
-        <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{weapon.img}}" /></a>
-          <span class="item-name-label">{{weapon.name}}</span>
-          <span class="item-field-label-short"><label>{{upper weapon.system.ability}}</label></span>
-          <span class="item-field-label-short"><label>{{upper weapon.system.damage}}</label></span>
 
-          <div class="item-filler">&nbsp;</div>
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Armor" items=armors}}
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-      </ul>
 
-      <ul class="item-list alternate-list">
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Shields" items=shields}}
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Armors</label></h3>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Type</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Absorption</label>
-          </span>
 
-          <div class="item-filler">&nbsp;</div>
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Equipment" items=equipments}}
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="armor" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each armors as |armor key|}}
-        <li class="item list-item flexrow list-item-shadow" data-item-id="{{armor._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{armor.img}}" /></a>
-          <span class="item-name-label">{{armor.name}}</span>
-          <span class="item-field-label-short">{{upper armor.system.armortype}}</span>
-          <span class="item-field-label-short">{{armor.system.absorprionroll}}</span>
-
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if armor.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-      </ul>
-
-      <ul class="item-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Shields</label></h3>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Dice</label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="shield" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each shields as |shield key|}}
-        <li class="item flexrow list-item list-item-shadow" data-item-id="{{shield._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{shield.img}}" /></a>
-          <span class="item-name-label">{{shield.name}}</span>
-          <span class="item-field-label-short">{{shield.system.levelDice}}</span>
-
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if shield.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-      </ul>
-
-      <ul class="item-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Equipment</label></h3>
-          </span>
-          <span class="item-field-label-long">
-            <label class="short-label">Quantity</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>
-
-        </li>
-        {{#each containersTree as |equip key|}}
-        {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
-        <ul class="item-list list-item-shadow2 list-item-margin1">
-          {{#each equip.data.contents as |subgear key|}}
-          {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=subgear level=2}}
-          {{/each}}
-        </ul>
-        {{/each}}
-      </ul>
 
       <hr>
 
@@ -527,56 +460,6 @@
 
     {{!-- Biography Tab --}}
     <div class="tab biodata" data-group="primary" data-tab="biodata">
-      <div class="grid grid-2col">
-        <div>
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <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">
-              <label class="generic-label">Age</label>
-              <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Height</label>
-              <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Hair</label>
-              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
-            </li>
-          </ul>
-        </div>
-       <div>
-          <ul>
-            <li class="flexrow item">
-              <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">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">Player</label>
-              <input type="text" class="" name="system.biodata.player" value="{{data.biodata.player}}"
-                data-dtype="String" />
-            </li>
-            <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>
-
       <h3>Background/History : </h3>
       <div class="form-group editor">
         {{editor description target="system.biodata.description" button=true owner=owner

templates/apps/roll-dialog-generic.hbs

@@ -23,7 +23,7 @@
     {{/if}}
 
     <div class="flexrow">
-      <span class="item-field-label-long margin-item-list">Bonus/Malus : </span>
+      <span class="item-field-label-long margin-item-list">Bonus/Penalty : </span>
       <select class="item-field-label-medium" type="text" id="bonusMalus" value="{{bonusMalus}}" data-dtype="Number" >
         {{#select bonusMalus}}
         <option value="-10">-10</option>

templates/chat/chat-generic-result.hbs

@@ -29,7 +29,7 @@
         <li>{{item.name}} ({{upperFirst item.type}})</li>
         {{/if}}
 
-        <li>Bonus/Malus : {{bonusMalus}}
+        <li>Bonus/Penalty : {{bonusMalus}}
         </li>
 
         <li><strong>Result : {{result}}</strong>  ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})</li>

templates/items/item-equipment-sheet.hbs

@@ -18,6 +18,16 @@
 
         {{> 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>
         </li>

templates/items/item-martialart-sheet.hbs

@@ -0,0 +1,23 @@
+<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>
+    </header>
+
+    {{> systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+        
+      </div>
+    </section>
+</form>

templates/items/item-skill-sheet.hbs

@@ -46,6 +46,29 @@
               <input type="text" class="item-field-label-medium" name="system.levels" value="{{system.levels}}" data-dtype="Number"/>
             </li>
 
+            <li class="flexrow"><label class="item-field-label-long">Skill levels only</label>
+              <input type="checkbox" class="item-field-label-medium" name="system.skilllevelonly"  {{checked system.skilllevelonly}} 
+                {{#if (or system.skillfamiliarity system.skillprofiency)}}disabled{{/if}} 
+                data-dtype="Number"/>
+            </li>
+
+            <li class="flexrow"><label class="item-field-label-long">Familiarity only</label>
+              <input type="checkbox" class="item-field-label-medium item-skill-familiarity" name="system.skillfamiliarity" {{checked system.skillfamiliarity}} 
+                {{#if (or system.skillprofiency system.skilllevelonly)}}disabled{{/if}}                 
+                data-dtype="Number"/>
+            </li>
+              {{#if system.skillfamiliarity}}
+              <li class="flexrow"><label class="item-field-label-long">Everyman skill</label>
+                <input type="checkbox" class="item-field-label-medium item-skill-everyman" name="system.skilleveryman" {{checked system.skilleveryman}} data-dtype="Number"/>
+              </li>
+              {{/if}}
+
+            <li class="flexrow"><label class="item-field-label-long">Proficency</label>
+              <input type="checkbox" class="item-field-label-medium item-skill-profiency" name="system.skillprofiency" {{checked system.skillprofiency}}  
+                {{#if (or system.skillfamiliarity system.skilllevelonly)}}disabled{{/if}}                                 
+                data-dtype="Number"/>
+            </li>
+
             {{#if (ne system.skilltype "combat")}}
               <li class="flexrow"><label class="item-field-label-long">Levels Cost</label>
                 <input type="text" class="item-field-label-medium" name="system.levelscost" value="{{system.levelscost}}" data-dtype="Number"/>

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

@@ -0,0 +1,32 @@
+      <ul class="item-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">{{title}}</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Value</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>
+          <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>
+          <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>
+
+        </li>
+        <ul class="item-list list-item-shadow2">
+          {{#each items as |equip key|}}
+            {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs equip=equip}}
+          {{/each}}
+        </ul>
+      </ul>

templates/partials/partial-actor-equipment.hbs

@@ -1,37 +1,31 @@
 <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>
-  {{#if (eq level 1)}}
   <span class="item-name-label">{{equip.name}}</span>
-  {{else}}
-  <span class="item-name-label-level2">{{equip.name}}</span>
-  {{/if}}
 
-  <span class="item-field-label-long"><label>
+  <span class="item-field-label-medium"><label>{{equip.system.value}}
-    {{equip.system.quantity}}
-    (<a class="quantity-minus plus-minus-button">&nbsp;-</a>/<a class="quantity-plus plus-minus-button">+</a>)
   </label>
   </span>          
 
-  <span class="item-field-label-medium">
+  <span class="item-field-label-medium"><label>{{equip.system.weight}}
-    &nbsp;-&nbsp;
+  </label>
   </span>          
-  <span class="item-field-label-short">
+
-    {{#if equip.system.iscontainer}}
+  <span class="item-field-label-medium"><label>{{equip.system.quantity}}
-      {{equip.system.contentsEnc}}
+  </label>
+  </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>
   {{else}}
-      {{mul equip.system.weight equip.system.quantity}}
+  <span class="item-field-label-short">&nbsp;</span>
   {{/if}}
-  </span>
+
-  <span class="item-field-label-medium">
+  <span class="item-field-label-medium"><label>{{equip.system.endurance}}
-    &nbsp;-&nbsp;
+  </label>
   </span>          
 
   <div class="item-filler">&nbsp;</div>
   <div class="item-controls item-controls-fixed">
-    {{#if (eq level 1)}}
-    <a class="item-control item-equip" title="Worn">{{#if equip.system.equipped}}<i
-        class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-    {{/if}}
     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
   </div>
 </li>

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

@@ -1,13 +1,16 @@
-<li class="item flexrow list-item" data-attr-key="{{key}}">
+
+<li class="item stat flexrow list-item list-item-shadow" data-attr-key="{{key}}">
+
+  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  
+
   <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"/>  
+  <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>
-  {{/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>