Combat tab

.gitignore

@@ -0,0 +1 @@
+.history/

lang/en.json

@@ -1,3 +1,18 @@
-{
+  {
-  
+    "ACTOR": {
-}
+      "TypeCharacter": "Character"
+    },
+    "ITEM": {
+      "TypeSkill": "Skill",
+      "TypePerk": "Perk",
+      "TypePower": "Power",
+      "TypeTalent": "Talent",
+      "TypeAdvantage": "Advantage",
+      "TypeMartialart": "Martial art",
+      "TypeLimitation": "Limitation",
+      "TypeComplication": "Complication",
+      "TypeEquipment": "Equipment",
+      "TypeCurrency": "Currency",
+      "TypeManeuver": "Maneuver"
+    }
+  }

modules/hero6-actor-sheet.js

@@ -14,8 +14,8 @@ export class Hero6ActorSheet extends ActorSheet {
     return mergeObject(super.defaultOptions, {
       classes: ["fvtt-hero-system-6", "sheet", "actor"],
       template: "systems/fvtt-hero-system-6/templates/actors/actor-sheet.hbs",
-      width: 960,
+      width: 1124,
-      height: 720,
+      height: 916,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "main" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
       editScore: true
@@ -36,21 +36,34 @@ export class Hero6ActorSheet extends ActorSheet {
       cssClass: this.isEditable ? "editable" : "locked",
       system: objectData,
       characteristics: this.actor.prepareCharac(),
+      defenses: duplicate(this.actor.system.defenses),
+      movements: duplicate(this.actor.system.movements),
       limited: this.object.limited,
       skills: this.actor.getSkills( ),
+      perks: this.actor.getPerks( ),
+      powers: await this.actor.getPowers( ),
+      talents: this.actor.getTalents( ),
+      complications: this.actor.getComplications( ),
+      martialarts: this.actor.getMartialArts( ),
+      maneuvers: this.actor.getManeuvers( ),
       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()) ),
+      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsMoneys()) ),
-      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()),
       encCapacity: this.actor.getEncumbranceCapacity(),
       description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
-      notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, {async: true}),
+      motivation: await TextEditor.enrichHTML(this.object.system.biodata.motivation, {async: true}),
+      quote: await TextEditor.enrichHTML(this.object.system.biodata.quote, {async: true}),
+      tactics: await TextEditor.enrichHTML(this.object.system.biodata.tactics, {async: true}),
+      campaignuse: await TextEditor.enrichHTML(this.object.system.biodata.campaignuse, {async: true}),
+      appearance: await TextEditor.enrichHTML(this.object.system.biodata.appearance, {async: true}),
+      notes1: await TextEditor.enrichHTML(this.object.system.biodata.notes1, {async: true}),
+      notes2: await TextEditor.enrichHTML(this.object.system.biodata.notes2, {async: true}),
+      notes3: await TextEditor.enrichHTML(this.object.system.biodata.notes3, {async: true}),
+      notes4: await TextEditor.enrichHTML(this.object.system.biodata.notes4, {async: true}),
+      notes5: await TextEditor.enrichHTML(this.object.system.biodata.notes5, {async: true}),
       containersTree: this.actor.containersTree,
       encCurrent: this.actor.encCurrent,
       options: this.options,
@@ -139,7 +152,18 @@ export class Hero6ActorSheet extends ActorSheet {
       const characKey = $(event.currentTarget).data("charac-key");
       this.actor.rollCharac(characKey);
     });
-
+    html.find('.roll-direct').click((event) => {
+      const rollFormula = $(event.currentTarget).data("roll-formula");
+      let roll = new Roll(rollFormula).roll({async: false})
+      roll.toMessage()
+    });
+    
+    html.find('.roll-item').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      let itemId = li.data("item-id")
+      this.actor.rollItem(itemId);
+    });
+    
     html.find('.roll-weapon').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const skillId = li.data("item-id")
@@ -163,7 +187,11 @@ export class Hero6ActorSheet extends ActorSheet {
 
     html.find('.update-field').change(ev => {
       const fieldName = $(ev.currentTarget).data("field-name");
-      let value = Number(ev.currentTarget.value);
+      const fieldType = $(ev.currentTarget).data("dtype");
+      let value = ev.currentTarget.value
+      if (fieldType.toLowerCase() == "Number") {
+        value = Number(value)
+      }
       this.actor.update( { [`${fieldName}`]: value } );
     });    
   }

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') {
     }
@@ -66,6 +66,10 @@ export class Hero6Actor extends Actor {
     if (this.type == "character") {
     }
   }
+  computeDicesValue() {
+    this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceValue(this.system.characteristics.pre.value )
+    this.system.characteristics.str.strdice = Hero6Utility.getDerivatedDiceValue(this.system.characteristics.str.value )
+  }
   /* -------------------------------------------- */
   prepareDerivedData() {
 
@@ -73,6 +77,7 @@ export class Hero6Actor extends Actor {
       this.system.encCapacity = this.getEncumbranceCapacity()
       this.buildContainerTree()
       this.computeHitPoints()
+      this.computeDicesValue()
     }
 
     super.prepareDerivedData();
@@ -91,7 +96,7 @@ export class Hero6Actor extends Actor {
 
   /* -------------------------------------------- */
   getMoneys() {
-    let comp = this.items.filter(item => item.type == 'money');
+    let comp = this.items.filter(item => item.type == 'currency');
     Hero6Utility.sortArrayObjectsByName(comp)
     return comp;
   }
@@ -163,10 +168,80 @@ export class Hero6Actor extends Actor {
     }
     return item;
   }
+  /* -------------------------------------------- */
+  prepareSkill(skill) {
+    skill.roll = 0
+    skill.charac = "N/A"
+    if (skill.system.skillfamiliarity) {
+      skill.roll = 8;
+    } else if (skill.system.skillprofiency) {
+      skill.roll = 10;
+    } else if (skill.system.skilltype == "agility") {
+      skill.charac = "DEX"
+      let charac = duplicate(this.system.characteristics.dex)
+      this.prepareCharacValues(charac)
+      skill.roll = charac.roll
+    } else if (skill.system.skilltype == "interaction") {
+      skill.charac = "PRE"
+      let charac = duplicate(this.system.characteristics.pre)
+      this.prepareCharacValues(charac)
+      skill.roll = charac.roll
+    } else if (skill.system.skilltype == "intellect") {
+      skill.charac = "INT"
+      let charac = duplicate(this.system.characteristics.int)
+      this.prepareCharacValues(charac)
+      skill.roll = charac.roll
+    } else if (skill.system.skilltype == "background") {
+      skill.roll = 11
+    } else if (skill.system.skilltype == "custom") {
+      if (skill.system.characteristic == "manual") {
+        skill.roll = skill.system.base
+      } else {
+        skill.charac = skill.system.characteristic
+        let charac = duplicate(this.system.characteristics[skill.system.characteristic])
+        this.prepareCharacValues(charac)
+        skill.roll = charac.roll
+      }
+    }
+    if (skill.system.levels > 0) {
+      skill.roll += skill.system.levels
+    }
+  }
 
   /* -------------------------------------------- */
   getSkills() {
     let comp = duplicate(this.items.filter(item => item.type == 'skill') || [])
+    for (let skill of comp) {
+      this.prepareSkill(skill)
+    }
+    Hero6Utility.sortArrayObjectsByName(comp)
+    return comp
+  }
+  getPerks() {
+    let comp = duplicate(this.items.filter(item => item.type == 'perk') || [])
+    Hero6Utility.sortArrayObjectsByName(comp)
+    return comp
+  }
+  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
+  }
+  getTalents() {
+    let comp = duplicate(this.items.filter(item => item.type == 'talent') || [])
+    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)
     return comp
   }
@@ -204,14 +279,31 @@ export class Hero6Actor extends Actor {
     }
     return 0;
   }
-
+  getManeuvers() {
-  /* ------------------------------------------- */
+    let maneuvers = { 
-  getEquipments() {
+      general: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "general"),
-    return this.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
+      offensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "offensive"),
+      defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive")
+    }
+    return maneuvers
+  }
+  getEquipments() {
+    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");
+  }
+  getEquipmentsMoneys() {
+    return duplicate(this.items.filter(item => item.type == "equipment" && (item.system.subtype == "equipment" || item.system.subtype == "money")) || [])
   }
-  /* ------------------------------------------- */
   getEquipmentsOnly() {
-    return duplicate(this.items.filter(item => item.type == "equipment") || [])
+    return duplicate(this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment") || [])
   }
 
   /* ------------------------------------------- */
@@ -259,7 +351,7 @@ export class Hero6Actor extends Actor {
 
   /* -------------------------------------------- */
   async incDecHP(formula) {
-    let dmgRoll = new Roll(formula+"[dark-starsorange]").roll({ async: false })
+    let dmgRoll = new Roll(formula + "[dark-starsorange]").roll({ async: false })
     await Hero6Utility.showDiceSoNice(dmgRoll, game.settings.get("core", "rollMode"))
     let hp = duplicate(this.system.secondary.hp)
     hp.value = Number(hp.value) + Number(dmgRoll.total)
@@ -340,14 +432,14 @@ export class Hero6Actor extends Actor {
   }
 
   /* -------------------------------------------- */
-  prepareCharacValues( charac) {
+  prepareCharacValues(charac) {
-    charac.total = charac.base+charac.value
+    charac.total = charac.value
-    charac.roll = 9 + Math.floor((charac.base+charac.value)/5)
+    charac.roll = 9 + Math.floor((charac.value) / 5)
   }
   prepareCharac() {
     let characs = duplicate(this.system.characteristics)
-    for(let key in characs) {
+    for (let key in characs) {
-      this.prepareCharacValues( characs[key])
+      this.prepareCharacValues(characs[key])
     }
     return characs
   }
@@ -444,6 +536,17 @@ export class Hero6Actor extends Actor {
     }
     this.startRoll(rollData)
   }
+  /* -------------------------------------------- */
+  rollItem(itemId) {
+    let item = this.items.get(itemId)
+    let rollData = this.getCommonRollData()
+    rollData.mode = "item"
+    rollData.item = duplicate(item)
+    if (item.type == "skill") {
+      this.prepareSkill(rollData.item)
+    }
+    this.startRoll(rollData)
+  }
 
   /* -------------------------------------------- */
   rollSkill(skillId) {

modules/hero6-config.js

@@ -1,6 +1,17 @@
 
 export const Hero6_CONFIG = {
-
+  equipmentSubType: {
+    equipment: "Equipment",
+    weapon: "Weapon",
+    armor: "Armor",
+    shield: "Shield",
+    money: "Money"
+  },
+  maneuverTypes: {
+    "general": "General",
+    "offensive": "Offensive",
+    "defensive": "Defensive"
+  },
   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-main.js

@@ -91,12 +91,6 @@ Hooks.once("ready", function () {
     });
   }
   
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
-
   welcomeMessage();
   Hero6Utility.ready()
   Hero6Commands.init()

modules/hero6-utility.js

@@ -46,12 +46,11 @@ export class Hero6Utility {
       return __locationNames[key]      
     })
     Handlebars.registerHelper('isSkillCustom', function (key) {
-      if (key == "custom" || key == "background"  ) {
+      if (key == "custom" ) {
         return true;
       }
       return false
-    })
+    })    
-    
 
     this.gameSettings()
 
@@ -77,6 +76,15 @@ export class Hero6Utility {
     })    */
   }
 
+
+  /*-------------------------------------------- */
+  static getDerivatedDiceValue(value) {
+    let dices = Math.floor(value/5) +"d6"
+    if ( value % 5 > 2) {
+      dices += "+1d3"
+    }
+    return dices
+  }
   /*-------------------------------------------- */
   static upperFirst(text) {
     if (typeof text !== 'string') return text
@@ -154,6 +162,7 @@ export class Hero6Utility {
       'systems/fvtt-hero-system-6/templates/partials/editor-notes-gm.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-roll-select.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-actor-characteristic-block.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-actor-full-charac.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-actor-status.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-options-abilities.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs',
@@ -162,6 +171,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);
   }
@@ -296,12 +307,16 @@ export class Hero6Utility {
     let actor = game.actors.get(rollData.actorId)
 
     // ability/save/size => 0
-    let diceFormula = "3d6+" + rollData.bonusMalus
+    let diceFormula = "3d6" 
     let target = 10
     if (rollData.charac) {
       target = rollData.charac.roll
     }
-
+    if (rollData.item) {
+      target = rollData.item.roll || rollData.item.system.roll
+    }
+    target += rollData.bonusMalus
+    
     // Performs roll
     console.log("Roll formula", diceFormula)
     let myRoll = rollData.roll
@@ -323,6 +338,7 @@ export class Hero6Utility {
     if ( myRoll.terms[0].total == 18) { // Always a failure
       rollData.isSuccess = false
     }
+    rollData.margin = target - rollData.result
 
     let msg = await this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-generic-result.hbs`, rollData)

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 */
@@ -173,19 +173,6 @@ table { border: 1px solid #7a7971;}
   grid-template-columns: repeat(12, minmax(0, 1fr));
 }
 
-.flex-group-center,
-.flex-group-left,
-.flex-group-right {
-  -webkit-box-pack: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  text-align: center;
-  padding: 5px;
-}
-
 .flex-group-left {
   -webkit-box-pack: start;
   -ms-flex-pack: start;
@@ -447,7 +434,7 @@ form .form-group label {
 
 .window-app .window-content, .window-app.sheet .window-content .sheet-body{
   font-size: 0.8rem;
-  background: url("../images/ui/pc_sheet_bg.webp") repeat left top;
+  /*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/
   background: rgba(228, 240, 240, 0.75);
   color: rgba(66, 66, 64, 0.95);
 }
@@ -466,7 +453,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 +470,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 {
@@ -546,7 +533,7 @@ ul, li {
 }
 
 .sheet li {
-  margin: 0.010rem;
+  margin: 0.1rem;
   padding: 0.25rem;
 }
 .header-fields li {
@@ -574,10 +561,10 @@ ul, li {
 }
 
 .list-item {
-  margin: 0.125rem;
+  margin: 0.2rem;
   /*box-shadow: inset 0px 0px 1px #00000096;*/
   /*border-radius: 0.25rem;*/
-  padding: 0.125rem;
+  padding: 0.2rem;
   flex: 1 1 5rem;
   display: flex !important;
 }
@@ -952,7 +939,7 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
-  width: 25px;
+  /*width: 25px;*/
   height: 25px;
   display: inline-block;
   background-position:center;
@@ -1420,6 +1407,26 @@ Focus FOC: #ff0084
   max-width: 8rem;
   min-width: 8rem;
 }
+.item-field-label-long-img {
+  flex-grow:1;
+  max-width: 10rem;
+  min-width: 10rem;
+}
+.item-field-label-long2 {
+  flex-grow:1;
+  max-width: 16rem;
+  min-width: 16rem;
+}
+.item-field-label-long3 {
+  flex-grow:1;
+  max-width: 30rem;
+  min-width: 30rem;
+}
+.item-field-label-long4 {
+  flex-grow:1;
+  max-width: 40rem;
+  min-width: 40rem;
+}
 .item-control-end {
   align-self: flex-end;
 }
@@ -1441,3 +1448,7 @@ Focus FOC: #ff0084
   min-width:2rem;
   max-width: 2rem;
 }
+.biodata-portrait {
+  min-height: 512px;
+  min-width: 256px;
+}

system.json

@@ -91,7 +91,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.9",
+  "version": "10.0.29",
   "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.9.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.29.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/hro6_welcome_page.webp",
   "id": "fvtt-hero-system-6"

template.json

@@ -8,14 +8,30 @@
         "biodata": {
           "species": "",
           "age": 0,
+          "campaign":"",
+          "alternateids":"",
+          "player": "",
+          "gm": "",
           "gender": 0,
           "character": "",
+          "mass":"",
           "religion": "",
           "weight": "",
           "height": "",
           "background": "",
+          "motivation": "",
+          "quote" : "",
+          "tactics": "",
+          "campaignuse": "",
+          "appearance": "",
           "description": "",
           "notes": "",
+          "points": 0,
+          "complications": 0,
+          "xpearned": 0,
+          "xpspent": 0,
+          "combatskills": "",
+          "presenceattack": "",
           "gmnotes": ""
         }
       },
@@ -23,44 +39,54 @@
         "characteristics": {
           "str": {
             "label": "Strength",
-            "value": 0,
+            "value": 10,
             "base": 10,
             "category": "main",
+            "strdice": "",
+            "lift": "",
+            "strend": 0,
+            "hasroll": true,
             "realcost": 0,
             "activecost": 0
           },
           "dex": {
             "label": "Dexterity",
-            "value": 0,
+            "value": 10,
             "base": 10,
+            "hasroll": true,
             "category": "main"
           },
           "con": {
             "label": "Constitution",
+            "hasroll": true,
             "category": "main",
-            "value": 0,
+            "value": 10,
             "base": 10
           },
           "int": {
             "label": "Intelligence",
+            "hasroll": true,
             "category": "main",
-            "value": 0,
+            "value": 10,
             "base": 10
           },
           "ego": {
             "label": "Ego",
+            "hasroll": true,
             "category": "main",
-            "value": 0,
+            "value": 10,
             "base": 10
           },
           "pre": {
             "label": "Presence",
+            "hasroll": true,
             "category": "main",
-            "value": 0,
+            "value": 10,
             "base": 10
           },
           "ocv": {
             "label": "OCV",
+            "hasroll": false,
             "base": 3,
             "autoMod": "0",
             "userMod": "0",
@@ -69,6 +95,7 @@
           },
           "dcv": {
             "label": "DCV",
+            "hasroll": false,
             "base": 3,
             "autoMod": "0",
             "userMod": "0",
@@ -77,6 +104,7 @@
           },
           "omcv": {
             "label": "OMCV",
+            "hasroll": false,
             "base": 3,
             "autoMod": "0",
             "userMod": "0",
@@ -85,6 +113,7 @@
           },
           "dmcv": {
             "label": "DMCV",
+            "hasroll": false,
             "base": 3,
             "autoMod": "0",
             "userMod": "0",
@@ -93,11 +122,14 @@
           },
           "spd": {
             "label": "Speed",
+            "hasroll": false,
             "value": 2,
             "base": 2
           },
           "pd": {
             "label": "PD",
+            "hasroll": false,
+            "isdefense": true,
             "value": 2,
             "base": 2,
             "pd_nonresistant_total": 0,
@@ -107,6 +139,8 @@
           },
           "ed": {
             "label": "ED",
+            "hasroll": false,
+            "isdefense": true,
             "value": 2,
             "base": 2,
             "ed_nonresistant_total": 0,
@@ -116,21 +150,39 @@
           },
           "rec": {
             "label": "REC",
+            "hasroll": false,
             "value": 4,
             "base": 4
           },
           "end": {
-            "label": "REC",
+            "label": "END",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
             "value": 20,
             "max": 20
           },
           "stun": {
             "label": "STUN",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
+            "value": 20,
+            "max": 20
+          },
+          "other": {
+            "label": "OTHER",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
             "value": 20,
             "max": 20
           },
           "body": {
-            "label": "Body",
+            "label": "BODY",
+            "hasroll": false,
+            "isvital": true,
+            "damage": 0,
             "value": 10,
             "max": 10,
             "loc": {
@@ -154,27 +206,91 @@
           },
           "running": {
             "label": "Running",
+            "ismovement": true,
+            "hasroll": false,
             "value": 12,
             "base": 12
           },
           "swimming": {
             "label": "Swimming",
+            "ismovement": true,
+            "hasroll": false,
             "value": 4,
             "base": 4
           },
           "leaping": {
             "label": "Leaping",
+            "ismovement": true,
+            "hasroll": false,
             "value": 4,
             "base": 4,
             "leaping_horizontal_base": 0,
             "leaping_horizontal_total": 0,
             "leaping_vertical_base": 0,
             "leaping_vertical_total": 0
+          }
+        }
+      },
+      "movements": {
+        "movements": {
+          "fly": {
+            "label": "Fly",
+            "value": 0
           },
-          "flying": {
+          "teleport": {
-            "label": "Flying",
+            "label": "Teleport",
+            "value": 0
+          },
+          "tunnel": {
+            "label": "Tunnel",
+            "value": 0
+          },
+          "move1": {
+            "label": "N/A",
+            "iseditable": true,
+            "value": 0
+          },
+          "move2": {
+            "label": "N/A",
+            "iseditable": true,
+            "value": 0
+          }
+        }
+      },
+      "defenses": {
+        "defenses": {
+          "mental": {
+            "label": "Mental",
             "value": 0,
-            "base": 0
+            "resistant": ""
+          },
+          "power": {
+            "label": "Power",
+            "value": 0,
+            "resistant": ""
+          },
+          "flash": {
+            "label": "Flash",
+            "value": 0,
+            "resistant": ""
+          },
+          "def1": {
+            "label": "N/A",
+            "value": 0,
+            "iseditable": true,
+            "resistant": ""
+          },
+          "def2": {
+            "label": "N/A",
+            "value": 0,
+            "iseditable": true,
+            "resistant": ""
+          },
+          "def3": {
+            "label": "N/A",
+            "value": 0,
+            "iseditable": true,
+            "resistant": ""
           }
         }
       },
@@ -183,7 +299,9 @@
     "character": {
       "templates": [
         "biodata",
-        "characteristics"
+        "characteristics",
+        "defenses",
+        "movements"
       ],
       "subactors": []
     }
@@ -195,6 +313,8 @@
       "talent",
       "power",
       "advantage",
+      "maneuver",
+      "martialart",
       "limitation",
       "complication",
       "equipment"
@@ -227,6 +347,16 @@
         "items": {}
       }
     },
+    "maneuver": {
+      "templates": [
+        "common"
+      ],
+      "maneuvertype": "general",
+      "pha": "",
+      "ocv": 0,
+      "dcv" : 0,
+      "active": false
+    },
     "advantage": {
       "templates": [
         "common"
@@ -243,6 +373,10 @@
       "base": "",
       "levelscost": 0,
       "levels": 0,
+      "skilllevelonly": false,
+      "skillfamiliarity": false,
+      "skilleveryman": false,
+      "skillprofiency": false,
       "templates": [
         "common"
       ]
@@ -258,6 +392,7 @@
         "common",
         "power"
       ],
+      "subtype": "equipment",
       "value": 0,
       "weight": 0,
       "moneycost": 0
@@ -291,15 +426,6 @@
       "impenetrable": 0,
       "value": 0
     },
-    "maneuver": {
-      "templates": [
-        "common"
-      ],
-      "phase": 0,
-      "ocv": "+0",
-      "dcv": "+0",
-      "active": false
-    },
     "movement": {
       "templates": [
         "common"

templates/actors/actor-sheet.hbs

@@ -6,23 +6,85 @@
       <div class="flexrow">
         <img class="profile-img margin-image-right" src="{{img}}" data-edit="img" title="{{name}}" />
         <div class="flexcol">
-          <h1 class="charname margin-image-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+          <h1 class="charname "><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="item-field-label-medium">Alternate IDs</label>
-                  {{#if (eq charac.category "main")}}
+                <input type="text" class="item-field-label-long4" 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>
-              </ul>            
-            </div>
-
-            <div class="charac-item">
-            </div>
-
           </div>
+          
+          <div class="grid grid-2col">
+            <div>
+            <ul class="item-list alternate-list">
+              <li class="flexrow item">
+                <label class="item-field-label-medium">Campaign</label>
+                <input type="text" class="item-field-label-long3" name="system.biodata.campaign" value="{{system.biodata.campaign}}" data-dtype="String" />
+              </li>
+              <li class="flexrow item">
+                <label class="item-field-label-medium">Player</label>
+                <input type="text" class="item-field-label-long3" name="system.biodata.player" value="{{system.biodata.player}}"
+                  data-dtype="String" />
+              </li>
+              <li class="flexrow item">
+                <label class="item-field-label-medium">GM</label>
+                <input type="text" class="item-field-label-long3" name="system.biodata.gm" value="{{system.biodata.gm}}"
+                  data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Hair</label>
+                <input type="text" class="item-field-label-long3" name="system.biodata.hair" value="{{system.biodata.hair}}" data-dtype="String" />
+              </li>
+            </ul>
+            </div>
+            <div>
+            <ul class="item-list alternate-list">
+              <li class="flexrow item">
+                <label class="item-field-label-medium">Gender</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.gender" value="{{system.biodata.gender}}" data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Height</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Mass</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.mass" value="{{system.biodata.mass}}" data-dtype="String" />
+              </li>
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Eyes</label>
+                <input type="text" class="item-field-label-medium" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
+              </li>
+            </ul>
+            </div>
+          </div>
+
+          <div class="flexrow">
+            <ul class="item-list alternate-list">
+              <li class="item flexrow">
+                <label class="item-field-label-medium">Points</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.points" value="{{system.biodata.origin}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+      
+                <label class="item-field-label-medium">Complications</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.complications" value="{{system.biodata.complications}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+
+                <label class="item-field-label-medium">XP Earned</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.xpearned" value="{{system.biodata.xpearned}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+
+                <label class="item-field-label-medium">XP Spent</label>
+                <input type="text" class="item-field-label-short" name="system.biodata.xpspent" value="{{system.biodata.xpspent}}" data-dtype="Number" />
+                <label class="">&nbsp;</label>
+              </li>
+            </ul>
+          </div>
+
         </div>
       </div>
     </div>
@@ -30,140 +92,300 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="main">Main</a>
+    <a class="" data-tab="combat">Combat</a>
-    <a class="item" data-tab="combat">Combat</a>
+    <a class="" data-tab="biodata">Background</a>
-    <a class="item" data-tab="skills">Skills</a>
+    <a class="" data-tab="char">Characteristics</a>
-    <a class="item" data-tab="powers">Powers/Perks</a>
+    <a class="" data-tab="skills">Skills</a>
-    <a class="item" data-tab="equipment">Equipment</a>
+    <a class="" data-tab="perks">Perks</a>
-    <a class="item" data-tab="biodata">Biography</a>
+    <a class="" data-tab="talents">Talents</a>
+    <a class="" data-tab="martial">Martial Arts</a>
+    <a class="" data-tab="powers">Powers</a>
+    <a class="" data-tab="complications">Complications</a>
+    <a class="" data-tab="equipment">Equipment</a>
+    <a class="" 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">
-      <div class="flexcol">
+      
-
+      <div class="grid grid2col">
-        <div>
+          <div>
-          <ul class="stat-list alternate-list">
+          <ul class="item-list alternate-list">
-            <li class="item flexrow list-item items-title-bg">
+            <li class="item">
-              <span class="item-name-label-header-long">
+              <label class="item-field-label-medium">STR Dice</label>
-                <h3><label class="items-title-text">Weapons</label></h3>
+              <a class="roll-direct" data-roll-formula="{{characteristics.str.strdice}}"><i class="fas fa-dice"></i>{{characteristics.str.strdice}}</a>
-              </span>
+              <label class="item-field-label-short">&nbsp;</label>
-              <span class="item-field-label-short">
+              <label class="item-field-label-medium">Lift</label>
-                <label class="short-label">Ability</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" />
-              </span>
+              <label class="item-field-label-short">&nbsp;</label>
-              <span class="item-field-label-medium">
+              <label class="item-field-label-medium">STR END</label>
-                <label class="short-label">Range</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" />
-              </span>
             </li>
-            {{#each equippedWeapons as |weapon key|}}
+            <li class="flexrow item">
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
+              <label class="item-field-label-long">Presence attack</label>
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              <a class="roll-direct" data-roll-formula="{{system.biodata.presenceattack}}"><i class="fas fa-dice"></i>{{system.biodata.presenceattack}}</a>
-                  src="{{weapon.img}}" /></a>
-              <span class="item-name-label-long"><a class ="roll-weapon">{{weapon.name}}</a></span>
-
-              <span class="item-field-label-short">{{weapon.system.ability}}</span>
-
-              <span class="item-field-label-medium">{{perk.system.range}}</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>
 
+            {{#each maneuvers as |mlist key|}}
+            <ul class="stat-list alternate-list">
+              <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long-img">
+                  <label class="">{{upperFirst key}} Maneuvers</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">PHA</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">OCV</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">DCV</label>
+                </span>
+                <span class="item-field-label-medium">
+                  <label class="short-label">Effects</label>
+                </span>
+              </li>
+              {{#each mlist as |maneuver key|}}
+              <li class="item flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
+                <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                    src="{{maneuver.img}}" /></a>
+                <span class="item-field-label-long">{{maneuver.name}}</span>
+
+                <span class="item-field-label-short">{{maneuver.system.pha}}</span>
+                <span class="item-field-label-short">{{maneuver.system.ocv}}</span>
+                <span class="item-field-label-short">{{maneuver.system.dcv}}</span>
+
+                <span class="item-field-label-medium">{{maneuver.system.effects}}</span>
+
+                <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>
+          {{/each}}
+        </div>
+  
         <div>
-          <ul class="stat-list alternate-list">
+          <ul class="item-list alternate-list">
-            <li class="item flexrow list-item items-title-bg">
+            <li class="flexrow item">
-              <span class="item-name-label-header-long">
+              <label class="item-field-label-medium">SPD</label>
-                <h3><label class="items-title-text">Feats</label></h3>
+              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.spd.value" value="{{characteristics.spd.value}}" data-dtype="Number" />
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">Feature Die?</label>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">SL?</label>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">SL</label>
-              </span>
             </li>
-            {{#each feats as |feat key|}}
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{feat._id}}">
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                  src="{{feat.img}}" /></a>
-              <span class="item-name-label-long">{{feat.name}}</span>
-
-              <span class="item-field-label-medium">{{upperFirst feat.system.isfeatdie}}</span>
-              <span class="item-field-label-medium">{{upperFirst feat.system.issl}}</span>
-              <span class="item-field-label-medium">{{feat.system.sl}}</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 class="grid grid2col">
-          <ul class="stat-list alternate-list">
+            <div>
-            <li class="item flexrow list-item items-title-bg">
+              <ul class="stat-list alternate-list">
-              <span class="item-name-label-header-long">
+                <li class="item flexrow list-item items-title-bg">
-                <h3><label class="items-title-text">Conditions</label></h3>
+                <span class="item-field-label-long">
-              </span>
+                  <label class="">Vitals</label>
-            </li>
+                </span>
-            {{#each conditions as |condition key|}}
+                <span class="item-field-label-short">
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{condition._id}}">
+                  <label class="short-label">Val.</label>
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                </span>
-                  src="{{condition.img}}" /></a>
+                <span class="item-field-label-short">
-              <span class="item-name-label-long">{{condition.name}}</span>
+                  <label class="short-label">Dam.</label>
-              <div class="item-filler">&nbsp;</div>
+                </span>
-              <div class="item-controls item-controls-fixed">
+                </li>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                {{#each characteristics as |char key|}} 
-              </div>
+                  {{#if char.isvital}}
-            </li>
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
-            {{/each}}
+                    <span class="item-field-label-long">{{char.label}}</span>
-          </ul>
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
-        </div>
+                    <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.damage" value="{{char.damage}}" data-dtype="Number" />
+                  </li>
+                  {{/if}}
+                {{/each}}
+              </ul>
 
+            </div>
+
+            <div>
+
+              <ul class="stat-list alternate-list">
+                <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long">
+                  <label class="">Defenses</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Val.</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Res.</label>
+                </span>
+                </li>
+                {{#each characteristics as |char key|}} 
+                  {{#if char.isdefense}}
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    <span class="item-field-label-long">{{char.label}}</span>
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.resistant" value="{{char.resistant}}" data-dtype="Number" />
+                  </li>
+                  {{/if}}
+                {{/each}}
+                {{#each defenses as |def key|}} 
+                  <li class="item flexrow list-item list-item-shadow" data-defense-key="{{key}}">
+                    {{#if  def.iseditable}}
+                    <input type="text" class="item-field-label-long update-field" data-field-name="system.defenses.{{key}}.label" value="{{def.label}}" data-dtype="String" />
+                    {{else}}
+                    <span class="item-field-label-long">{{def.label}}</span>
+                    {{/if}}
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.defenses.{{key}}.value" value="{{def.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" name="system.defenses.{{key}}.resistant" value="{{def.resistant}}" data-dtype="Number" />
+                  </li>
+                {{/each}}
+              </ul>
+
+            </div>
+
+          </div>
+        
+          <div class="item">
+            <label class="item-field-label-short">OCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.ocv.value" value="{{characteristics.ocv.value}}" data-dtype="Number" />
+            <label class="item-field-label-short">&nbsp;</label>
+
+            <label class="item-field-label-short">DCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.dcv.value" value="{{characteristics.dcv.value}}" data-dtype="Number" />
+            <label class="item-field-label-short">&nbsp;</label>
+
+            <label class="item-field-label-short">OMCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.omcv.value" value="{{characteristics.omcv.value}}" data-dtype="Number" />
+            <label class="item-field-label-short">&nbsp;</label>
+
+            <label class="item-field-label-short">DMCV</label>
+            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.dmcv.value" value="{{characteristics.dmcv.value}}" data-dtype="Number" />
+          </div>
+
+          <div class="flexrow">
+            <label class="item-field-label-long">Combat Skill Levels</label>
+            <textarea rows="4" type="text" class="padd-right" name="system.biodata.combatskills"
+              data-dtype="String">{{system.biodata.combatskills}}</textarea>
+          </div>
+  
+          <div class="grid grid2col">
+            <div>
+              <ul class="stat-list alternate-list">
+                <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long">
+                  <label class="">Senses</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Val.</label>
+                </span>
+                </li>
+                {{#each senses as |sense key|}} 
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    <span class="item-field-label-long">{{sense.label}}</span>
+                    <span class="item-field-label-short">{{sense.value}}</span>
+                  </li>
+                {{/each}}
+              </ul>
+            </div>
+
+            <div>
+              <ul class="stat-list alternate-list">
+                <li class="item flexrow list-item items-title-bg">
+                <span class="item-field-label-long">
+                  <label class="">Movement</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">C.</label>
+                </span>
+                <span class="item-field-label-short">
+                  <label class="short-label">Non-C.</label>
+                </span>
+                </li>
+                {{#each characteristics as |char key|}} 
+                  {{#if char.ismovement}}
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    <span class="item-field-label-long">{{char.label}}</span>
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" value="{{mul char.value 2}}" disabled data-dtype="Number" />
+                  </li>
+                  {{/if}}
+                {{/each}}
+                {{#each movements as |move key|}} 
+                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                    {{#if  move.iseditable}}
+                    <input type="text" class="item-field-label-long update-field" data-field-name="system.movements.{{key}}.label" value="{{move.label}}" data-dtype="String" />
+                    {{else}}
+                    <span class="item-field-label-long">{{move.label}}</span>
+                    {{/if}}
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.movements.{{key}}.value" value="{{move.value}}" data-dtype="Number" />
+                    <input type="text" class="item-field-label-short" value="{{mul move.value 2}}" disabled data-dtype="Number" />
+                  </li>
+                {{/each}}
+              </ul>
+              
+            </div>
+          </div>
+        </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="item-field-label-medium">
+            <label class="">Value</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">CHAR</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">
 
       <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-field-label-long-img">
-            <h3><label class="items-title-text">Skills</label></h3>
+            <label class="">Skills</label>
           </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-long">
-            <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-field-label-long">{{skill.name}}</span>
-          <span class="item-field-label-short">{{upper skill.system.characteristic}}</span>
+          <span class="item-field-label-medium">{{upper skill.charac}}</span>
-          <span class="item-field-label-short">{{skill.system.base}}</span>
+          <span class="item-field-label-short"><a class="roll-item" data-type="skill"><i class="fas fa-dice"></i>{{skill.roll}}-</a></span>
-          <span class="item-field-label-long">&nbsp;-&nbsp;</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,29 +395,164 @@
       </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-field-label-long-img">
+            <label class="">Perks</label>
+          </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-field-label-long-img">
+            <label class="items-title-text">Talents</label>
+          </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-field-label-long-img">
+            <label class="">Martial Arts</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each martialarts as |martial key|}}
+        <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="{{martial.img}}" /></a>
+          <span class="item-name-label"><a class="roll-item" data-type="talent">{{martial.name}}</a></span>
+          {{#if martial.system.hasroll}}          
+          <span class="item-field-label-short">{{martial.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">
         <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
+          <span class="item-name-img">
-            <h3><label class="items-title-text">Powers</label></h3>
+            <label class="">&nbsp;</label>
           </span>
           <span class="item-field-label-short">
-            <label class="short-label">Charac</label>
+            <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"><a class="roll-skill">{{power.name}}</a></span>
+          <span class="item-field-label-short">{{power.system.cost}}</span>
-          <span class="item-field-label-short">{{upper power.system.ability}}</span>
+          <span class="item-field-label-long4">{{{power.enrichDescription}}}
-          <span class="item-field-label-short">{{power.system.skilldice}}</span>
+          </span>
-          <span class="item-field-label-long">&nbsp;-&nbsp;</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}}
+          <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>
+          </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-field-label-long-img">
+            <label class="">Complications</label>
+          </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>
@@ -214,176 +571,13 @@
         <span class="small-label">Capacity : {{encCapacity}}</span>
       </div>
 
-      <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">Money</label></h3>
-          </span>
-          <span class="item-field-label-long">
-            <label class="short-label">Qty</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">Weight</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">IDR</label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="money" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each moneys as |money key|}}
-        <li class="item flexrow list-item list-item-shadow" data-item-id="{{money._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{money.img}}" /></a>
-          <span class="item-name-label">{{money.name}}</span>
 
-          <span class="item-field-label-long"><label>
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Armor" items=armors}}
-              {{money.system.quantity}}
-              (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
-            </label>
-          </span>
-          <span class="item-field-label-medium">
-            <label>{{money.system.weight}}</label>
-          </span>
-          <span class="item-field-label-medium">
-            {{#if money.system.idrDice}}
-            <a class="roll-idr" data-dice-value="{{money.data.idrDice}}">{{money.system.idrDice}}</a>
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-          </span>
 
-          <div class="item-filler">&nbsp;</div>
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Shields" items=shields}}
-          <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>
 
-      <ul class="item-list alternate-list">
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Equipment" items=equipments}}
-        <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>
-          <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">
-        <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>
-          <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>
 
@@ -391,80 +585,82 @@
 
     {{!-- Biography Tab --}}
     <div class="tab biodata" data-group="primary" data-tab="biodata">
-      <div class="grid grid-2col">
+      <div class="flexrow">
-        <div>
+        <div class="biodata-portrait">
-          <ul class="item-list alternate-list">
+          <img src="{{img}}">
-            <li class="item flexrow">
-              <label class="generic-label">Origin</label>
-              <input type="text" class="" name="system.biodata.origin" 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>
+        <div>
-          <ul>
+          <h3>Background/History : </h3>
-            <li class="flexrow item">
+          <div class="form-group editor">
-              <label class="generic-label">Size</label>
+            {{editor description target="system.biodata.description" button=true owner=owner
-              <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
+            editable=editable}}
-                {{#select data.biodata.size}}
+          </div>
-                <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> 
-            </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" />
-            </li>
-            <li class="flexrow item">
-              <label class="generic-label">Preferred Hand</label>
-              <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
-                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>
-          </ul>
         </div>
       </div>
-
-
       <hr>
-      <h3>Background : </h3>
+      <h3>Personality/Motivation : </h3>
       <div class="form-group editor">
-        {{editor description target="system.biodata.description" button=true owner=owner
+        {{editor motivation target="system.biodata.motivation" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
-      <h3>Notes : </h3>
+      <h3>Quote : </h3>
       <div class="form-group editor">
-        {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
+        {{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>
-      </article>
+      <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,27 @@
     </div>
     {{/if}}
 
+    {{#if item}}    
     <div class="flexrow">
-      <span class="item-field-label-long margin-item-list">Bonus/Malus : </span>
+      <span class="item-field-label-long margin-item-list">{{upperFirst item.type}} - {{upperFirst item.name}}</span>
+      {{#if item.roll}}
+      <span class="item-field-label-medium margin-item-list">{{item.roll}}-</span>
+      {{else}}
+      <span class="item-field-label-medium margin-item-list">{{item.system.roll}}-</span>
+      {{/if}}
+    </div>
+    {{/if}}
+
+    <div class="flexrow">
+      <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>
+        <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 +45,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,18 @@
         </li>
 
         {{#if charac}}  
-        <li>Charac : {{charac.label}}
+        <li>CHAR : {{charac.label}}</li>
-        </li>
         {{/if}}
-        <li>Bonus/Malus : {{bonusMalus}}
+
+        {{#if item}}  
+        <li>{{item.name}} ({{upperFirst item.type}})</li>
+        {{/if}}
+
+        <li>Bonus/Penalty : {{bonusMalus}}
         </li>
 
         <li><strong>Result : {{result}}</strong>  ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})</li>
+        <li><strong>Margin : {{margin}}</strong>
 
       </ul>  
     </div>

templates/items/item-currency-sheet.hbs

@@ -16,10 +16,10 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Unit value</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.value" value="{{data.value}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.value" value="{{system.value}}" data-dtype="Number"/>
           </li>
       </ul>
     </div>

templates/items/item-equipment-sheet.hbs

@@ -16,20 +16,30 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
 
-          {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
 
-          <li class="flexrow"><label class="item-field-label-long">Equipped ?</label>
+      <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>
+        </li>
 
-          <li class="flexrow"><label class="item-field-label-long">Weight</label>
+        <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"/>
-          </li>
+        </li>
-          <li class="flexrow"><label class="item-field-label-long">Value</label>
+        <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"/>
+          <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.value" value="{{system.value}}" data-dtype="Number"/>
-          </li>
+        </li>
 
-          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
 
       </ul>
     </div>

templates/items/item-maneuver-sheet.hbs

@@ -0,0 +1,50 @@
+<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">
+
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+
+        <ul>
+          
+          <li class="flexrow"><label class="item-field-label-long">Type</label>
+            <select class="item-field-label-long" type="text" name="system.maneuvertype" value="{{system.maneuvertype}}" data-dtype="String">
+              {{#select system.maneuvertype}}
+                {{#each config.maneuverTypes as |name key|}}
+                  <option value="{{key}}">{{name}}</option>
+                {{/each}}
+              {{/select}}
+            </select> 
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">PHA</label>
+            <input type="text" class="item-field-label-medium" name="system.pha" value="{{system.pha}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">OCV</label>
+            <input type="text" class="item-field-label-medium" name="system.ocv" value="{{system.ocv}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">DCV</label>
+            <input type="text" class="item-field-label-medium" name="system.dcv" value="{{system.dcv}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-medium">Effects</label>
+            <input type="text" class="item-field-label-long" name="system.effects" value="{{system.effects}}" data-dtype="String"/>
+          </li>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
+        </ul>
+      </div>
+    </section>
+</form>

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-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"/>
+  <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>
+  &nbsp;
-  <h4 class="item-field-label-short margin-item-list"><a class="roll-charac" data-charac-key="{{key}}">{{charac.roll}}-</a></h4>
+  <!-- <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-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-field-label-long-img">
+            <label class="">{{title}}</label>
+          </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>          
-  <span class="item-field-label-short">
+
-    {{#if equip.system.iscontainer}}
+  <span class="item-field-label-medium"><label>{{equip.system.quantity}}
-      {{equip.system.contentsEnc}}
+  </label>
-    {{else}}
+  </span>          
-      {{mul equip.system.weight equip.system.quantity}}
+
-    {{/if}}
+  {{#if equip.system.hasroll}}          
-  </span>
+  <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.roll}}-</a></span>
-  <span class="item-field-label-medium">
+  {{else}}
-    &nbsp;-&nbsp;
+  <span class="item-field-label-short">&nbsp;</span>
-  </span>
+  {{/if}}
+
+  <span class="item-field-label-medium"><label>{{equip.system.endurance}}
+  </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

@@ -0,0 +1,20 @@
+
+<li class="item stat flexrow list-item list-item-shadow" data-attr-key="{{key}}">
+
+  <input type="text" class="item-field-label-medium" 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>
+  
+  <h4 class="item-field-label-short margin-item-list">{{charac.base}}</h4>
+  
+  {{#if charac.hasroll}}
+  <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>
+  {{else}}
+  <h4 class="item-field-label-short margin-item-list">&nbsp;</h4>
+  {{/if}}
+
+  <input type="text" class="item-field-label-long2" name="system.characteristics.{{key}}.notes" value="{{charac.notes}}" data-dtype="String"/>  
+
+</li>