Some fixes

modules/hero6-actor-sheet.js

@@ -13,10 +13,10 @@ export class Hero6ActorSheet extends ActorSheet {
 
     return mergeObject(super.defaultOptions, {
       classes: ["fvtt-hero-system-6", "sheet", "actor"],
-      template: "systems/fvtt-hero-system-6/templates/actor-sheet.hbs",
+      template: "systems/fvtt-hero-system-6/templates/actors/actor-sheet.hbs",
       width: 960,
       height: 720,
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" }],
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "main" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
       editScore: true
     });
@@ -24,8 +24,7 @@ export class Hero6ActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = this.object.system
+    const objectData = duplicate(this.object.system)
-    let actorData = duplicate(objectData)
 
     let formData = {
       title: this.title,
@@ -35,26 +34,34 @@ export class Hero6ActorSheet extends ActorSheet {
       name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      data: actorData,
+      system: objectData,
+      characteristics: this.actor.prepareCharac(),
       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( ),
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
       armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
       shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
-      spells: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getLore())),
       equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
-      equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ),
-      equippedArmor: this.actor.getEquippedArmor(),
-      equippedShield: this.actor.getEquippedShield(),
-      feats: duplicate(this.actor.getFeats()),
       subActors: duplicate(this.actor.getSubActors()),
       race: duplicate(this.actor.getRace()),
       moneys: duplicate(this.actor.getMoneys()),
       encCapacity: this.actor.getEncumbranceCapacity(),
-      saveRolls: this.actor.getSaveRoll(),
-      conditions: this.actor.getConditions(),
       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,37 +146,22 @@ export class Hero6ActorSheet extends ActorSheet {
       this.actor.incDecAmmo( li.data("item-id"), +1 )
     } );
             
-    html.find('.roll-ability').click((event) => {
+    html.find('.roll-charac').click((event) => {
-      const abilityKey = $(event.currentTarget).data("ability-key");
+      const characKey = $(event.currentTarget).data("charac-key");
-      this.actor.rollAbility(abilityKey);
+      this.actor.rollCharac(characKey);
     });
-    html.find('.roll-skill').click((event) => {
+    html.find('.roll-item').click((event) => {
-      const li = $(event.currentTarget).parents(".item")
+      const li = $(event.currentTarget).parents(".item");
-      const skillId = li.data("item-id")
+      let itemId = li.data("item-id")
-      this.actor.rollSkill(skillId)
+      this.actor.rollItem(itemId);
-    });    
+    });
-
+    
     html.find('.roll-weapon').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const skillId = li.data("item-id")
       this.actor.rollWeapon(skillId)
     });
-    html.find('.roll-armor-die').click((event) => {
+   
-      this.actor.rollArmorDie()
-    });
-    html.find('.roll-shield-die').click((event) => {
-      this.actor.rollShieldDie()
-    });
-    html.find('.roll-target-die').click((event) => {
-      this.actor.rollDefenseRanged()
-    });
-    
-    html.find('.roll-save').click((event) => {
-      const saveKey = $(event.currentTarget).data("save-key")
-      this.actor.rollSave(saveKey)
-    });
-    
-    
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
       this.render(true);

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') {
     }
@@ -64,28 +64,8 @@ export class Hero6Actor extends Actor {
   /* -------------------------------------------- */
   computeHitPoints() {
     if (this.type == "character") {
-      let hp = duplicate(this.system.secondary.hp)
-      let max = (this.system.abilities.str.value + this.system.abilities.con.value) * 6
-      if (max != hp.max || hp.value > max) {
-        hp.max = max
-        hp.value = max // Init case
-        this.update({ 'system.secondary.hp': hp })
-      }
     }
   }
-  /* -------------------------------------------- */
-  computeEffortPoints() {
-    if (this.type == "character") {
-      let effort = duplicate(this.system.secondary.effort)
-      let max = (this.system.abilities.con.value + this.system.abilities.int.value) * 6
-      if (max != effort.max || effort.value > max) {
-        effort.max = max
-        effort.value = max // Init case
-        this.update({ 'system.secondary.effort': effort })
-      }
-    }
-  }
-
   /* -------------------------------------------- */
   prepareDerivedData() {
 
@@ -93,7 +73,6 @@ export class Hero6Actor extends Actor {
       this.system.encCapacity = this.getEncumbranceCapacity()
       this.buildContainerTree()
       this.computeHitPoints()
-      this.computeEffortPoints()
     }
 
     super.prepareDerivedData();
@@ -116,29 +95,6 @@ export class Hero6Actor extends Actor {
     Hero6Utility.sortArrayObjectsByName(comp)
     return comp;
   }
-  /* -------------------------------------------- */
-  getFeats() {
-    let comp = duplicate(this.items.filter(item => item.type == 'feat') || []);
-    Hero6Utility.sortArrayObjectsByName(comp)
-    return comp;
-  }
-  /* -------------------------------------------- */
-  getFeatsWithDie() {
-    let comp = duplicate(this.items.filter(item => item.type == 'feat' && item.system.isfeatdie) || []);
-    Hero6Utility.sortArrayObjectsByName(comp)
-    return comp;
-  }
-  getFeatsWithSL() {
-    let comp = duplicate(this.items.filter(item => item.type == 'feat' && item.system.issl) || []);
-    Hero6Utility.sortArrayObjectsByName(comp)
-    return comp;
-  }
-  /* -------------------------------------------- */
-  getLore() {
-    let comp = duplicate(this.items.filter(item => item.type == 'spell') || []);
-    Hero6Utility.sortArrayObjectsByName(comp)
-    return comp;
-  }
   getEquippedWeapons() {
     let comp = duplicate(this.items.filter(item => item.type == 'weapon' && item.system.equipped) || []);
     Hero6Utility.sortArrayObjectsByName(comp)
@@ -211,19 +167,37 @@ export class Hero6Actor extends Actor {
   /* -------------------------------------------- */
   getSkills() {
     let comp = duplicate(this.items.filter(item => item.type == 'skill') || [])
-    for (let skill of comp) {
+    Hero6Utility.sortArrayObjectsByName(comp)
-      Hero6Utility.updateSkill(skill)
+    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') || [])
-  getRelevantAbility(statKey) {
+    Hero6Utility.sortArrayObjectsByName(comp)
-    let comp = duplicate(this.items.filter(item => item.type == 'skill' && item.system.ability == ability) || []);
+    return 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
   }
-
 
   /* -------------------------------------------- */
   async equipItem(itemId) {
@@ -261,32 +235,20 @@ export class Hero6Actor extends Actor {
 
   /* ------------------------------------------- */
   getEquipments() {
-    return this.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment");
+  }
+  getWeapons() {
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
+  }
+  getArmors() {
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "armor");
+  }
+  getShields() {
+    return this.items.filter(item => item.type == "equipment" && item.system.subtype == "shield");
   }
   /* ------------------------------------------- */
   getEquipmentsOnly() {
-    return duplicate(this.items.filter(item => item.type == "equipment") || [])
+    return duplicate(this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment") || [])
-  }
-
-  /* ------------------------------------------- */
-  getSaveRoll() {
-    return {
-      reflex: {
-        "label": "Reflex Save",
-        "img": "systems/fvtt-hero-system-6/images/icons/saves/reflex_save.webp",
-        "value": this.system.abilities.agi.value + this.system.abilities.wit.value
-      },
-      fortitude: {
-        "label": "Fortitude Save",
-        "img": "systems/fvtt-hero-system-6/images/icons/saves/fortitude_save.webp",
-        "value": this.system.abilities.str.value + this.system.abilities.con.value
-      },
-      willpower: {
-        "label": "Willpower Save",
-        "img": "systems/fvtt-hero-system-6/images/icons/saves/will_save.webp",
-        "value": this.system.abilities.int.value + this.system.abilities.cha.value
-      }
-    }
   }
 
   /* ------------------------------------------- */
@@ -332,15 +294,6 @@ export class Hero6Actor extends Actor {
 
   }
 
-  /* -------------------------------------------- */
-  async rollArmor(rollData) {
-    let armor = this.getEquippedArmor()
-    if (armor) {
-
-    }
-    return { armor: "none" }
-  }
-
   /* -------------------------------------------- */
   async incDecHP(formula) {
     let dmgRoll = new Roll(formula+"[dark-starsorange]").roll({ async: false })
@@ -351,11 +304,6 @@ export class Hero6Actor extends Actor {
     return Number(dmgRoll.total)
   }
 
-  /* -------------------------------------------- */
-  getAbility(abilKey) {
-    return this.system.abilities[abilKey];
-  }
-
   /* -------------------------------------------- */
   async addObjectToContainer(itemId, containerId) {
     let container = this.items.find(item => item.id == containerId && item.system.iscontainer)
@@ -429,9 +377,16 @@ export class Hero6Actor extends Actor {
   }
 
   /* -------------------------------------------- */
-  syncRoll(rollData) {
+  prepareCharacValues( charac) {
-    this.lastRollId = rollData.rollId;
+    charac.total = charac.value
-    Hero6Utility.saveRollData(rollData);
+    charac.roll = 9 + Math.floor((charac.value)/5)
+  }
+  prepareCharac() {
+    let characs = duplicate(this.system.characteristics)
+    for(let key in characs) {
+      this.prepareCharacValues( characs[key])
+    }
+    return characs
   }
 
   /* -------------------------------------------- */
@@ -457,31 +412,6 @@ export class Hero6Actor extends Actor {
     }
   }
 
-  /* -------------------------------------------- */
-  async incrementSkillExp(skillId, inc) {
-    let skill = this.items.get(skillId)
-    if (skill) {
-      await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'system.exp': skill.system.exp + inc }])
-      let chatData = {
-        user: game.user.id,
-        rollMode: game.settings.get("core", "rollMode"),
-        whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
-        content: `<div>${this.name} has gained 1 exp in the skill ${skill.name} (exp = ${skill.system.exp})</div`
-      }
-      ChatMessage.create(chatData)
-      if (skill.system.exp >= 25) {
-        await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'system.exp': 0, 'system.explevel': skill.system.explevel + 1 }])
-        let chatData = {
-          user: game.user.id,
-          rollMode: game.settings.get("core", "rollMode"),
-          whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
-          content: `<div>${this.name} has gained 1 exp SL in the skill ${skill.name} (new exp SL :  ${skill.system.explevel}) !</div`
-        }
-        ChatMessage.create(chatData)
-      }
-    }
-  }
-
   /* -------------------------------------------- */
   async incDecQuantity(objetId, incDec = 0) {
     let objetQ = this.items.get(objetId)
@@ -504,61 +434,16 @@ export class Hero6Actor extends Actor {
   }
 
   /* -------------------------------------------- */
-  isForcedAdvantage() {
+  getCommonRollData(chKey = undefined) {
-    return this.items.find(cond => cond.type == "condition" && cond.system.advantage)
-  }
-  isForcedDisadvantage() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.disadvantage)
-  }
-  isForcedRollAdvantage() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.rolladvantage)
-  }
-  isForcedRollDisadvantage() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.rolldisadvantage)
-  }
-  isNoAdvantage() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.noadvantage)
-  }
-  isNoAction() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.noaction)
-  }
-  isAttackDisadvantage() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.attackdisadvantage)
-  }
-  isDefenseDisadvantage() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.defensedisadvantage)
-  }
-  isAttackerAdvantage() {
-    return this.items.find(cond => cond.type == "condition" && cond.system.targetadvantage)
-  }
-
-  /* -------------------------------------------- */
-  getCommonRollData(abilityKey = undefined) {
-    let noAction = this.isNoAction()
-    if (noAction) {
-      ui.notifications.warn("You can't do any actions du to the condition : " + noAction.name)
-      return
-    }
-
     let rollData = Hero6Utility.getBasicRollData()
     rollData.alias = this.name
     rollData.actorImg = this.img
     rollData.actorId = this.id
     rollData.img = this.img
-    rollData.featsDie = this.getFeatsWithDie()
+    if (chKey) {
-    rollData.featsSL = this.getFeatsWithSL()
+      rollData.charac = duplicate(this.system.characteristics[chKey])
-    rollData.armors = this.getArmors()
+      this.prepareCharacValues(rollData.charac)
-    rollData.conditions = this.getConditions()
+    }
-    rollData.featDieName = "none"
-    rollData.featSLName = "none"
-    rollData.rollAdvantage = "none"
-    rollData.advantage = "none"
-    rollData.disadvantage = "none"
-    rollData.forceAdvantage = this.isForcedAdvantage()
-    rollData.forceDisadvantage = this.isForcedDisadvantage()
-    rollData.forceRollAdvantage = this.isForcedRollAdvantage()
-    rollData.forceRollDisadvantage = this.isForcedRollDisadvantage()
-    rollData.noAdvantage = this.isNoAdvantage()
     if (rollData.defenderTokenId) {
       let defenderToken = game.canvas.tokens.get(rollData.defenderTokenId)
       let defender = defenderToken.actor
@@ -581,26 +466,28 @@ export class Hero6Actor extends Actor {
         rollData.advantageFromTarget = true
       }
     }
-
-    if (abilityKey) {
-      rollData.ability = this.getAbility(abilityKey)
-      rollData.selectedKill = undefined
-    }
-
     console.log("ROLLDATA", rollData)
 
     return rollData
   }
 
   /* -------------------------------------------- */
-  rollAbility(abilityKey) {
+  rollCharac(chKey) {
-    let rollData = this.getCommonRollData(abilityKey)
+    let rollData = this.getCommonRollData(chKey)
-    rollData.mode = "ability"
+    rollData.mode = "charac"
     if (rollData.target) {
       ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
       return
     }
-    Hero6Utility.rollHero6(rollData)
+    this.startRoll(rollData)
+  }
+  /* -------------------------------------------- */
+  rollItem(itemId) {
+    let item = this.items.get( itemId)
+    let rollData = this.getCommonRollData()
+    rollData.mode = "item"
+    rollData.item = duplicate(item)
+    this.startRoll(rollData)
   }
 
   /* -------------------------------------------- */
@@ -655,152 +542,8 @@ export class Hero6Actor extends Actor {
     }
   }
 
-  /* -------------------------------------------- */
-  rollDefenseMelee(attackRollData) {
-    let weapon = this.items.get(attackRollData.defenseWeaponId)
-    if (weapon) {
-      weapon = duplicate(weapon)
-      let skill = this.items.find(item => item.name.toLowerCase() == weapon.system.skill.toLowerCase())
-      if (skill) {
-        skill = duplicate(skill)
-        Hero6Utility.updateSkill(skill)
-        let abilityKey = skill.system.ability
-        let rollData = this.getCommonRollData(abilityKey)
-        rollData.defenderTokenId = undefined // Cleanup
-        rollData.mode = "weapondefense"
-        rollData.shield = this.getEquippedShield()
-        rollData.attackRollData = duplicate(attackRollData)
-        rollData.skill = skill
-        rollData.weapon = weapon
-        rollData.img = weapon.img
-        if (!rollData.forceDisadvantage) { // This is an attack, check if disadvantaged
-          rollData.forceDisadvantage = this.isDefenseDisadvantage()
-        }
-
-        this.startRoll(rollData)
-      } else {
-        ui.notifications.warn("Unable to find the relevant skill for weapon " + weapon.name)
-      }
-    } else {
-      ui.notifications.warn("Weapon not found ! ")
-    }
-  }
-
-  /* -------------------------------------------- */
-  rollDefenseRanged(attackRollData) {
-    let rollData = this.getCommonRollData()
-    rollData.defenderTokenId = undefined // Cleanup
-    rollData.mode = "rangeddefense"
-    if ( attackRollData) {
-      rollData.attackRollData = duplicate(attackRollData)
-      rollData.effectiveRange = Hero6Utility.getWeaponRange(attackRollData.weapon)
-      rollData.tokensDistance = attackRollData.tokensDistance // QoL copy
-    }
-    rollData.sizeDice = Hero6Utility.getSizeDice(this.system.biodata.size)
-    rollData.distanceBonusDice = 0 //Math.max(0, Math.floor((rollData.tokensDistance - rollData.effectiveRange) + 0.5))
-    rollData.hasCover = "none"
-    rollData.situational = "none"
-    rollData.useshield = false
-    rollData.shield = this.getEquippedShield()
-    this.startRoll(rollData)
-  }
-
-  /* -------------------------------------------- */
-  rollShieldDie() {
-    let shield = this.getEquippedShield()
-    if (shield) {
-      shield = duplicate(shield)
-      let rollData = this.getCommonRollData()
-      rollData.mode = "shield"
-      rollData.shield = shield
-      rollData.useshield = true
-      rollData.img = shield.img
-      this.startRoll(rollData)
-    }
-  }
-
-  /* -------------------------------------------- */
-  async rollArmorDie(rollData = undefined) {
-    let armor = this.getEquippedArmor()
-    if (armor) {
-      armor = duplicate(armor)
-      let reduce = 0
-      let multiply = 1
-      let disadvantage = false
-      let advantage = false
-      let messages = ["Armor applied"]
-
-      if (rollData) {
-        if (Hero6Utility.isArmorLight(armor) && Hero6Utility.isWeaponPenetrating(rollData.attackRollData.weapon)) {
-          return { armorIgnored: true, nbSuccess: 0, messages: ["Armor ignored : Penetrating weapons ignore Light Armors."] }
-        }
-        if (Hero6Utility.isWeaponPenetrating(rollData.attackRollData.weapon)) {
-          messages.push("Armor reduced by 1 (Penetrating weapon)")
-          reduce = 1
-        }
-        if (Hero6Utility.isWeaponLight(rollData.attackRollData.weapon)) {
-          messages.push("Armor with advantage (Light weapon)")
-          advantage = true
-        }
-        if (Hero6Utility.isWeaponHeavy(rollData.attackRollData.weapon)) {
-          messages.push("Armor with disadvantage (Heavy weapon)")
-          disadvantage = true
-        }
-        if (Hero6Utility.isWeaponHack(rollData.attackRollData.weapon)) {
-          messages.push("Armor reduced by 1 (Hack weapon)")
-          reduce = 1
-        }
-        if (Hero6Utility.isWeaponUndamaging(rollData.attackRollData.weapon)) {
-          messages.push("Armor multiplied by 2 (Undamaging weapon)")
-          multiply = 2
-        }
-      }
-      let diceColor = armor.system.absorprionroll
-      let armorResult = await Hero6Utility.getRollTableFromDiceColor(diceColor, false)
-      console.log("Armor log", armorResult)
-      let armorValue = Math.max(0, (Number(armorResult.text) + reduce) * multiply)
-      if (advantage || disadvantage) {
-        let armorResult2 = await Hero6Utility.getRollTableFromDiceColor(diceColor, false)
-        let armorValue2 = Math.max(0, (Number(armorResult2.text) + reduce) * multiply)
-        if (advantage) {
-          armorValue = (armorValue2 > armorValue) ? armorValue2 : armorValue
-          messages.push(`Armor advantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`)
-        }
-        if (disadvantage) {
-          armorValue = (armorValue2 < armorValue) ? armorValue2 : armorValue
-          messages.push(`Armor disadvantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`)
-        }
-      }
-      armorResult.armorValue = armorValue
-      if (!rollData) {
-        ChatMessage.create({ content: "Armor result : " + armorValue })
-      }
-      messages.push("Armor result : " + armorValue)
-      return { armorIgnored: false, nbSuccess: armorValue, rawArmor: armorResult.text, messages: messages }
-    }
-    return { armorIgnored: true, nbSuccess: 0, messages: ["No armor equipped."] }
-  }
-
-  /* -------------------------------------------- */
-  rollSave(saveKey) {
-    let saves = this.getSaveRoll()
-    let save = saves[saveKey]
-    if (save) {
-      save = duplicate(save)
-      let rollData = this.getCommonRollData()
-      rollData.mode = "save"
-      rollData.save = save
-      if (rollData.target) {
-        ui.notifications.warn("You are targetting a token with a save roll - Not authorized.")
-        return
-      }
-      this.startRoll(rollData)
-    }
-
-  }
   /* -------------------------------------------- */
   async startRoll(rollData) {
-    this.syncRoll(rollData)
     let rollDialog = await Hero6RollDialog.create(this, rollData)
     rollDialog.render(true)
   }

modules/hero6-config.js

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

modules/hero6-item-sheet.js

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

modules/hero6-roll-dialog.js

@@ -5,8 +5,8 @@ export class Hero6RollDialog extends Dialog {
   /* -------------------------------------------- */
   static async create(actor, rollData) {
 
-    let options = { classes: ["Hero6Dialog"], width: 540, height: 340, 'z-index': 99999 };
+    let options = { classes: ["Hero6Dialog"], width: 460, height: 'fit-content', 'z-index': 99999 };
-    let html = await renderTemplate('systems/fvtt-hero-system-6/templates/roll-dialog-generic.hbs', rollData);
+    let html = await renderTemplate('systems/fvtt-hero-system-6/templates/apps/roll-dialog-generic.hbs', rollData);
 
     return new Hero6RollDialog(actor, rollData, html, options);
   }
@@ -44,7 +44,7 @@ export class Hero6RollDialog extends Dialog {
 
   /* -------------------------------------------- */
   async refreshDialog() {
-    const content = await renderTemplate("systems/fvtt-hero-system-6/templates/roll-dialog-generic.hbs", this.rollData)
+    const content = await renderTemplate("systems/fvtt-hero-system-6/templates/apps/roll-dialog-generic.hbs", this.rollData)
     this.data.content = content
     this.render(true)
   }
@@ -76,8 +76,8 @@ export class Hero6RollDialog extends Dialog {
     html.find('#situational').change((event) => {
       this.rollData.situational = event.currentTarget.value
     })
-    html.find('#distanceBonusDice').change((event) => {
+    html.find('#bonusMalus').change((event) => {
-      this.rollData.distanceBonusDice = Number(event.currentTarget.value)
+      this.rollData.bonusMalus = Number(event.currentTarget.value)
     })
     
   }

modules/hero6-utility.js

@@ -24,7 +24,10 @@ export class Hero6Utility {
       return array.includes(val);
     })
     Handlebars.registerHelper('upper', function (text) {
-      return text.toUpperCase();
+      if (text) { 
+        return text.toUpperCase();
+      }
+      return text
     })
     Handlebars.registerHelper('lower', function (text) {
       return text.toLowerCase()
@@ -47,8 +50,7 @@ export class Hero6Utility {
         return true;
       }
       return false
-    })
+    })    
-    
 
     this.gameSettings()
 
@@ -150,7 +152,8 @@ export class Hero6Utility {
     const templatePaths = [
       '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-ability-block.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',
@@ -159,6 +162,8 @@ export class Hero6Utility {
       'systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs'
     ]
     return loadTemplates(templatePaths);
   }
@@ -293,93 +298,13 @@ export class Hero6Utility {
     let actor = game.actors.get(rollData.actorId)
 
     // ability/save/size => 0
-    let diceFormula
+    let diceFormula = "3d6+" + rollData.bonusMalus
-    let startFormula = "0d6cs>=5[blue]"
+    let target = 10
-    if (rollData.ability) {
+    if (rollData.charac) {
-      startFormula = String(rollData.ability.value) + "d6cs>=5[blue]"
+      target = rollData.charac.roll
     }
-    if (rollData.save) {
+    if (rollData.item) {
-      startFormula = String(rollData.save.value) + "d6cs>=5[blue]"
+      target = rollData.item.system.roll
-    }
-    if (rollData.sizeDice) {
-      let nb = rollData.sizeDice.nb + rollData.distanceBonusDice + this.getDiceFromCover(rollData.hasCover) + this.getDiceFromSituational(rollData.situational)
-      startFormula = String(nb) + String(rollData.sizeDice.dice) + "cs>=5[blue]"
-    }
-    diceFormula = startFormula
-
-    // skill => 2
-    // feat => 4
-    // bonus => 6
-    if (rollData.skill) {
-      let level = rollData.skill.system.level
-      if (rollData.skill.system.issl2) {
-        rollData.hasSLBonus = true
-        level += 2
-        if (level > 7) { level = 7 }
-      }
-      rollData.skill.system.skilldice = __skillLevel2Dice[level]
-      diceFormula += "+" + String(rollData.skill.system.skilldice) + "cs>=5[black]"
-
-      if (rollData.skill.system.skilltype == "complex" && rollData.skill.system.level == 0) {
-        rollData.complexSkillDisadvantage = true
-        rollData.rollAdvantage = "roll-disadvantage"
-      }
-
-      if (rollData.skill.system.isfeatdie) {
-        rollData.hasFeatDie = true
-        diceFormula += "+ 1d10cs>=5[hero6-purple]"
-      } else {
-        diceFormula += `+ 0d10cs>=5[hero6-purple]`
-      }
-      if (rollData.skill.system.bonusdice != "none") {
-        rollData.hasBonusDice = rollData.skill.system.bonusdice
-        diceFormula += `+ ${rollData.hasBonusDice}cs>=5[black]`
-      } else {
-        diceFormula += `+ 0d6cs>=5[black]`
-      }
-    } else {
-      diceFormula += `+ 0d8cs=>5 + 0d10cs>=5 + 0d6cs>=5`
-    }
-
-    // advantage => 8
-    let advFormula = "+ 0d8cs>=5"
-    if (rollData.advantage == "advantage1" || rollData.forceAdvantage) {
-      advFormula = "+ 1d8cs>=5[hero6-darkgreen]"
-    }
-    if (rollData.advantage == "advantage2") {
-      advFormula = "+ 2d8cs>=5[hero6-darkgreen]"
-    }
-    diceFormula += advFormula
-
-    // disadvantage => 10
-    let disFormula = "- 0d8cs>=5"
-    if (rollData.disadvantage == "disadvantage1" || rollData.forceDisadvantage) {
-      disFormula = "- 1d8cs>=5[red]"
-    }
-    if (rollData.disadvantage == "disadvantage2") {
-      disFormula = "- 2d8cs>=5[red]"
-    }
-    diceFormula += disFormula
-
-    // armor => 12
-    let skillArmorPenalty = 0
-    for (let armor of rollData.armors) {
-      if (armor.system.equipped) {
-        skillArmorPenalty += armor.system.skillpenalty
-      }
-    }
-    if (rollData.skill && rollData.skill.system.armorpenalty && skillArmorPenalty > 0) {
-      rollData.skillArmorPenalty = skillArmorPenalty
-      diceFormula += `- ${skillArmorPenalty}d8cs>=5`
-    } else {
-      diceFormula += `- 0d8cs>=5`
-    }
-
-    // shield => 14
-    if (rollData.useshield && rollData.shield) {
-      diceFormula += "+ 1" + String(rollData.shield.system.shielddie) + "cs>=5[yellow]"
-    } else {
-      diceFormula += " + 0d6cs>=5"
     }
 
     // Performs roll
@@ -389,74 +314,30 @@ export class Hero6Utility {
       myRoll = new Roll(diceFormula).roll({ async: false })
       await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
     }
-    rollData.rollOrder = 0
     rollData.roll = myRoll
-    rollData.nbSuccess = myRoll.total
+    rollData.target = target
-
+    rollData.diceFormula = diceFormula
-    if (rollData.rollAdvantage == "none" && rollData.forceRollAdvantage) {
+    rollData.result = myRoll.total
-      rollData.rollAdvantage = "roll-advantage"
+    rollData.isSuccess = false
+    if (rollData.result <= target) {
+      rollData.isSuccess = true
     }
-    if (rollData.rollAdvantage == "none" && rollData.forceRollDisadvantage) {
+    if ( myRoll.terms[0].total == 3) { // Always a success
-      rollData.rollAdvantage = "roll-disadvantage"
+      rollData.isSuccess = true
     }
-    if (rollData.rollAdvantage != "none") {
+    if ( myRoll.terms[0].total == 18) { // Always a failure
-
+      rollData.isSuccess = false
-      rollData.rollOrder = 1
-      rollData.rollType = (rollData.rollAdvantage == "roll-advantage") ? "Advantage" : "Disadvantage"
-      this.createChatWithRollMode(rollData.alias, {
-        content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat-generic-result.hbs`, rollData)
-      })
-
-      rollData.rollOrder = 2
-      let myRoll2 = new Roll(diceFormula).roll({ async: false })
-      await this.showDiceSoNice(myRoll2, game.settings.get("core", "rollMode"))
-
-      rollData.roll = myRoll2 // Tmp switch to display the proper results
-      rollData.nbSuccess = myRoll2.total
-      this.createChatWithRollMode(rollData.alias, {
-        content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat-generic-result.hbs`, rollData)
-      })
-      rollData.roll = myRoll // Revert the tmp switch
-      rollData.nbSuccess = myRoll.total
-
-      if (rollData.rollAdvantage == "roll-advantage") {
-        if (myRoll2.total > rollData.nbSuccess) {
-          hasChanged = true
-          rollData.roll = myRoll2
-          rollData.nbSuccess = myRoll2.total
-        }
-      } else {
-        if (myRoll2.total < rollData.nbSuccess) {
-          rollData.roll = myRoll2
-          rollData.nbSuccess = myRoll2.total
-        }
-      }
-      rollData.rollOrder = 3
     }
-    rollData.nbSuccess = Math.max(0, rollData.nbSuccess)
+    if (rollData.isSuccess ) {
-
+      rollData.margin = target - rollData.result
-    rollData.isFirstRollAdvantage = false
-    // Manage exp
-    if (rollData.skill && rollData.skill.system.level > 0) {
-      let nbSkillSuccess = rollData.roll.terms[2].total
-      if (nbSkillSuccess == 0 || nbSkillSuccess == rollData.skill.system.level) {
-        actor.incrementSkillExp(rollData.skill.id, 1)
-      }
     }
 
-    this.saveRollData(rollData)
+    let msg = await this.createChatWithRollMode(rollData.alias, {
-    actor.lastRoll = rollData
+      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-generic-result.hbs`, rollData)
-
-    this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat-generic-result.hbs`, rollData)
     })
+    msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)
 
-    // Message response
-    this.displayDefenseMessage(rollData)
-
-    // Manage defense result
-    this.processAttackDefense(rollData)
   }
 
   /* -------------------------------------------- */
@@ -532,7 +413,7 @@ export class Hero6Utility {
   }
 
   /* -------------------------------------------- */
-  static createChatMessage(name, rollMode, chatOptions) {
+  static async createChatMessage(name, rollMode, chatOptions) {
     switch (rollMode) {
       case "blindroll": // GM only
         if (!game.user.isGM) {
@@ -550,7 +431,7 @@ export class Hero6Utility {
         break;
     }
     chatOptions.alias = chatOptions.alias || name;
-    ChatMessage.create(chatOptions);
+    return await ChatMessage.create(chatOptions);
   }
 
   /* -------------------------------------------- */
@@ -558,7 +439,7 @@ export class Hero6Utility {
     let rollData = {
       rollId: randomID(16),
       rollMode: game.settings.get("core", "rollMode"),
-      advantage: "none"
+      bonusMalus: 0
     }
     Hero6Utility.updateWithTarget(rollData)
     return rollData
@@ -573,8 +454,8 @@ export class Hero6Utility {
   }
 
   /* -------------------------------------------- */
-  static createChatWithRollMode(name, chatOptions) {
+  static async createChatWithRollMode(name, chatOptions) {
-    this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions)
+    return await this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions)
   }
 
   /* -------------------------------------------- */

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 */
@@ -79,7 +79,7 @@
 .window-app.sheet .window-content {
   margin: 0;
   padding: 0;
-  color: rgba(224, 208, 197, 0.9);
+  /*color: rgba(224, 208, 197, 0.9);*/
 }
 input {
   background: rgba(228, 240, 240, 0.75);
@@ -466,7 +466,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 .sheet nav.sheet-tabs {
   font-size: 0.70rem;
   font-weight: bold;
-  height: 3rem;
+  height: 2.5rem;
   flex: 0 0 3rem;
   margin: 0;
   padding: 0 0 0 0.25rem;
@@ -483,7 +483,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 
 nav.sheet-tabs .item {
   position: relative;
-  padding: 0 0.25rem;
+  padding: 0 0.15rem;
 }
 
 nav.sheet-tabs .item:after {
@@ -575,8 +575,8 @@ ul, li {
 
 .list-item {
   margin: 0.125rem;
-  box-shadow: inset 0px 0px 1px #00000096;
+  /*box-shadow: inset 0px 0px 1px #00000096;*/
-  border-radius: 0.25rem;
+  /*border-radius: 0.25rem;*/
   padding: 0.125rem;
   flex: 1 1 5rem;
   display: flex !important;
@@ -639,17 +639,6 @@ ul, li {
   font-weight: bold;
   flex-grow: 0;
 }
-.secondaire-label,
-.arme-label,
-.generic-label,
-.competence-label,
-.devotion-label,
-.sort-label,
-.technique-label,
-.ability-label,
-.arme-label,
-.armure-label,
-.equipement-label,
 .description-label {
   flex-grow: 2;
   margin-left: 4px;
@@ -1327,15 +1316,15 @@ Focus FOC: #ff0084
   max-width: 128px;
   justify-content: flex-start;
 }
-.ability-item {
+.charac-item {
   flex-grow: 1;  
   justify-content: flex-start;
   margin: 2px;
 }
-.ability-block {
+.charac-block {
   min-width: 160px;
 }
-.ability-margin {
+.charac-margin {
   margin-left: 4px;
   margin-top: 5px;  
 }
@@ -1343,11 +1332,11 @@ Focus FOC: #ff0084
   margin-left: 4px;
   margin-top: 3px;  
 }
-.item-ability-roll {
+.item-charac-roll {
   max-height: 42px;
   min-height: 36px;
 }
-.item-ability-roll select, .item-ability-roll input {
+.item-charac-roll select, .item-ability-roll input {
   margin-top: 4px;
   margin-right: 2px;
 }
@@ -1431,9 +1420,25 @@ Focus FOC: #ff0084
   max-width: 8rem;
   min-width: 8rem;
 }
+.item-field-label-long2 {
+  flex-grow:1;
+  max-width: 16rem;
+  min-width: 16rem;
+}
+.item-field-label-long4 {
+  flex-grow:1;
+  max-width: 40rem;
+  min-width: 40rem;
+}
 .item-control-end {
   align-self: flex-end;
 }
+.margin-item-list {
+  margin-top: 4px;
+}
+.margin-image-right {
+  margin-right: 4px;
+}
 .alternate-list {
   margin-top: 4px;
   flex-wrap: nowrap;

system.json

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

template.json

@@ -8,12 +8,22 @@
         "biodata": {
           "species": "",
           "age": 0,
+          "campaign":"",
+          "alternateids":"",
+          "player": "",
+          "gm": "",
           "gender": 0,
           "character": "",
+          "mass":"",
           "religion": "",
           "weight": "",
           "height": "",
           "background": "",
+          "motivation": "",
+          "quote" : "",
+          "tactics": "",
+          "campaignuse": "",
+          "appearance": "",
           "description": "",
           "notes": "",
           "gmnotes": ""
@@ -25,31 +35,37 @@
             "label": "Strength",
             "value": 10,
             "base": 10,
+            "category": "main",
             "realcost": 0,
             "activecost": 0
           },
           "dex": {
             "label": "Dexterity",
             "value": 10,
-            "base": 10
+            "base": 10,
+            "category": "main"
           },
           "con": {
             "label": "Constitution",
+            "category": "main",
             "value": 10,
             "base": 10
           },
           "int": {
             "label": "Intelligence",
+            "category": "main",
             "value": 10,
-            "base": 10 
+            "base": 10
           },
           "ego": {
             "label": "Ego",
+            "category": "main",
             "value": 10,
             "base": 10
           },
           "pre": {
             "label": "Presence",
+            "category": "main",
             "value": 10,
             "base": 10
           },
@@ -114,7 +130,7 @@
             "base": 4
           },
           "end": {
-            "label": "REC",
+            "label": "END",
             "value": 20,
             "max": 20
           },
@@ -170,17 +186,16 @@
             "value": 0,
             "base": 0
           }
-        }  
+        }
       },
-      "core": {
+      "core": {}
-
-      }
     },
     "character": {
       "templates": [
-        "biodata", 
+        "biodata",
-        "core"
+        "characteristics"
-      ]
+      ],
+      "subactors": []
     }
   },
   "Item": {
@@ -190,6 +205,7 @@
       "talent",
       "power",
       "advantage",
+      "martialart",
       "limitation",
       "complication",
       "equipment"
@@ -216,9 +232,9 @@
         "quantity": 0,
         "range": "",
         "damage": "",
-        "endurance": 0,  
+        "endurance": 0,
         "hasroll": false,
-        "roll": 0,  
+        "roll": 0,
         "items": {}
       }
     },
@@ -238,6 +254,10 @@
       "base": "",
       "levelscost": 0,
       "levels": 0,
+      "skilllevelonly": false,
+      "skillfamiliarity": false,
+      "skilleveryman": false,
+      "skillprofiency": false,
       "templates": [
         "common"
       ]
@@ -253,6 +273,7 @@
         "common",
         "power"
       ],
+      "subtype": "equipment",
       "value": 0,
       "weight": 0,
       "moneycost": 0

templates/actors/actor-sheet.hbs

@@ -3,76 +3,63 @@
   {{!-- Sheet Header --}}
   <header class="sheet-header">
     <div class="header-fields">
-      <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
       <div class="flexrow">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        <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>
+          
           <div class="flexrow">
-            <div class="ability-item">
+            <ul class="item-list alternate-list">
-              <ul>
+              <li class="item flexrow">
-                {{#each data.abilities as |ability key|}}
+                <label class="generic-label">Alternate IDs</label>
-                {{#if (eq ability.col 1)}}
+                <input type="text" class="" name="system.biodata.alternateids" value="{{system.biodata.origin}}"
-                {{> systems/fvtt-crucible-rpg/templates/partial-actor-ability-block.html ability=ability key=key}}
+                  data-dtype="String" />
-                {{/if}}
-                {{/each}}
-              </ul>
-
-              <li class="item flexrow list-item" data-attr-key="class">
-                <span class="ability-label " name="class">
-                  <h4 class="ability-text-white ability-margin">Class</h4>
-                </span>
-                <select class="competence-base flexrow" type="text" name="system.biodata.class" value="{{data.biodata.class}}" data-dtype="String">
-                  {{#select data.biodata.class}}
-                  <option value="chaplain">Chaplain</option>
-                  <option value="magus">Magus</option>
-                  <option value="martial">Martial</option>
-                  <option value="skalawag">Skalawag</option>
-                  <option value="warden">Warden</option>
-                  {{/select}}
-                </select>
               </li>
-            
+            </ul>
+
+            <div class="grid grid-2col">
+            <div>
+            <li class="flexrow item">
+              <label class="generic-label">Campaign name</label>
+              <input type="text" class="" name="system.biodata.campaign" value="{{system.biodata.campaign}}" data-dtype="String" />
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">Gender</label>
+              <input type="text" class="" name="system.biodata.gender" value="{{system.biodata.gender}}" data-dtype="String" />
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">Player</label>
+              <input type="text" class="" name="system.biodata.player" value="{{system.biodata.player}}"
+                data-dtype="String" />
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">GM</label>
+              <input type="text" class="" name="system.biodata.gm" value="{{system.biodata.gm}}"
+                data-dtype="String" />
+            </li>
+          </ul>
+        </div>
+       <div>
+          <ul>
+            <li class="item flexrow">
+              <label class="generic-label">Height</label>
+              <input type="text" class="" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Mass</label>
+              <input type="text" class="" name="system.biodata.mass" value="{{system.biodata.mass}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Eyes</label>
+              <input type="text" class="" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Hair</label>
+              <input type="text" class="" name="system.biodata.hair" value="{{system.biodata.hair}}" data-dtype="String" />
+            </li>
+          </ul>
+        </div>
             </div>
-
-            <div class="ability-item">
-              <ul>
-                {{#each data.abilities as |ability key|}}
-                {{#if (eq ability.col 2)}}
-                {{> systems/fvtt-crucible-rpg/templates/partial-actor-ability-block.html ability=ability key=key}}
-                {{/if}}
-                {{/each}}
-
-                {{#if equippedArmor}}
-                <li class="item flexrow list-item" data-attr-key="class">
-                  <img class="sheet-competence-img" src="{{equippedArmor.img}}" />
-                  <span class="ability-label " name="class">
-                    <h4 class="ability-text-white ability-margin"><a class="roll-armor-die ability-margin">{{equippedArmor.name}}</a></h4>
-                  </span>
-                </li>
-                {{/if}}
-                {{#if equippedShield}}
-                <li class="item flexrow list-item" data-attr-key="class">              
-                  <img class="sheet-competence-img" src="{{equippedShield.img}}" />
-                  <span class="ability-label " name="equippedShield">
-                    <h4 class="ability-text-white ability-margin"><a class="roll-shield-die ability-margin">{{equippedShield.name}}</a></h4>
-                  </span>
-                </li>
-                {{/if}}
-                <li class="item flexrow list-item" data-attr-key="class">              
-                  <img class="sheet-competence-img" src="systems/fvtt-crucible-rpg/images/icons/feats/Marksman (Ballistic).webp" />
-                  <span class="ability-label " name="rollTarget">
-                    <h4 class="ability-text-white ability-margin"><a class="roll-target-die ability-margin">Target Roll</a></h4>
-                  </span>
-                </li>
-
-              </ul>
-            </div>
-
-            <div class="ability-item status-block">
-              {{> systems/fvtt-crucible-rpg/templates/partial-actor-status.html}}
-            </div>
-
           </div>
         </div>
       </div>
@@ -81,50 +68,22 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="skills">Skills</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="lore">Lore</a>
+    <a class="" data-tab="char">Characteristics</a>
-    <a class="item" data-tab="equipment">Equipment</a>
+    <a class="" data-tab="skills">Skills</a>
-    <a class="item" data-tab="biodata">Biography</a>
+    <a class="" data-tab="perks">Perks</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">
 
-    {{!-- 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">
-            <h3><label class="items-title-text">Skills</label></h3>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Ability</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Dice</label>
-          </span>
-          <span class="item-field-label-long">
-            <label class="short-label">Background</label>
-          </span>
-        </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-short">{{upper skill.system.ability}}</span>
-          <span class="item-field-label-short">{{skill.system.skilldice}}</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>
-          </div>
-        </li>
-        {{/each}}
-      </ul>
-    </div>
 
     {{!-- Combat Tab --}}
     <div class="tab combat" data-group="primary" data-tab="combat">
@@ -197,72 +156,236 @@
           </ul>
         </div>
 
-        <div>
-          <ul class="stat-list alternate-list">
-            <li class="item flexrow list-item items-title-bg">
-              <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Conditions</label></h3>
-              </span>
-            </li>
-            {{#each conditions as |condition key|}}
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{condition._id}}">
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                  src="{{condition.img}}" /></a>
-              <span class="item-name-label-long">{{condition.name}}</span>
-              <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
-
       </div>
     </div>
 
+    {{!-- Char Tab --}}
+    <div class="tab char" data-group="primary" data-tab="char">
 
-    {{!-- Lore Tab --}}
+      <div class="charac-item">
-    <div class="tab lore" data-group="primary" data-tab="lore">
+        <ul>
-
-      <div class="flexcol">
-
-        <ul class="stat-list alternate-list">
           <li class="item flexrow list-item items-title-bg">
-            <span class="item-name-label-header">
+          <span class="item-field-label-short">
-              <h3><label class="items-title-text">Lore</label></h3>
+            <h3><label class="item-field-label-short">Value</label></h3>
-            </span>
+          </span>
-            <span class="item-field-label-medium">
+          <span class="item-field-label-medium">
-              <label class="short-label">Lore</label>
+            <label class="item-field-label-medium">Label</label>
-            </span>
+          </span>
-            <span class="item-field-label-short">
+          <span class="item-field-label-short">
-              <label class="short-label">Circle</label>
+            <label class="short-label">Base</label>
-            </span>
+          </span>
-            <span class="item-field-label-medium">
+          <span class="item-field-label-short">
-              <label class="short-label">Range</label>
+            <label class="short-label">Roll</label>
-            </span>
+          </span>
-          </li>
+          <span class="item-field-label-long">
+            <label class="short-label">Notes</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+        </li>
 
-          {{#each spells as |spell key|}}
+          {{#each characteristics as |charac key|}}
-          <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{spell._id}}">
+              {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-full-charac.hbs charac=charac key=key}}
-            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                src="{{spell.img}}" /></a>
-            <span class="item-name-label">
-              <a class="power-roll">{{spell.name}}</a>
-            </span>
-            <span class="item-field-label-medium">{{upperFirst spell.system.lore}}</span>
-            <span class="item-field-label-short">{{upperFirst spell.system.circle}}</span>
-            <span class="item-field-label-medium">{{upperFirst spell.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>            
-        </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">
+            <h3><label class="items-title-text">Skills</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <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">{{skill.name}}</span>
+          <span class="item-field-label-short">{{upper skill.system.characteristic}}</span>
+          <span class="item-field-label-short"><a class="roll-item" data-type="skill"><i class="fas fa-dice"></i>{{skill.system.base}}-</a></span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Perks Tab --}}
+    <div class="tab perks" data-group="primary" data-tab="perks">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Perks</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each perks as |perk key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{perk._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{perk.img}}" /></a>
+          <span class="item-name-label">{{perk.name}}</span>
+          {{#if perk.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{perk.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Talents Tab --}}
+    <div class="tab talents" data-group="primary" data-tab="talents">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Talents</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each talents as |talent key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{talent._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{talent.img}}" /></a>
+          <span class="item-name-label">{{talent.name}}</span>
+          {{#if talent.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{talent.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Martial Tab --}}
+    <div class="tab martial" data-group="primary" data-tab="martial">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Martial Arts</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each 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-img sheet-competence-img">&nbsp;</span>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">Cost</label>
+          </span>
+          <span class="item-field-label-long4">
+            <label class="item-field-label-long4">Power</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="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-field-label-short">{{power.system.cost}}</span>
+          <span class="item-field-label-long4">{{{power.enrichDescription}}}
+          </span>
+          {{#if power.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{power.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <span class="item-field-label-medium">{{power.system.endurance}}</span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+
+    {{!-- Complications Tab --}}
+    <div class="tab complications" data-group="primary" data-tab="complications">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Complications</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Roll</label>
+          </span>
+        </li>
+        {{#each complications as |comp key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{comp._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{comp.img}}" /></a>
+          <span class="item-name-label">{{comp.name}}</span>
+          {{#if comp.system.hasroll}}          
+          <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{comp.system.roll}}-</a></span>
+          {{else}}
+          <span class="item-field-label-short">&nbsp;</span>
+          {{/if}}
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
     </div>
 
     {{!-- Equipement Tab --}}
@@ -323,127 +446,13 @@
         {{/each}}
       </ul>
 
-      <ul class="item-list alternate-list">
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" items=weapons}}
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Weapons</label></h3>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Attack</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Damage</label>
-          </span>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each weapons as |weapon key|}}
-        <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{weapon.img}}" /></a>
-          <span class="item-name-label">{{weapon.name}}</span>
-          <span class="item-field-label-short"><label>{{upper weapon.system.ability}}</label></span>
-          <span class="item-field-label-short"><label>{{upper weapon.system.damage}}</label></span>
 
-          <div class="item-filler">&nbsp;</div>
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Armor" items=armors}}
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-      </ul>
 
-      <ul class="item-list alternate-list">
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Shields" items=shields}}
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Armors</label></h3>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Type</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Absorption</label>
-          </span>
 
-          <div class="item-filler">&nbsp;</div>
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Equipment" items=equipments}}
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="armor" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each armors as |armor key|}}
-        <li class="item list-item flexrow list-item-shadow" data-item-id="{{armor._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{armor.img}}" /></a>
-          <span class="item-name-label">{{armor.name}}</span>
-          <span class="item-field-label-short">{{upper armor.system.armortype}}</span>
-          <span class="item-field-label-short">{{armor.system.absorprionroll}}</span>
-
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if armor.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-      </ul>
-
-      <ul class="item-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Shields</label></h3>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Dice</label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="shield" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-        </li>
-        {{#each shields as |shield key|}}
-        <li class="item flexrow list-item list-item-shadow" data-item-id="{{shield._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{shield.img}}" /></a>
-          <span class="item-name-label">{{shield.name}}</span>
-          <span class="item-field-label-short">{{shield.system.levelDice}}</span>
-
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if shield.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-      </ul>
-
-      <ul class="item-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Equipment</label></h3>
-          </span>
-          <span class="item-field-label-long">
-            <label class="short-label">Quantity</label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
-          </div>
-
-        </li>
-        {{#each containersTree as |equip key|}}
-        {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
-        <ul class="item-list list-item-shadow2 list-item-margin1">
-          {{#each equip.data.contents as |subgear key|}}
-          {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=subgear level=2}}
-          {{/each}}
-        </ul>
-        {{/each}}
-      </ul>
 
       <hr>
 
@@ -451,80 +460,75 @@
 
     {{!-- Biography Tab --}}
     <div class="tab biodata" data-group="primary" data-tab="biodata">
-      <div class="grid grid-2col">
+      <h3>Background/History : </h3>
-        <div>
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <label class="generic-label">Origin</label>
-              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
-                data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Age</label>
-              <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Height</label>
-              <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Hair</label>
-              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
-            </li>
-          </ul>
-        </div>
-       <div>
-          <ul>
-            <li class="flexrow item">
-              <label class="generic-label">Size</label>
-              <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
-                {{#select data.biodata.size}}
-                <option value="1">Tiny</option>
-                <option value="2">Small</option>
-                <option value="3">Medium</option>
-                <option value="4">Large</option>
-                <option value="5">Huge</option>
-                <option value="6">Gargantuan</option>
-                {{/select}}
-              </select> 
-            </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>
       <div class="form-group editor">
         {{editor description target="system.biodata.description" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
-      <h3>Notes : </h3>
+      <h3>Personality/Motivation : </h3>
       <div class="form-group editor">
-        {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
+        {{editor motivation target="system.biodata.motivation" button=true owner=owner
+        editable=editable}}
       </div>
       <hr>
-      </article>
+      <h3>Quote : </h3>
+      <div class="form-group editor">
+        {{editor quote target="system.biodata.quote" button=true owner=owner
+        editable=editable}}
+      </div>
+      <h3>Powers/Tactics : </h3>
+      <div class="form-group editor">
+        {{editor tactics target="system.biodata.tactics" button=true owner=owner
+        editable=editable}}
+      </div>
+      <h3>Campaign Use : </h3>
+      <div class="form-group editor">
+        {{editor campaignuse target="system.biodata.campaignuse" button=true owner=owner
+        editable=editable}}
+      </div>
+      <h3>Appearance : </h3>
+      <div class="form-group editor">
+        {{editor appearance target="system.biodata.appearance" button=true owner=owner
+        editable=editable}}
+      </div>
     </div>
 
+    {{!-- Notes Tab --}}
+    <div class="tab notes" data-group="primary" data-tab="notes">
+      <h3>Notes 1 : </h3>
+      <div class="form-group editor">
+        {{editor notes1 target="system.biodata.notes1" button=true owner=owner
+        editable=editable}}
+      </div>      
+      <hr>
+      <h3>Notes 2 : </h3>
+      <div class="form-group editor">
+        {{editor notes2 target="system.biodata.notes2" button=true owner=owner
+        editable=editable}}
+      </div>
+      <hr>
+      <h3>Notes 3 : </h3>
+      <div class="form-group editor">
+        {{editor notes3 target="system.biodata.notes3" button=true owner=owner
+        editable=editable}}
+      </div>
+      <hr>
+      <h3>Notes 4 : </h3>
+      <div class="form-group editor">
+        {{editor notes4 target="system.biodata.notes4" button=true owner=owner
+        editable=editable}}
+      </div>
+      <hr>
+      <h3>Notes 5 : </h3>
+      <div class="form-group editor">
+        {{editor notes5 target="system.biodata.notes5" button=true owner=owner
+        editable=editable}}
+      </div>
+
+    </div>
+
+  </div>
+
   </section>
 </form>

templates/apps/roll-dialog-generic.hbs

@@ -6,162 +6,51 @@
     <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
   </header>
 
-    <div class="flexcol">
+  <div class="flexcol">
-      
-      {{#if sizeDice}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Size basic dices : </span>
-        <span class="roll-dialog-label">{{sizeDice.nb}}{{sizeDice.dice}}</span>
-      </div>
 
-      <div class="flexrow">
+    {{#if charac}}    
-        <span class="roll-dialog-label">Distance bonus dice(s) : </span>
+    <div class="flexrow">
-        <select class="status-small-label color-class-common" type="text" id="distanceBonusDice" value="{{distanceBonusDice}}" data-dtype="String" >
+      <span class="item-field-label-long margin-item-list">Characteristic : </span>
-          {{#select distanceBonusDice}}
+      <span class="item-field-label-medium margin-item-list">{{charac.roll}}-</span>
-          <option value="0">0</option>
+    </div>
-          <option value="1">1</option>
+    {{/if}}
-          <option value="2">2</option>
-          <option value="3">3</option>
-          <option value="4">4</option>
-          {{/select}}
-        </select>
-      </div>
-      {{/if}}
-
-      {{#if hasCover}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Cover : </span>
-        <select class="status-small-label color-class-common" type="text" id="hasCover" value="{{hasCover}}" data-dtype="String" >
-          {{#select hasCover}}
-          <option value="none">None</option>
-          <option value="cover50">Cover at 50% (+1 dice)</option>
-          {{/select}}
-        </select>
-      </div>
-      {{/if}}
-
-      {{#if situational}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Situational : </span>
-        <select class="status-small-label color-class-common" type="text" id="situational" value="{{situational}}" data-dtype="String" >
-          {{#select situational}}
-          <option value="none">None</option>
-          <option value="dodge">Dodge (+1 dice)</option>
-          <option value="prone">Prone (+1 dice)</option>
-          <option value="moving">Moving (+1 dice)</option>
-          <option value="Engaged">Engaged (+1 dice)</option>
-          {{/select}}
-        </select>
-      </div>
-      {{/if}}
-
-
-      {{#if save}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">{{save.label}} : </span>
-        <span class="roll-dialog-label">{{save.value}}d6</span>
-      </div>
-      {{/if}}
-
-      {{#if ability}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Ability : </span>
-        <span class="roll-dialog-label">{{ability.value}}d6</span>
-      </div>
-      {{/if}}
-
-      {{#if weapon}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Weapon : </span>
-        <span class="roll-dialog-label">{{weapon.name}}</span>
-      </div>
-      {{/if}}
-
-      {{#if shield}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Use shield ? : </span>
-        <span class="roll-dialog-label"><input type="checkbox" id="useshield" name="useshield" {{checked useshield}}/></span>
-      </div>
-      <div class="flexrow">
-        <span class="roll-dialog-label">{{shield.name}} : </span>
-        <span class="roll-dialog-label">{{shield.data.shielddie}}</span>
-      </div>
-      {{/if}}
-
-      {{#if skill}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Skill : </span>
-        <span class="roll-dialog-label">{{skill.name}} - {{skill.data.skilldice}}</span>
-      </div>
-      <div class="flexrow">
-        <span class="roll-dialog-label">Feature die or SL+2? : </span>
-        <span class="roll-dialog-label">{{#if skill.data.isfeatdie}} Yes {{else}} No {{/if}}</span>
-      </div>
-      {{/if}}
-
-      {{#if noAdvantage}} 
-        <div>
-          <span class="roll-dialog-label">No advantage due to condition : {{noAdvantage.name}}</span>
-        </div>
-      {{else}}
-        <div class="flexrow">
-          <span class="roll-dialog-label">Advantage : </span>
-          <select class="status-small-label color-class-common" type="text" id="advantage" value="{{advantage}}" data-dtype="String" >
-            {{#select advantage}}
-            <option value="none">None</option>
-            <option value="advantage1">1 Advantage</option>
-            <option value="advantage2">2 Advantages</option>
-            {{/select}}
-          </select>
-        </div>
-      {{/if}}
-      
-      <div class="flexrow">
-        <span class="roll-dialog-label">Disadvantage : </span>
-        <select class="status-small-label color-class-common" type="text" id="disadvantage" value="{{disadvantage}}" data-dtype="String" >
-          {{#select disadvantage}}
-          <option value="none">None</option>
-          <option value="disadvantage1">1 Disadvantage</option>
-          <option value="disadvantage2">2 Disadvantages</option>
-          {{/select}}
-        </select>
-      </div>
-
-      <div class="flexrow">
-        <span class="roll-dialog-label">Roll with Advantage/Disadvantage : </span>
-        <select class="status-small-label color-class-common" type="text" id="rollAdvantage" value="{{rollAdvantage}}" data-dtype="String" >
-          {{#select rollAdvantage}}
-          <option value="none">None</option>
-          <option value="roll-advantage">Roll with Advantage</option>
-          <option value="roll-disadvantage">Roll with Disadvantage</option>
-          {{/select}}
-        </select>
-      </div>
-
-      {{#if forceAdvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">1 Advantage from condition : {{forceAdvantage.name}} 
-          {{#if advantageFromTarget}} (Provided by targetted actor) {{/if}}
-        </span>
-      </div>
-      {{/if}}
-      {{#if forceDisadvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">1 Disadvantage from condition : {{forceDisadvantage.name}} </span>
-      </div>
-      {{/if}}
-      {{#if forceRollAdvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Roll Advantage from condition : {{forceRollAdvantage.name}} </span>
-      </div>
-      {{/if}}
-      {{#if forceRollDisadvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Roll Disadvantage from condition : {{forceRollDisadvantage.name}} </span>
-      </div>
-      {{/if}}
 
+    {{#if item}}    
+    <div class="flexrow">
+      <span class="item-field-label-long margin-item-list">{{upperFirst item.type}} : </span>
+      <span class="item-field-label-medium margin-item-list">{{item.system.roll}}-</span>
+    </div>
+    {{/if}}
 
+    <div class="flexrow">
+      <span class="item-field-label-long margin-item-list">Bonus/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>
+        <option value="-1">-1</option>
+        <option value="0">0</option>
+        <option value="1">1</option>
+        <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>
+  
   </div>
 
 </form>

templates/chat/chat-generic-result.hbs

@@ -18,131 +18,25 @@
 
     <div>
       <ul>
-        {{#if (eq rollOrder 1)}}
+        <li>Target Roll : {{target}}-
-        <li><strong>Roll with {{rollType}} - Roll 1</strong></li>
+        </li>
-        {{/if}}
+
-        {{#if (eq rollOrder 2)}}
+        {{#if charac}}  
-        <li><strong>Roll with {{rollType}} - Roll 2</strong></li>
+        <li>CHAR : {{charac.label}}</li>
-        {{/if}}
-        {{#if (eq rollOrder 3)}}
-        <li><strong>Roll with {{rollType}} - Final result !</strong></li>
         {{/if}}
 
-        {{#if save}}  
+        {{#if item}}  
-        <li>Save : {{save.label}} - {{save.value}}d6 
+        <li>{{item.name}} ({{upperFirst item.type}})</li>
-          ({{#each roll.terms.0.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
         {{/if}}
 
-        {{#if sizeDice}}
+        <li>Bonus/Penalty : {{bonusMalus}}
-        <li>Size/Range/Cover/Situational dices 
-          ({{#each roll.terms.0.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
         </li>
-        {{/if}}
 
-        {{#if ability}}  
+        <li><strong>Result : {{result}}</strong>  ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})</li>
-        <li>Ability : {{ability.label}} - {{ability.value}}d6 
+        {{#if isSuccess}}
-          ({{#each roll.terms.0.results as |die idx|}}
+        <li><strong>Margin : {{margin}}</strong>
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
         {{/if}}
 
-        {{#if skill}}
-        <li>Skill : {{skill.name}} - {{skill.data.skilldice}} 
-          {{#if featSL}}
-           - with Feat SL +{{featSL}}
-          {{/if}}
-          &nbsp;({{#each roll.terms.2.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-
-        {{#if noAdvantage}} 
-          <li>No advantage due to condition : {{noAdvantage.name}}</li>
-        {{else}}
-          {{#if (or (eq advantage "advantage1") forceAdvantage)}}
-          <li>1 Advantage Die !
-            &nbsp;({{#each roll.terms.8.results as |die idx|}}
-            {{die.result}}&nbsp;
-            {{/each}})
-          </li>
-          {{/if}}
-          {{#if (eq advantage "advantage2") }}
-          <li>2 Advantage Dice !
-            &nbsp;({{#each roll.terms.8.results as |die idx|}}
-            {{die.result}}&nbsp;
-            {{/each}})
-          </li>
-          {{/if}}
-        {{/if}}
-
-        {{#if (or (eq disadvantage "disadvantage1") forceDisadvantage)}}
-        <li>1 Disadvantage Die !
-          &nbsp;({{#each roll.terms.10.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        {{#if (eq disadvantage "disadvantage2")}}
-        <li>2 Disadvantage Dice !
-          &nbsp;({{#each roll.terms.10.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        {{#if (eq rollAdvantage "roll-advantage")}}
-        <li>Roll with Advantage !</li>
-        {{/if}}
-        {{#if (eq rollAdvantage "roll-disadvantage")}}
-        <li>Roll with Disadvantage !</li>
-        {{/if}}
-        
-        {{#if skillArmorPenalty}}
-        <li>Armor Penalty : {{skillArmorPenalty}} Disadvantage Dice 
-          &nbsp;({{#each roll.terms.12.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-
-        {{#if hasBonusDice}}
-        <li>Skill bonus dice : {{hasBonusDice}} 
-          &nbsp;({{#each roll.terms.6.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        
-        {{#if complexSkillDisadvantage}}
-        <li>Roll with Disadvantage because of Complex Skill at SL 0 !</li>
-        {{/if}}
-        
-        {{#if hasFeatDie}}
-        <li>Feat Die :  d10 
-          &nbsp;({{#each roll.terms.4.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        
-        {{#if useshield}}  
-        <li>Shield : {{shield.name}} - {{shield.data.shielddie}} 
-          ({{#each roll.terms.14.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-
-        <li><strong>Number of successes</strong> {{nbSuccess}} </li>
-
-        <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
-
       </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-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-ability-block.hbs

@@ -1,19 +0,0 @@
-<li class="item flexrow list-item item-ability-roll" data-attr-key="{{key}}">
-  <span class="ability-label ability-margin" name="{{key}}">
-    <h4 class="ability-text-white ability-margin"><a class="roll-ability ability-margin" data-ability-key="{{key}}">{{ability.label}}</a></h4>
-  </span>
-  <select class="status-small-label color-class-common" type="text" name="system.abilities.{{key}}.value" value="{{ability.value}}"
-    data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-    {{#select ability.value}}
-      <option value="0">0</option>
-      <option value="1">1</option>
-      <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>
-    {{/select}}
-  </select>
-</li>

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

@@ -0,0 +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">{{charac.label}}</a></h4>
+  </span>
+  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  
+  &nbsp;
+  <!-- <h4 class="item-field-label-short margin-item-list">{{charac.total}}</h4>-->
+  <h4 class="item-field-label-short margin-item-list"><a class="roll-charac" data-charac-key="{{key}}"><i class="fas fa-dice"></i>{{charac.roll}}-</a></h4>
+</li>

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

@@ -0,0 +1,32 @@
+      <ul class="item-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">{{title}}</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Value</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Mass</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">Quantity</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">Roll</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="item-field-label-medium">END</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
+          </div>
+
+        </li>
+        <ul class="item-list list-item-shadow2">
+          {{#each items as |equip key|}}
+            {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs equip=equip}}
+          {{/each}}
+        </ul>
+      </ul>

templates/partials/partial-actor-equipment.hbs

@@ -1,37 +1,31 @@
 <li class="item flexrow list-item list-item-shadow" data-item-id="{{equip._id}}">
   <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{equip.img}}" /></a>
-  {{#if (eq level 1)}}
   <span class="item-name-label">{{equip.name}}</span>
-  {{else}}
-  <span class="item-name-label-level2">{{equip.name}}</span>
-  {{/if}}
 
-  <span class="item-field-label-long"><label>
+  <span class="item-field-label-medium"><label>{{equip.system.value}}
-    {{equip.system.quantity}}
-    (<a class="quantity-minus plus-minus-button">&nbsp;-</a>/<a class="quantity-plus plus-minus-button">+</a>)
   </label>
   </span>          
 
-  <span class="item-field-label-medium">
+  <span class="item-field-label-medium"><label>{{equip.system.weight}}
-    &nbsp;-&nbsp;
+  </label>
-  </span>
+  </span>          
-  <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,16 @@
+
+<li class="item stat flexrow list-item list-item-shadow" data-attr-key="{{key}}">
+
+  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  
+
+  <span class="item-field-label-medium" name="{{key}}">
+    <h4 class="item-field-label-medium margin-item-list">{{charac.label}}</a></h4>
+  </span>
+  
+  <h4 class="item-field-label-short margin-item-list">{{charac.base}}</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>
+
+  <input type="text" class="item-field-label-long2" name="system.characteristics.{{key}}.notes" value="{{charac.notes}}" data-dtype="String"/>  
+
+</li>