Fix various issues

#7 Fix starting round
2023-08-26 22:27:17 +02:00 · 2023-08-26 22:25:28 +02:00 · 2023-08-26 21:22:42 +02:00 · 2023-08-26 21:03:25 +02:00 · 2023-08-26 20:59:41 +02:00 · 2023-08-26 09:49:13 +02:00
89 changed files with 1221 additions and 576 deletions
--- a/README.md
+++ b/README.md
@ -2,8 +2,18 @@ This is the official Hero System 6th Edition game system for FoundryVTT, based o
 The Hero System game system is not usable standalone. To play this game you need a copy of the core rulebook.
 It features : 
 - PC/NPC sheets
 - Roll management and associated helpers
 - Segment and Turn management in the combat tracker
 - Official compendiums
 ![Snapshot](https://www.lahiette.com/leratierbretonnien/wp-content/uploads/2023/08/hero6_snapshot_02.webp "Snapshot")
 Installation
-Manifest URL: https://github.com/Legendsmiths-LLC/
+Manifest URL: https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/master/system.json
 Project page : https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6
 For manual installation, use the provided manifest URL in the "Install System" popup window while managing game systems.
--- a/changelog.md
+++ b/changelog.md
@ -0,0 +1,19 @@
 v11.0.17
 - Fix tickets 1, 2, 3, 7, 8, 9, 10
 - Implements effects tagging (#11)
 v11.0.16
 - Fix mental maneuvers rolls
 - Renamed title
 v11.0.15
 - Fix target rolls for power
 - Add maneuvers roll in the maneuver tab
 - Renamed title
 v11.0.14
 - Initial public release
--- a/lang/en.json
+++ b/lang/en.json
@ -1,19 +1,22 @@
  {
-    "ACTOR": {
+    "TYPES": {
-      "TypeCharacter": "Character"
+      "Actor": {
-    },
+        "character": "Character",
-    "ITEM": {
+        "minion": "Minion"
-      "TypeSkill": "Skill",
+      },
-      "TypePerk": "Perk",
+      "Item": {
-      "TypePower": "Power",
+        "skill": "Skill",
-      "TypeTalent": "Talent",
+        "perk": "Perk",
-      "TypeAdvantage": "Advantage",
+        "power": "Power",
-      "TypeMartialart": "Martial art",
+        "talent": "Talent",
-      "TypeLimitation": "Limitation",
+        "advantage": "Advantage",
-      "TypeComplication": "Complication",
+        "martialart": "Martial art",
-      "TypeEquipment": "Equipment",
+        "limitation": "Limitation",
-      "TypeCurrency": "Currency",
+        "complication": "Complication",
-      "TypeManeuver": "Maneuver"
+        "equipment": "Equipment",
        "currency": "Currency",
        "maneuver": "Maneuver"  
      }
    },
    "COMBAT": {
      "TurnPrev": "Previous initiative",
--- a/modules/hero6-actor-sheet.js
+++ b/modules/hero6-actor-sheet.js
@ -46,10 +46,12 @@ export class Hero6ActorSheet extends ActorSheet {
      complications: this.actor.getComplications( ),
      maneuvers: this.actor.getManeuvers( ),
      nonstockmaneuvers: this.actor.getNonStockManeuvers(),
      allmaneuvers: this.actor.getAllManeuvers(),
      weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
      armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
      shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
-      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsMoneys()) ),
+      moneys: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getMoneys())),
      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipments()) ),
      subActors: duplicate(this.actor.getSubActors()),
      race: duplicate(this.actor.getRace()),
      encCapacity: this.actor.getEncumbranceCapacity(),
@ -74,7 +76,9 @@ export class Hero6ActorSheet extends ActorSheet {
      editScore: this.options.editScore,
      isGM: game.user.isGM
    }
    this.formData = formData;
    this.stockManeuverDisplayed = false
    console.log("PC : ", formData, this.object);
    return formData;
@ -89,9 +93,9 @@ export class Hero6ActorSheet extends ActorSheet {
    // Everything below here is only needed if the sheet is editable
    if (!this.options.editable) return;
-    html.bind("keydown", function(e) { // Ignore Enter in actores sheet
+    /*html.bind("keydown", function(e) { // Ignore Enter in actores sheet
      if (e.keyCode === 13) return false;
-    });  
+    });*/  
    // Update Inventory Item
    html.find('.item-edit').click(ev => {
@ -158,13 +162,19 @@ export class Hero6ActorSheet extends ActorSheet {
    html.find('.roll-perception').click((event) => {
      this.actor.rollPerception("int");
    });
-    
+    html.find('.roll-weapon').click((event) => {
      const li = $(event.currentTarget).parents(".item")
      this.actor.rollWeapon(li.data("item-id"));
    });
    html.find('.roll-power-attack').click((event) => {
      const li = $(event.currentTarget).parents(".item")
      this.actor.rollPowerAttack(li.data("item-id"));
    });    
    html.find('.roll-direct').click((event) => {
      const rollFormula = $(event.currentTarget).data("roll-formula")
      const rollSource = $(event.currentTarget).data("roll-source")
      Hero6Utility.processDirectRoll( { actorId: this.actor.id, rollFormula: rollFormula, rollSource: rollSource, mode:"directroll"} )
    });    
    html.find('.roll-item').click((event) => {
      const li = $(event.currentTarget).parents(".item");
      let itemId = li.data("item-id")
@ -180,16 +190,6 @@ export class Hero6ActorSheet extends ActorSheet {
      let itemId = li.data("item-id")
      this.actor.rollLiftDice(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-maneuver').click((event) => {
      const li = $(event.currentTarget).parents(".item");
      const maneuverId = li.data("maneuver-id")
      this.actor.rollManeuver(maneuverId)
    });
    html.find('.hold-action').click((event) => {
      this.actor.holdAction()
@ -198,6 +198,16 @@ export class Hero6ActorSheet extends ActorSheet {
      this.actor.abortAction()
    });
    html.find(".show-stock-maneuver").click((event) => {
      if ( !this.stockManeuverDisplayed) {
        $('div .maneuver-list').removeClass('maneuver-is-stock');
        this.stockManeuverDisplayed = true
      } else {
        $('div .maneuver-list').addClass('maneuver-is-stock');
        this.stockManeuverDisplayed = false
      }
    });
    html.find('.lock-unlock-sheet').click((event) => {
      this.options.editScore = !this.options.editScore;
      this.render(true);
--- a/modules/hero6-actor.js
+++ b/modules/hero6-actor.js
@ -4,7 +4,7 @@ import { Hero6RollDialog } from "./hero6-roll-dialog.js";
 import { Hero6LiftDice } from "./hero6-lift-dice.js";
 /* -------------------------------------------- */
-const __speed2Segments = [ [0], [7], [6, 12], [4, 8, 12], [3, 6, 9, 12], [3, 5, 8, 10, 12], [2, 4, 6, 8, 10, 12],
+const __speed2Segments = [[0], [7], [6, 12], [4, 8, 12], [3, 6, 9, 12], [3, 5, 8, 10, 12], [2, 4, 6, 8, 10, 12],
 [2, 4, 6, 7, 9, 11, 12], [2, 3, 5, 6, 8, 9, 11, 12], [2, 3, 4, 6, 7, 8, 10, 11, 12], [2, 3, 4, 5, 6, 8, 9, 10, 11, 12],
 [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]
@ -40,13 +40,11 @@ export class Hero6Actor extends Actor {
      return actor;
    }
-    if (data.type == 'character') {
+    if (data.type == 'character' || data.type == 'minion') {
      const maneuvers = await Hero6Utility.loadCompendium("fvtt-hero-system-6.maneuvers")
      let maneuversObj = maneuvers.map(i => i.toObject())
      data.items = maneuversObj.filter(m => m.system.isstock)
    }
    if (data.type == 'npc') {
    }
    return super.create(data, options);
  }
@ -62,14 +60,11 @@ export class Hero6Actor extends Actor {
  /* -------------------------------------------- */
  computeDerivatedData() {
-    if (this.type == "character") {
+    let newSTREND = this.computeSTREND()
-      let newSTREND = this.computeSTREND()
+    if (newSTREND != this.system.characteristics.str.strend) {
-      if (newSTREND != this.system.characteristics.str.strend) {
+      this.update({ 'system.characteristics.str.strend': newSTREND })
        this.update({ 'system.characteristics.str.strend': newSTREND })
      }
    }
  }
  /* -------------------------------------------- */
  performMigration() {
    // Fix OCV/OMCV rollable
@ -172,6 +167,19 @@ export class Hero6Actor extends Actor {
    }
    return item;
  }
  /* -------------------------------------------- */
  async _preCreate(data, options, user) {
    await super._preCreate(data, options, user);
    // Configure prototype token settings
    const prototypeToken = {};
    if (this.type === "character") Object.assign(prototypeToken, {
      sight: { enabled: true }, actorLink: true, disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
    });
    this.updateSource({ prototypeToken });
  }
  /* -------------------------------------------- */
  prepareSkill(skill) {
    skill.roll = 0
@ -208,7 +216,6 @@ export class Hero6Actor extends Actor {
        skill.roll = charac.roll
      }
    }
    console.log("SILL", skill)
    if (skill.system.levels > 0) {
      skill.roll += skill.system.levels
    }
@ -216,12 +223,20 @@ export class Hero6Actor extends Actor {
  /* -------------------------------------------- */
  prepareManeuver(maneuver) {
-    
+    if (maneuver.system.maneuvertype == "mental") {
-    maneuver.roll = 11 + this.system.characteristics.ocv.value
+      maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
-    if ( Number(maneuver.system.ocv)) {
+      if (Number(maneuver.system.omcv)) {
-      maneuver.roll += Number(maneuver.system.ocv)
+        maneuver.roll += (Number(maneuver.system.omcv) || 0)
      } else {
        maneuver.noOMCV = true
      }
    } else {
-      maneuver.noOCV = true
+      maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
      if (Number(maneuver.system.ocv)) {
        maneuver.roll += (Number(maneuver.system.ocv) || 0)
      } else {
        maneuver.noOCV = true
      }
    }
  }
@ -296,11 +311,18 @@ export class Hero6Actor extends Actor {
    let maneuvers = {
      general: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "general"),
      offensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "offensive"),
-      defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive")
+      defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive"),
      mental: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "mental")
    }
    Hero6Utility.sortArrayObjectsByName(maneuvers.general)
    Hero6Utility.sortArrayObjectsByName(maneuvers.offensive)
    Hero6Utility.sortArrayObjectsByName(maneuvers.defensive)
    Hero6Utility.sortArrayObjectsByName(maneuvers.mental)
    return maneuvers
  }
  getAllManeuvers() {
    let maneuvers = this.items.filter(item => item.type == "maneuver")
    Hero6Utility.sortArrayObjectsByName(maneuvers)
    return maneuvers
  }
  getNonStockManeuvers() {
@ -313,6 +335,11 @@ export class Hero6Actor extends Actor {
    Hero6Utility.sortArrayObjectsByName(list)
    return list
  }
  getMoneys() {
    let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "money");
    Hero6Utility.sortArrayObjectsByName(list)
    return list
  }
  getWeapons() {
    let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
    Hero6Utility.sortArrayObjectsByName(list)
@ -408,7 +435,7 @@ export class Hero6Actor extends Actor {
  /* -------------------------------------------- */
  async cleanCombat() {
    await this.setFlag("world", "hold-action", false)
-    await this.setFlag("world", "abort-action", { state: false, count: 0 } )
+    await this.setFlag("world", "abort-action", { state: false, count: 0 })
  }
  async holdAction() {
    await this.disableAbortAction()
@ -481,7 +508,7 @@ export class Hero6Actor extends Actor {
  }
  /* -------------------------------------------- */
  getBaseInit(turn) {
-    if ( turn != this.turn) {
+    if (turn != this.turn) {
      let r = new Roll("1d6").roll({ async: false })
      this.currentInit = Number(this.system.characteristics.dex.initiative) + Number(((r.total / 10).toFixed(2)))
      this.turn = turn
@ -516,8 +543,13 @@ export class Hero6Actor extends Actor {
  /* -------------------------------------------- */
  prepareCharacValues(charac) {
-    charac.total = charac.value
+    if (charac.label == "OCV" || charac.label == "OMCV" ) {
-    charac.roll = 9 + Math.round((charac.value) / 5)
+      charac.total = charac.value
      charac.roll = 11 + charac.value
    } else {
      charac.total = charac.value
      charac.roll = 9 + Math.round((charac.value) / 5)  
    }
  }
  prepareCharac() {
    let characs = duplicate(this.system.characteristics)
@ -531,7 +563,7 @@ export class Hero6Actor extends Actor {
      if (key == "spd") {
        ch.phasesString = this.getPhasesString()
      }
-      if (key =="pre") {
+      if (key == "pre") {
        ch.presenceattack = duplicate(this.system.biodata.presenceattack)
      }
    }
@ -623,12 +655,10 @@ export class Hero6Actor extends Actor {
        const ray = new Ray(token.object?.center || token.center, defenderToken.center)
        rollData.tokensDistance = canvas.grid.measureDistances([{ ray }], { gridSpaces: false })[0] / canvas.grid.grid.options.dimensions.distance
      } else {
-        ui.notifications.info("No token connected to this actor, unable to compute distance.")
+        //ui.notifications.info("No token connected to this actor, unable to compute distance.")
-        return
+        //return
      }
      if (defender) {
        rollData.forceAdvantage = defender.isAttackerAdvantage()
        rollData.advantageFromTarget = true
      }
    }
    console.log("ROLLDATA", rollData)
@ -681,18 +711,32 @@ export class Hero6Actor extends Actor {
    rollData.title = item.name
    rollData.diceFormula = Hero6Utility.convertRollHeroSyntax(item.system.damage)
    let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
-    await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+    //await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
    rollData.roll = myRoll
    rollData.result = myRoll.total
    rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll)
    let mult
    if (item.system.damageeffect == "killing") { // As per issue #11
      mult = new Roll("1d3").roll({ async: false })
      rollData.killingMultiplier = mult.total
      rollData.stunValue = (Number(myRoll.total) * Number(mult.total)) + (Number(item.system.stunx) || 0)
    } else {
      rollData.stunValue = myRoll.total
    }
    let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
    let msg = await rollData.roll.toMessage({
      user: game.user.id,
      rollMode: game.settings.get("core", "rollMode"),
      flavor: msgFlavor
    })
    if (mult) {
      await Hero6Utility.showDiceSoNice(mult, game.settings.get("core", "rollMode"))
    }
    rollData.roll = duplicate(rollData.roll) // Convert to object
    msg.setFlag("world", "rolldata", rollData)
    console.log("Rolldata result", rollData)
@ -720,28 +764,6 @@ export class Hero6Actor extends Actor {
    console.log("Rolldata result", rollData)
  }
  /* -------------------------------------------- */
  rollManeuver(maneuverId) {
    let skill = this.items.get(skillId)
    if (skill) {
      if (skill.system.islore && skill.system.level == 0) {
        ui.notifications.warn("You can't use Lore Skills with a SL of 0.")
        return
      }
      skill = duplicate(skill)
      Hero6Utility.updateSkill(skill)
      let abilityKey = skill.system.ability
      let rollData = this.getCommonRollData(abilityKey)
      rollData.mode = "skill"
      rollData.skill = skill
      rollData.img = skill.img
      if (rollData.target) {
        ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
        return
      }
      this.startRoll(rollData)
    }
  }
  /* -------------------------------------------- */
  rollSkill(skillId) {
    let skill = this.items.get(skillId)
    if (skill) {
@ -765,34 +787,54 @@ export class Hero6Actor extends Actor {
  }
  /* -------------------------------------------- */
-  rollWeapon(weaponId) {
+  async rollWeapon(weaponId) {
    let weapon = this.items.get(weaponId)
    if (weapon) {
      weapon = duplicate(weapon)
-      let skill = this.items.find(item => item.name.toLowerCase() == weapon.system.skill.toLowerCase())
+      let rollData = this.getCommonRollData()
-      if (skill) {
+      rollData.weaponRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
-        skill = duplicate(skill)
+      rollData.mode = "weapon"
-        Hero6Utility.updateSkill(skill)
+      rollData.weapon = weapon
-        let abilityKey = skill.system.ability
+      rollData.img = weapon.img
-        let rollData = this.getCommonRollData(abilityKey)
+      this.startRoll(rollData)
-        rollData.mode = "weapon"
+    } else {
-        rollData.skill = skill
+      ui.notifications.warn("Unable to find the  weapon " + weapon.name)
-        rollData.weapon = weapon
+    }
-        rollData.img = weapon.img
+  }
-        if (!rollData.forceDisadvantage) { // This is an attack, check if disadvantaged
+  /* -------------------------------------------- */
-          rollData.forceDisadvantage = this.isAttackDisadvantage()
+  rollMentalManeuver(maneuverId) {
-        }
+    let maneuver = this.items.get(maneuverId)
-        /*if (rollData.weapon.system.isranged && rollData.tokensDistance > Hero6Utility.getWeaponMaxRange(rollData.weapon) ) {
+    if (maneuver) {
-          ui.notifications.warn(`Your target is out of range of your weapon (max: ${Hero6Utility.getWeaponMaxRange(rollData.weapon)}  - current : ${rollData.tokensDistance})` )
+      maneuver = duplicate(maneuver)
-          return
+      let rollData = this.getCommonRollData()
-        }*/
+      rollData.maneuverRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
-        this.startRoll(rollData)
+      rollData.mode = "mentalmaneuver"
-      } else {
+      rollData.maneuver = maneuver
-        ui.notifications.warn("Unable to find the relevant skill for weapon " + weapon.name)
+      rollData.img = maneuver.img
-      }
+      this.startRoll(rollData)
    } else {
      ui.notifications.warn("Unable to find the maneuver " + maneuver.name)
    }
  }
  /* -------------------------------------------- */
  rollPowerAttack(powerId ) {
    let power = this.items.get(powerId)
    if (power) {
      power = duplicate(power)
      let rollData = this.getCommonRollData()
      if (power.system.attackvalue == "ocv")  {
        rollData.powerRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
      } else {
        rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
      }
      rollData.mode = "powerattack"
      rollData.power = power
      rollData.img = power.img
      this.startRoll(rollData)
    } else {
      ui.notifications.warn("Unable to find  power " + power.name)
    }
  }
  /* -------------------------------------------- */
  async startRoll(rollData) {
    let rollDialog = await Hero6RollDialog.create(this, rollData)
--- a/modules/hero6-combat.js
+++ b/modules/hero6-combat.js
@ -54,6 +54,9 @@ export class Hero6Combat extends Combat {
  /* -------------------------------------------- */
  constructor(data, context) {
    data.flags = { world: { turnData: { turnNumber: 0, segmentNumber: 12} } }
    super(data, context);
    this.turnNumber = 0;
@ -175,6 +178,56 @@ export class Hero6Combat extends Combat {
    }
  }
  /* -------------------------------------------- */
  async previousRound() {
    let hasCombatants = false
    let nextRound = this.round
    let advanceTime = 0
    let turn = this.turn === null ? null : 0; // Preserve the fact that it's no-one's turn currently.
    let turnData = this.getFlag("world", "turnData")
    //console.log("Next round called....", nextRound, turnData)
    while (!hasCombatants) {
      if (this.settings.skipDefeated && (turn !== null)) {
        turn = this.turns.findIndex(t => !t.isDefeated);
        if (turn === -1) {
          ui.notifications.warn("COMBAT.NoneRemaining", { localize: true });
          turn = 0;
        }
      }  
      advanceTime = -1 * (Math.max(this.turns.length - this.turn, 0) * CONFIG.time.turnTime);
      advanceTime -= CONFIG.time.roundTime;
      nextRound = nextRound -1
      //console.log("Next round called....2", nextRound, turnData)
      turnData = this.getFlag("world", "turnData")
      if (!turnData) {
        turnData = { turnNumber: 0, segmentNumber: 12 }
        this.setFlag("world", "turnData", turnData)
      }
      turnData = duplicate(turnData)
      turnData.segmentNumber -= 1
      if (turnData.segmentNumber <= 0) {
        turnData.segmentNumber = 12
        turnData.turnNumber--
      }
      await this.setFlag("world", "turnData", turnData)
      this.turnNumber = turnData.turnNumber;
      this.segmentNumber = turnData.segmentNumber;
      //console.log("Next round called....3", nextRound, turnData)
      // Re-compute init of actors
      hasCombatants = await this.rebuildInitiative()
      //console.log("Going round....", nextRound, hasCombatants)
    }
    // Update the document, passing data through a hook first
    const updateData = { round: nextRound, turn };
    const updateOptions = { advanceTime, direction: -1 };
    Hooks.callAll("combatRound", this, updateData, updateOptions);
    console.log(this)
    return this.update(updateData, updateOptions);
  }
  /* -------------------------------------------- */
  async nextRound() {
    let hasCombatants = false
@ -230,12 +283,13 @@ export class Hero6Combat extends Combat {
  /* -------------------------------------------- */
-  async _onCreateEmbeddedDocuments(type, documents, result, options, userId) {
+  async _onCreateDescendantDocuments(type, documents, result, options, userId) {
    //console.log("Added...")
-    await super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
+    if (game.user.isGM) {
-    await this.rebuildInitiative()
+      await super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
      await this.rebuildInitiative()
    }
  }
  /* -------------------------------------------- 
  _onUpdate(changed, options, userId) {
  }*/
--- a/modules/hero6-config.js
+++ b/modules/hero6-config.js
@ -10,7 +10,8 @@ export const Hero6_CONFIG = {
  maneuverTypes: {
    "general": "General",
    "offensive": "Offensive",
-    "defensive": "Defensive"
+    "defensive": "Defensive",
    "mental": "Mental"
  },
  rollCharac  : {
    "str": "Strength",
@ -21,6 +22,13 @@ export const Hero6_CONFIG = {
    "pre": "Presence",
    "manual": "Manual",
  },
  damageEffect: {
    "normal": "Normal",
    "killing": "Killing",
    "stunonly": "Stun Only",
    "bodyonly": "Body Only",
    "effect": "Effect"
  },
  skillType: {
    "agility": "Agility",
    "interaction": "Interaction",
@ -29,6 +37,10 @@ export const Hero6_CONFIG = {
    "combat": "Combat" ,
    "custom": "Custom"
  },
  attackTypes: {
    "ocv": "OCV",
    "omcv": "OMCV"
  },
  powerEquipmentType: {
    "adjustment": "Adjustment",
    "mental": "Mental",
@ -53,6 +65,5 @@ export const Hero6_CONFIG = {
    "standard": "Standard",
    "normal": "Normal",
    "killing": "Killing",
    "countbody": "Killing (Count BODY)"
  }
 }
--- a/modules/hero6-item-sheet.js
+++ b/modules/hero6-item-sheet.js
@ -147,13 +147,13 @@ export class Hero6ItemSheet extends ItemSheet {
    });
    html.find('.item-skill-profiency').click(ev => {
-      this.object.update( {'system.levels': 12, 'system.cost': 2} )
+      this.object.update( {'system.skillfamiliarity': false, 'system.cost': 2} )
    } )
    html.find('.item-skill-familiarity').click(ev => {
-      this.object.update( {'system.levels': 10, 'system.cost': 1} )
+      this.object.update( {'system.skillprofiency': false, 'system.cost': 1} )
    } )
    html.find('.item-skill-everyman').click(ev => {
-      this.object.update( {'system.levels': 8, 'system.cost': 0} )
+      this.object.update( {'system.cost': 0} )
    } )
    html.find('.view-subitem').click(ev => {
--- a/modules/hero6-main.js
+++ b/modules/hero6-main.js
@ -61,7 +61,7 @@ Hooks.once("init", async function () {
  // Register sheet application classes
  Actors.unregisterSheet("core", ActorSheet);
  Actors.registerSheet("fvtt-hero-system-6", Hero6ActorSheet, { types: ["character"], makeDefault: true });
-  Actors.registerSheet("fvtt-hero-system-6", Hero6NPCSheet, { types: ["npc"], makeDefault: false });
+  Actors.registerSheet("fvtt-hero-system-6", Hero6ActorSheet, { types: ["minion"], makeDefault: false });
  Items.unregisterSheet("core", ItemSheet);
  Items.registerSheet("fvtt-hero-system-6", Hero6ItemSheet, { makeDefault: true });
--- a/modules/hero6-utility.js
+++ b/modules/hero6-utility.js
@ -52,6 +52,9 @@ export class Hero6Utility {
      }
      return false
    })
    Handlebars.registerHelper('fixNum', function (value) {
      return Number(value) || 0
    })
    Handlebars.registerHelper('checkInit', function (value) {
      let myValue = Number(value) || 0
      return myValue > 0
@ -163,6 +166,7 @@ export class Hero6Utility {
      'systems/fvtt-hero-system-6/templates/partials/partial-options-abilities.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs',
      'systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs',
@ -342,6 +346,16 @@ export class Hero6Utility {
    // ability/save/size => 0
    let diceFormula = "3d6"
    let target = 10
    if(rollData.weapon) {
      target = rollData.weaponRoll
    }
    if(rollData.maneuver) {
      target = rollData.maneuverRoll
    }
    if(rollData.power) {
      target = rollData.powerRoll
    }
    if (rollData.charac) {
      target = rollData.charac.roll
    }
@ -355,7 +369,7 @@ export class Hero6Utility {
    let myRoll = rollData.roll
    if (!myRoll) { // New rolls only of no rerolls
      myRoll = new Roll(diceFormula).roll({ async: false })
-      await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+      //await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
    }
    rollData.roll = myRoll
--- a/packs/complications/000130.log
+++ b/packs/complications/000130.log
--- a/packs/complications/CURRENT
+++ b/packs/complications/CURRENT
@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000128
--- a/packs/complications/LOG
+++ b/packs/complications/LOG
@ -1,8 +1,8 @@
-2023/08/07-22:18:14.000526 7f5afddfa6c0 Recovering log #40
+2023/08/26-22:07:58.627561 7f2deaffd6c0 Recovering log #126
-2023/08/07-22:18:14.012956 7f5afddfa6c0 Delete type=3 #38
+2023/08/26-22:07:58.748615 7f2deaffd6c0 Delete type=3 #124
-2023/08/07-22:18:14.012989 7f5afddfa6c0 Delete type=0 #40
+2023/08/26-22:07:58.748679 7f2deaffd6c0 Delete type=0 #126
-2023/08/07-23:27:51.013130 7f58677fe6c0 Level-0 table #45: started
+2023/08/26-22:16:27.923271 7f2b69bff6c0 Level-0 table #131: started
-2023/08/07-23:27:51.013173 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/26-22:16:27.923312 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
-2023/08/07-23:27:51.019258 7f58677fe6c0 Delete type=0 #43
+2023/08/26-22:16:27.929503 7f2b69bff6c0 Delete type=0 #129
-2023/08/07-23:27:51.040432 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949795 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/07-23:27:51.040586 7f58677fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949837 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
--- a/packs/complications/LOG.old
+++ b/packs/complications/LOG.old
@ -1,8 +1,8 @@
-2023/08/07-22:00:56.735452 7f5afd5f96c0 Recovering log #36
+2023/08/26-21:35:11.738363 7f2dea7fc6c0 Recovering log #122
-2023/08/07-22:00:56.833916 7f5afd5f96c0 Delete type=3 #34
+2023/08/26-21:35:11.748913 7f2dea7fc6c0 Delete type=3 #120
-2023/08/07-22:00:56.833991 7f5afd5f96c0 Delete type=0 #36
+2023/08/26-21:35:11.749017 7f2dea7fc6c0 Delete type=0 #122
-2023/08/07-22:18:10.662583 7f58677fe6c0 Level-0 table #41: started
+2023/08/26-21:46:54.280176 7f2b69bff6c0 Level-0 table #127: started
-2023/08/07-22:18:10.662627 7f58677fe6c0 Level-0 table #41: 0 bytes OK
+2023/08/26-21:46:54.280220 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
-2023/08/07-22:18:10.668688 7f58677fe6c0 Delete type=0 #39
+2023/08/26-21:46:54.287757 7f2b69bff6c0 Delete type=0 #125
-2023/08/07-22:18:10.668861 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.294397 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/07-22:18:10.668891 7f58677fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.294492 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
--- a/packs/complications/MANIFEST-000042
+++ b/packs/complications/MANIFEST-000042
--- a/packs/complications/MANIFEST-000128
+++ b/packs/complications/MANIFEST-000128
--- a/packs/equipment/000099.ldb
+++ b/packs/equipment/000099.ldb
--- a/packs/equipment/000132.log
+++ b/packs/equipment/000132.log
--- a/packs/equipment/CURRENT
+++ b/packs/equipment/CURRENT
@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000130
--- a/packs/equipment/LOG
+++ b/packs/equipment/LOG
@ -1,7 +1,8 @@
-2023/08/07-22:18:13.969369 7f5afd5f96c0 Recovering log #40
+2023/08/26-22:07:58.520995 7f2deb7fe6c0 Recovering log #128
-2023/08/07-22:18:13.978774 7f5afd5f96c0 Delete type=3 #38
+2023/08/26-22:07:58.608948 7f2deb7fe6c0 Delete type=3 #126
-2023/08/07-22:18:13.978872 7f5afd5f96c0 Delete type=0 #40
+2023/08/26-22:07:58.609004 7f2deb7fe6c0 Delete type=0 #128
-2023/08/07-23:27:50.976450 7f58677fe6c0 Level-0 table #45: started
+2023/08/26-22:16:27.903755 7f2b69bff6c0 Level-0 table #133: started
-2023/08/07-23:27:50.976502 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/26-22:16:27.903791 7f2b69bff6c0 Level-0 table #133: 0 bytes OK
-2023/08/07-23:27:50.982719 7f58677fe6c0 Delete type=0 #43
+2023/08/26-22:16:27.909699 7f2b69bff6c0 Delete type=0 #131
-2023/08/07-23:27:50.982828 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.916391 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
 2023/08/26-22:16:27.923165 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
--- a/packs/equipment/LOG.old
+++ b/packs/equipment/LOG.old
@ -1,7 +1,8 @@
-2023/08/07-22:00:56.587410 7f5afd5f96c0 Recovering log #36
+2023/08/26-21:35:11.724122 7f2deb7fe6c0 Recovering log #124
-2023/08/07-22:00:56.639569 7f5afd5f96c0 Delete type=3 #34
+2023/08/26-21:35:11.735212 7f2deb7fe6c0 Delete type=3 #122
-2023/08/07-22:00:56.639645 7f5afd5f96c0 Delete type=0 #36
+2023/08/26-21:35:11.735277 7f2deb7fe6c0 Delete type=0 #124
-2023/08/07-22:18:10.624177 7f58677fe6c0 Level-0 table #41: started
+2023/08/26-21:46:54.246960 7f2b69bff6c0 Level-0 table #129: started
-2023/08/07-22:18:10.624214 7f58677fe6c0 Level-0 table #41: 0 bytes OK
+2023/08/26-21:46:54.247029 7f2b69bff6c0 Level-0 table #129: 0 bytes OK
-2023/08/07-22:18:10.632567 7f58677fe6c0 Delete type=0 #39
+2023/08/26-21:46:54.253553 7f2b69bff6c0 Delete type=0 #127
-2023/08/07-22:18:10.642835 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.253849 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
 2023/08/26-21:46:54.266229 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
--- a/packs/equipment/MANIFEST-000042
+++ b/packs/equipment/MANIFEST-000042
--- a/packs/equipment/MANIFEST-000130
+++ b/packs/equipment/MANIFEST-000130
--- a/packs/maneuvers/000116.ldb
+++ b/packs/maneuvers/000116.ldb
--- a/packs/maneuvers/000123.log
+++ b/packs/maneuvers/000123.log
--- a/packs/maneuvers/CURRENT
+++ b/packs/maneuvers/CURRENT
@ -1 +1 @@
-MANIFEST-000034
+MANIFEST-000121
--- a/packs/maneuvers/LOG
+++ b/packs/maneuvers/LOG
@ -1,8 +1,8 @@
-2023/08/07-22:18:14.000527 7f5afd5f96c0 Recovering log #32
+2023/08/26-22:07:58.730640 7f2deb7fe6c0 Recovering log #119
-2023/08/07-22:18:14.012956 7f5afd5f96c0 Delete type=3 #30
+2023/08/26-22:07:58.841210 7f2deb7fe6c0 Delete type=3 #117
-2023/08/07-22:18:14.012992 7f5afd5f96c0 Delete type=0 #32
+2023/08/26-22:07:58.841288 7f2deb7fe6c0 Delete type=0 #119
-2023/08/07-23:27:51.026690 7f58677fe6c0 Level-0 table #37: started
+2023/08/26-22:16:27.936844 7f2b69bff6c0 Level-0 table #124: started
-2023/08/07-23:27:51.026730 7f58677fe6c0 Level-0 table #37: 0 bytes OK
+2023/08/26-22:16:27.936868 7f2b69bff6c0 Level-0 table #124: 0 bytes OK
-2023/08/07-23:27:51.033892 7f58677fe6c0 Delete type=0 #35
+2023/08/26-22:16:27.942975 7f2b69bff6c0 Delete type=0 #122
-2023/08/07-23:27:51.040520 7f58677fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949818 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/07-23:27:51.040625 7f58677fe6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949853 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
--- a/packs/maneuvers/LOG.old
+++ b/packs/maneuvers/LOG.old
@ -1,8 +1,8 @@
-2023/08/07-22:00:56.752593 7f5afcdf86c0 Recovering log #28
+2023/08/26-21:35:11.751865 7f2debfff6c0 Recovering log #114
-2023/08/07-22:00:56.851595 7f5afcdf86c0 Delete type=3 #26
+2023/08/26-21:35:11.761906 7f2debfff6c0 Delete type=3 #112
-2023/08/07-22:00:56.851652 7f5afcdf86c0 Delete type=0 #28
+2023/08/26-21:35:11.761967 7f2debfff6c0 Delete type=0 #114
-2023/08/07-22:18:10.668942 7f58677fe6c0 Level-0 table #33: started
+2023/08/26-21:46:54.287966 7f2b69bff6c0 Level-0 table #120: started
-2023/08/07-22:18:10.668989 7f58677fe6c0 Level-0 table #33: 0 bytes OK
+2023/08/26-21:46:54.288007 7f2b69bff6c0 Level-0 table #120: 0 bytes OK
-2023/08/07-22:18:10.675320 7f58677fe6c0 Delete type=0 #31
+2023/08/26-21:46:54.294193 7f2b69bff6c0 Delete type=0 #118
-2023/08/07-22:18:10.691036 7f58677fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.294471 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/07-22:18:10.691069 7f58677fe6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.294512 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
--- a/packs/maneuvers/MANIFEST-000034
+++ b/packs/maneuvers/MANIFEST-000034
--- a/packs/maneuvers/MANIFEST-000121
+++ b/packs/maneuvers/MANIFEST-000121
--- a/packs/perks/000130.log
+++ b/packs/perks/000130.log
--- a/packs/perks/CURRENT
+++ b/packs/perks/CURRENT
@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000128
--- a/packs/perks/LOG
+++ b/packs/perks/LOG
@ -1,8 +1,8 @@
-2023/08/07-22:18:14.015482 7f5afcdf86c0 Recovering log #40
+2023/08/26-22:07:58.751122 7f2dea7fc6c0 Recovering log #126
-2023/08/07-22:18:14.031405 7f5afcdf86c0 Delete type=3 #38
+2023/08/26-22:07:58.864497 7f2dea7fc6c0 Delete type=3 #124
-2023/08/07-22:18:14.031513 7f5afcdf86c0 Delete type=0 #40
+2023/08/26-22:07:58.864580 7f2dea7fc6c0 Delete type=0 #126
-2023/08/07-23:27:51.019445 7f58677fe6c0 Level-0 table #45: started
+2023/08/26-22:16:27.929655 7f2b69bff6c0 Level-0 table #131: started
-2023/08/07-23:27:51.019492 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/26-22:16:27.929696 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
-2023/08/07-23:27:51.026550 7f58677fe6c0 Delete type=0 #43
+2023/08/26-22:16:27.936745 7f2b69bff6c0 Delete type=0 #129
-2023/08/07-23:27:51.040470 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949807 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/07-23:27:51.040607 7f58677fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949861 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
--- a/packs/perks/LOG.old
+++ b/packs/perks/LOG.old
@ -1,8 +1,8 @@
-2023/08/07-22:00:56.836453 7f5afd5f96c0 Recovering log #36
+2023/08/26-21:35:11.751864 7f2deaffd6c0 Recovering log #122
-2023/08/07-22:00:56.950488 7f5afd5f96c0 Delete type=3 #34
+2023/08/26-21:35:11.761866 7f2deaffd6c0 Delete type=3 #120
-2023/08/07-22:00:56.950642 7f5afd5f96c0 Delete type=0 #36
+2023/08/26-21:35:11.761921 7f2deaffd6c0 Delete type=0 #122
-2023/08/07-22:18:10.683235 7f58677fe6c0 Level-0 table #41: started
+2023/08/26-21:46:54.294564 7f2b69bff6c0 Level-0 table #127: started
-2023/08/07-22:18:10.683286 7f58677fe6c0 Level-0 table #41: 0 bytes OK
+2023/08/26-21:46:54.294620 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
-2023/08/07-22:18:10.690928 7f58677fe6c0 Delete type=0 #39
+2023/08/26-21:46:54.302478 7f2b69bff6c0 Delete type=0 #125
-2023/08/07-22:18:10.691057 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.309946 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/07-22:18:10.691082 7f58677fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.310020 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
--- a/packs/perks/MANIFEST-000042
+++ b/packs/perks/MANIFEST-000042
--- a/packs/perks/MANIFEST-000128
+++ b/packs/perks/MANIFEST-000128
--- a/packs/powers/000013.ldb
+++ b/packs/powers/000013.ldb
--- a/packs/powers/000062.ldb
+++ b/packs/powers/000062.ldb
--- a/packs/powers/000131.log
+++ b/packs/powers/000131.log
--- a/packs/powers/CURRENT
+++ b/packs/powers/CURRENT
@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000129
--- a/packs/powers/LOG
+++ b/packs/powers/LOG
@ -1,8 +1,8 @@
-2023/08/07-22:18:13.982354 7f5afd5f96c0 Recovering log #40
+2023/08/26-22:07:58.612145 7f2debfff6c0 Recovering log #127
-2023/08/07-22:18:13.997957 7f5afd5f96c0 Delete type=3 #38
+2023/08/26-22:07:58.728418 7f2debfff6c0 Delete type=3 #125
-2023/08/07-22:18:13.998008 7f5afd5f96c0 Delete type=0 #40
+2023/08/26-22:07:58.728498 7f2debfff6c0 Delete type=0 #127
-2023/08/07-23:27:51.005564 7f58677fe6c0 Level-0 table #45: started
+2023/08/26-22:16:27.916401 7f2b69bff6c0 Level-0 table #132: started
-2023/08/07-23:27:51.005735 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/26-22:16:27.916423 7f2b69bff6c0 Level-0 table #132: 0 bytes OK
-2023/08/07-23:27:51.012861 7f58677fe6c0 Delete type=0 #43
+2023/08/26-22:16:27.923048 7f2b69bff6c0 Delete type=0 #130
-2023/08/07-23:27:51.013069 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.923174 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/07-23:27:51.013100 7f58677fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.923191 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
--- a/packs/powers/LOG.old
+++ b/packs/powers/LOG.old
@ -1,8 +1,8 @@
-2023/08/07-22:00:56.642444 7f5afcdf86c0 Recovering log #36
+2023/08/26-21:35:11.738380 7f2deaffd6c0 Recovering log #123
-2023/08/07-22:00:56.750892 7f5afcdf86c0 Delete type=3 #34
+2023/08/26-21:35:11.748807 7f2deaffd6c0 Delete type=3 #121
-2023/08/07-22:00:56.750934 7f5afcdf86c0 Delete type=0 #36
+2023/08/26-21:35:11.748868 7f2deaffd6c0 Delete type=0 #123
-2023/08/07-22:18:10.655429 7f58677fe6c0 Level-0 table #41: started
+2023/08/26-21:46:54.273097 7f2b69bff6c0 Level-0 table #128: started
-2023/08/07-22:18:10.655482 7f58677fe6c0 Level-0 table #41: 0 bytes OK
+2023/08/26-21:46:54.273141 7f2b69bff6c0 Level-0 table #128: 0 bytes OK
-2023/08/07-22:18:10.662426 7f58677fe6c0 Delete type=0 #39
+2023/08/26-21:46:54.279970 7f2b69bff6c0 Delete type=0 #126
-2023/08/07-22:18:10.668849 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.287948 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/07-22:18:10.668882 7f58677fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.294448 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
--- a/packs/powers/MANIFEST-000042
+++ b/packs/powers/MANIFEST-000042
--- a/packs/powers/MANIFEST-000129
+++ b/packs/powers/MANIFEST-000129
--- a/packs/skills/000130.log
+++ b/packs/skills/000130.log
--- a/packs/skills/CURRENT
+++ b/packs/skills/CURRENT
@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000128
--- a/packs/skills/LOG
+++ b/packs/skills/LOG
@ -1,8 +1,8 @@
-2023/08/07-22:18:13.982353 7f5afddfa6c0 Recovering log #40
+2023/08/26-22:07:58.521207 7f2dea7fc6c0 Recovering log #126
-2023/08/07-22:18:13.997971 7f5afddfa6c0 Delete type=3 #38
+2023/08/26-22:07:58.625202 7f2dea7fc6c0 Delete type=3 #124
-2023/08/07-22:18:13.998032 7f5afddfa6c0 Delete type=0 #40
+2023/08/26-22:07:58.625257 7f2dea7fc6c0 Delete type=0 #126
-2023/08/07-23:27:50.999438 7f58677fe6c0 Level-0 table #45: started
+2023/08/26-22:16:27.909865 7f2b69bff6c0 Level-0 table #131: started
-2023/08/07-23:27:50.999471 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/26-22:16:27.909908 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
-2023/08/07-23:27:51.005436 7f58677fe6c0 Delete type=0 #43
+2023/08/26-22:16:27.916292 7f2b69bff6c0 Delete type=0 #129
-2023/08/07-23:27:51.013039 7f58677fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.923145 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/07-23:27:51.013085 7f58677fe6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.923202 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
--- a/packs/skills/LOG.old
+++ b/packs/skills/LOG.old
@ -1,8 +1,8 @@
-2023/08/07-22:00:56.642359 7f5afd5f96c0 Recovering log #36
+2023/08/26-21:35:11.724122 7f2debfff6c0 Recovering log #122
-2023/08/07-22:00:56.733205 7f5afd5f96c0 Delete type=3 #34
+2023/08/26-21:35:11.735216 7f2debfff6c0 Delete type=3 #120
-2023/08/07-22:00:56.733486 7f5afd5f96c0 Delete type=0 #36
+2023/08/26-21:35:11.735320 7f2debfff6c0 Delete type=0 #122
-2023/08/07-22:18:10.649211 7f58677fe6c0 Level-0 table #41: started
+2023/08/26-21:46:54.266256 7f2b69bff6c0 Level-0 table #127: started
-2023/08/07-22:18:10.649245 7f58677fe6c0 Level-0 table #41: 0 bytes OK
+2023/08/26-21:46:54.266300 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
-2023/08/07-22:18:10.655255 7f58677fe6c0 Delete type=0 #39
+2023/08/26-21:46:54.272914 7f2b69bff6c0 Delete type=0 #125
-2023/08/07-22:18:10.668835 7f58677fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.287925 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/07-22:18:10.668872 7f58677fe6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.294424 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
--- a/packs/skills/MANIFEST-000042
+++ b/packs/skills/MANIFEST-000042
--- a/packs/skills/MANIFEST-000128
+++ b/packs/skills/MANIFEST-000128
--- a/packs/talents/000130.log
+++ b/packs/talents/000130.log
--- a/packs/talents/CURRENT
+++ b/packs/talents/CURRENT
@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000128
--- a/packs/talents/LOG
+++ b/packs/talents/LOG
@ -1,8 +1,8 @@
-2023/08/07-22:18:14.015482 7f5afd5f96c0 Recovering log #40
+2023/08/26-22:07:58.844046 7f2debfff6c0 Recovering log #126
-2023/08/07-22:18:14.034395 7f5afd5f96c0 Delete type=3 #38
+2023/08/26-22:07:58.925665 7f2debfff6c0 Delete type=3 #124
-2023/08/07-22:18:14.034433 7f5afd5f96c0 Delete type=0 #40
+2023/08/26-22:07:58.926331 7f2debfff6c0 Delete type=0 #126
-2023/08/07-23:27:51.034000 7f58677fe6c0 Level-0 table #45: started
+2023/08/26-22:16:27.943060 7f2b69bff6c0 Level-0 table #131: started
-2023/08/07-23:27:51.034031 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/26-22:16:27.943083 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
-2023/08/07-23:27:51.040235 7f58677fe6c0 Delete type=0 #43
+2023/08/26-22:16:27.949677 7f2b69bff6c0 Delete type=0 #129
-2023/08/07-23:27:51.040547 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949829 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/07-23:27:51.040656 7f58677fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949845 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
--- a/packs/talents/LOG.old
+++ b/packs/talents/LOG.old
@ -1,8 +1,8 @@
-2023/08/07-22:00:56.853665 7f5afcdf86c0 Recovering log #36
+2023/08/26-21:35:11.765241 7f2dea7fc6c0 Recovering log #122
-2023/08/07-22:00:56.969522 7f5afcdf86c0 Delete type=3 #34
+2023/08/26-21:35:11.781642 7f2dea7fc6c0 Delete type=3 #120
-2023/08/07-22:00:56.969559 7f5afcdf86c0 Delete type=0 #36
+2023/08/26-21:35:11.781702 7f2dea7fc6c0 Delete type=0 #122
-2023/08/07-22:18:10.675457 7f58677fe6c0 Level-0 table #41: started
+2023/08/26-21:46:54.302747 7f2b69bff6c0 Level-0 table #127: started
-2023/08/07-22:18:10.675493 7f58677fe6c0 Level-0 table #41: 0 bytes OK
+2023/08/26-21:46:54.302821 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
-2023/08/07-22:18:10.683073 7f58677fe6c0 Delete type=0 #39
+2023/08/26-21:46:54.309685 7f2b69bff6c0 Delete type=0 #125
-2023/08/07-22:18:10.691049 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.309987 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/07-22:18:10.691077 7f58677fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-21:46:54.310051 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
--- a/packs/talents/MANIFEST-000042
+++ b/packs/talents/MANIFEST-000042
--- a/packs/talents/MANIFEST-000128
+++ b/packs/talents/MANIFEST-000128
--- a/packs/weapons/000088.log
+++ b/packs/weapons/000088.log
--- a/packs/weapons/CURRENT
+++ b/packs/weapons/CURRENT
@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000086
--- a/packs/weapons/LOG
+++ b/packs/weapons/LOG
@ -1,7 +1,7 @@
-2023/08/07-22:18:13.969369 7f5afddfa6c0 Recovering log #40
+2023/08/24-15:57:43.392826 7fab4affd6c0 Recovering log #84
-2023/08/07-22:18:13.978774 7f5afddfa6c0 Delete type=3 #38
+2023/08/24-15:57:43.403060 7fab4affd6c0 Delete type=3 #82
-2023/08/07-22:18:13.978889 7f5afddfa6c0 Delete type=0 #40
+2023/08/24-15:57:43.403157 7fab4affd6c0 Delete type=0 #84
-2023/08/07-23:27:50.992870 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-15:59:11.995583 7fab497fa6c0 Level-0 table #89: started
-2023/08/07-23:27:50.992899 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-15:59:11.995614 7fab497fa6c0 Level-0 table #89: 0 bytes OK
-2023/08/07-23:27:50.999291 7f58677fe6c0 Delete type=0 #43
+2023/08/24-15:59:12.004480 7fab497fa6c0 Delete type=0 #87
-2023/08/07-23:27:51.013019 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/24-15:59:12.025495 7fab497fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
--- a/packs/weapons/LOG.old
+++ b/packs/weapons/LOG.old
@ -1,7 +1,7 @@
-2023/08/07-22:00:56.587421 7f5afcdf86c0 Recovering log #36
+2023/08/24-15:09:37.452353 7fab4b7fe6c0 Recovering log #80
-2023/08/07-22:00:56.639569 7f5afcdf86c0 Delete type=3 #34
+2023/08/24-15:09:37.462595 7fab4b7fe6c0 Delete type=3 #78
-2023/08/07-22:00:56.639646 7f5afcdf86c0 Delete type=0 #36
+2023/08/24-15:09:37.462673 7fab4b7fe6c0 Delete type=0 #80
-2023/08/07-22:18:10.642928 7f58677fe6c0 Level-0 table #41: started
+2023/08/24-15:56:20.976153 7fab497fa6c0 Level-0 table #85: started
-2023/08/07-22:18:10.642973 7f58677fe6c0 Level-0 table #41: 0 bytes OK
+2023/08/24-15:56:20.976179 7fab497fa6c0 Level-0 table #85: 0 bytes OK
-2023/08/07-22:18:10.649077 7f58677fe6c0 Delete type=0 #39
+2023/08/24-15:56:20.984268 7fab497fa6c0 Delete type=0 #83
-2023/08/07-22:18:10.668818 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/24-15:56:20.984458 7fab497fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
--- a/packs/weapons/MANIFEST-000042
+++ b/packs/weapons/MANIFEST-000042
--- a/packs/weapons/MANIFEST-000086
+++ b/packs/weapons/MANIFEST-000086
--- a/styles/simple.css
+++ b/styles/simple.css
@ -649,6 +649,11 @@ ul, li {
  align-content: center;
 }
 .content-center {
  align-content: center;
  text-align: center;
 }
 .attribut-value,
 .carac-value {
  flex-grow: 0;
@ -1147,8 +1152,8 @@ ul, li {
 }
 #logo {
-  content : url(../images/ui/crucible_game_logo.png);
+  content : url(../images/ui/logo_hex_yellow_01.webp);
-  width: 100px;
+  width: 60px;
  height: 60px;
 }
@ -1360,6 +1365,7 @@ Focus FOC: #ff0084
  flex-grow:1;
  max-width: 8rem;
  min-width: 8rem;
  text-align: start;
 }
 .item-field-text-long {
  flex-grow:1;
@ -1410,7 +1416,12 @@ Focus FOC: #ff0084
 }
 .item-controls-fixed {
  min-width:2rem;
-  max-width: 2rem;
+  /*max-width: 2rem;*/
 }
 .item-controls-fixed-small {
  min-width:1rem;
  font-size: 0.8rem;
  /*max-width: 2rem;*/
 }
 .biodata-portrait {
  min-height: 512px;
@ -1426,3 +1437,10 @@ Focus FOC: #ff0084
 .margin-left-8 {
  margin-left: 8px;
 }
 .maneuver-is-stock {
  display: none;
  visibility: hidden;
 }
 .compendium .directory-list .directory-item .folder-header h3 {
  color:#000
 }
--- a/system.json
+++ b/system.json
@ -5,7 +5,7 @@
      "flags": {}
    }
  ],
-  "description": "Hero System v6 for FoundryVTT (Official)",
+  "description": "Hero System 6E for FoundryVTT (Official)",
  "esmodules": [
    "modules/hero6-main.js"
  ],
@ -30,15 +30,6 @@
      "private": false,
      "flags": {}
    },
    {
      "type": "Item",
      "label": "Weapons",
      "name": "weapons",
      "path": "packs/weapons.db",
      "system": "fvtt-hero-system-6",
      "private": false,
      "flags": {}
    },
    {
      "type": "Item",
      "label": "Skills",
@ -100,15 +91,15 @@
  "styles": [
    "styles/simple.css"
  ],
-  "version": "11.0.2",
+  "version": "11.0.17",
  "compatibility": {
    "minimum": "11",
    "verified": "11"
  },
-  "title": "Hero System v6 for FoundrtVTT (Official)",
+  "title": "Hero System 6E Basic (Official)",
-  "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
+  "manifest": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.1.zip",   
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.17.zip",
-  "url": "https://www.uberwald.me/gitea/uberwald/",
+  "url": "https://www.uberwald.me/public/uberwald/",
  "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp",
  "id": "fvtt-hero-system-6"
 }
--- a/template.json
+++ b/template.json
@ -1,7 +1,8 @@
 {
  "Actor": {
    "types": [
-      "character"
+      "character",
      "minion"
    ],
    "templates": {
      "biodata": {
@ -309,6 +310,15 @@
        "movements"
      ],
      "subactors": []
    },
    "minion": {
      "templates": [
        "biodata",
        "characteristics",
        "defenses",
        "movements"
      ],
      "subactors": []
    }
  },
  "Item": {
@ -344,9 +354,12 @@
        "levels": 0,
        "quantity": 1,
        "range": "",
        "damageeffect": "normal",
        "damage": "",
        "stunx": 0,
        "endurance": 0,
        "hasroll": false,
        "attackvalue": "ocv",
        "roll": 0,
        "computebody": false,
        "haseffectroll": false,
@ -365,6 +378,8 @@
      "pha": "",
      "ocv": "",
      "dcv" : "",
      "omcv": "",
      "dmcv" : "",
      "isstock": false,
      "active": false
    },
@ -406,7 +421,19 @@
      "subtype": "equipment",
      "value": 0,
      "weight": 0,
-      "moneycost": 0
+      "moneycost": 0,
      "ocv": 0,
      "omcv": 0,
      "dmcv": 0,
      "rmod": 0,
      "pd": 0,
      "ed": 0,
      "rpd": 0, 
      "red": 0,
      "mentaldefense": 0,
      "powerdefense": 0,
      "flashdefense": 0,
      "otherdefense": 0
    },
    "attack": {
      "templates": [
--- a/templates/actors/actor-sheet.hbs
+++ b/templates/actors/actor-sheet.hbs
@ -18,54 +18,60 @@
            <ul class="item-list alternate-list">
              <li class="item flexrow">
                <label class="item-field-label-medium">Alternate IDs</label>
-                <input type="text" class="item-field-label-long4" name="system.biodata.alternateids" value="{{system.biodata.origin}}"
+                <input type="text" class="item-field-label-long4" name="system.biodata.alternateids"
-                  data-dtype="String" />
+                  value="{{system.biodata.origin}}" data-dtype="String" />
              </li>
            </ul>
          </div>
          <div class="grid grid-2col">
            <div>
-            <ul class="item-list alternate-list">
+              <ul class="item-list alternate-list">
-              <li class="flexrow item">
+                <li class="flexrow item">
-                <label class="item-field-label-medium">Campaign</label>
+                  <label class="item-field-label-medium">Campaign</label>
-                <input type="text" class="item-field-label-long3" name="system.biodata.campaign" value="{{system.biodata.campaign}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-long3" name="system.biodata.campaign"
-              </li>
+                    value="{{system.biodata.campaign}}" data-dtype="String" />
-              <li class="flexrow item">
+                </li>
-                <label class="item-field-label-medium">Player</label>
+                <li class="flexrow item">
-                <input type="text" class="item-field-label-long3" name="system.biodata.player" value="{{system.biodata.player}}"
+                  <label class="item-field-label-medium">Player</label>
-                  data-dtype="String" />
+                  <input type="text" class="item-field-label-long3" name="system.biodata.player"
-              </li>
+                    value="{{system.biodata.player}}" data-dtype="String" />
-              <li class="flexrow item">
+                </li>
-                <label class="item-field-label-medium">GM</label>
+                <li class="flexrow item">
-                <input type="text" class="item-field-label-long3" name="system.biodata.gm" value="{{system.biodata.gm}}"
+                  <label class="item-field-label-medium">GM</label>
-                  data-dtype="String" />
+                  <input type="text" class="item-field-label-long3" name="system.biodata.gm"
-              </li>
+                    value="{{system.biodata.gm}}" data-dtype="String" />
-              <li class="item flexrow">
+                </li>
-                <label class="item-field-label-medium">Hair</label>
+                <li class="item flexrow">
-                <input type="text" class="item-field-label-long3" name="system.biodata.hair" value="{{system.biodata.hair}}" data-dtype="String" />
+                  <label class="item-field-label-medium">Hair</label>
-              </li>
+                  <input type="text" class="item-field-label-long3" name="system.biodata.hair"
-            </ul>
+                    value="{{system.biodata.hair}}" data-dtype="String" />
                </li>
              </ul>
            </div>
            <div>
-            <ul class="item-list alternate-list">
+              <ul class="item-list alternate-list">
-              <li class="flexrow item">
+                <li class="flexrow item">
-                <label class="item-field-label-medium">Gender</label>
+                  <label class="item-field-label-medium">Gender</label>
-                <input type="text" class="item-field-label-medium" name="system.biodata.gender" value="{{system.biodata.gender}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-medium" name="system.biodata.gender"
-              </li>
+                    value="{{system.biodata.gender}}" data-dtype="String" />
-              <li class="item flexrow">
+                </li>
-                <label class="item-field-label-medium">Height</label>
+                <li class="item flexrow">
-                <input type="text" class="item-field-label-medium" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
+                  <label class="item-field-label-medium">Height</label>
-              </li>
+                  <input type="text" class="item-field-label-medium" name="system.biodata.height"
-              <li class="item flexrow">
+                    value="{{system.biodata.height}}" data-dtype="String" />
-                <label class="item-field-label-medium">Mass</label>
+                </li>
-                <input type="text" class="item-field-label-medium" name="system.biodata.mass" value="{{system.biodata.mass}}" data-dtype="String" />
+                <li class="item flexrow">
-              </li>
+                  <label class="item-field-label-medium">Mass</label>
-              <li class="item flexrow">
+                  <input type="text" class="item-field-label-medium" name="system.biodata.mass"
-                <label class="item-field-label-medium">Eyes</label>
+                    value="{{system.biodata.mass}}" data-dtype="String" />
-                <input type="text" class="item-field-label-medium" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
+                </li>
-              </li>
+                <li class="item flexrow">
-            </ul>
+                  <label class="item-field-label-medium">Eyes</label>
                  <input type="text" class="item-field-label-medium" name="system.biodata.eyes"
                    value="{{system.biodata.eyes}}" data-dtype="String" />
                </li>
              </ul>
            </div>
          </div>
@ -73,19 +79,23 @@
            <ul class="item-list alternate-list">
              <li class="item flexrow">
                <label class="item-field-label-medium">Points</label>
-                <input type="text" class="item-field-label-short" name="system.biodata.points" value="{{system.biodata.origin}}" data-dtype="Number" />
+                <input type="text" class="item-field-label-short" name="system.biodata.points"
                  value="{{system.biodata.origin}}" data-dtype="Number" />
                <label class="">&nbsp;</label>
                <label class="item-field-label-medium">Complications</label>
-                <input type="text" class="item-field-label-short" name="system.biodata.complications" value="{{system.biodata.complications}}" data-dtype="Number" />
+                <input type="text" class="item-field-label-short" name="system.biodata.complications"
                  value="{{system.biodata.complications}}" data-dtype="Number" />
                <label class="">&nbsp;</label>
                <label class="item-field-label-medium">XP Earned</label>
-                <input type="text" class="item-field-label-short" name="system.biodata.xpearned" value="{{system.biodata.xpearned}}" data-dtype="Number" />
+                <input type="text" class="item-field-label-short" name="system.biodata.xpearned"
                  value="{{system.biodata.xpearned}}" data-dtype="Number" />
                <label class="">&nbsp;</label>
                <label class="item-field-label-medium">XP Spent</label>
-                <input type="text" class="item-field-label-short" name="system.biodata.xpspent" value="{{system.biodata.xpspent}}" data-dtype="Number" />
+                <input type="text" class="item-field-label-short" name="system.biodata.xpspent"
                  value="{{system.biodata.xpspent}}" data-dtype="Number" />
                <label class="">&nbsp;</label>
              </li>
            </ul>
@ -119,7 +129,7 @@
    <div class="tab combat" data-group="primary" data-tab="combat">
      <div class="grid grid2col">
-          <div>
+        <div>
          <ul class="item-list alternate-list">
            <li class="item">
              <label class="item-field-label-medium">STR Dice</label>
@ -127,60 +137,79 @@
              <label class="item-field-label-short">&nbsp;</label>
              <label class="item-field-label-medium">Lift</label>
-              <input type="text" class="item-field-label-short update-field" disabled data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
+              <input type="text" class="item-field-label-short update-field" disabled
                data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}"
                data-dtype="String" />
              <label class="item-field-label-short">&nbsp;</label>
              <label class="item-field-label-medium">STR END</label>
-              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.strend" disabled value="{{characteristics.str.strend}}" data-dtype="Number" />
+              <input type="text" class="item-field-label-short update-field"
                data-field-name="system.characteristics.str.strend" disabled value="{{characteristics.str.strend}}"
                data-dtype="Number" />
            </li>
          </ul>
-            {{#each maneuvers as |mlist key|}}
+          {{#each maneuvers as |mlist mtype|}}
-            <ul class="stat-list alternate-list">
+          <ul class="stat-list alternate-list">
-              <li class="item flexrow list-item items-title-bg">
+            <li class="item flexrow list-item items-title-bg">
-                <span class="item-field-label-long-img">
+              <span class="item-field-label-long-img">
-                  <label class="">{{upperFirst key}} Maneuver</label>
+                <label class="">{{upperFirst mtype}} Maneuver</label>
-                </span>
+              </span>
-                <span class="item-field-label-very-short">
+              <span class="item-field-label-very-short">
-                  <label class="short-label">PHA</label>
+                <label class="short-label">PHA</label>
-                </span>
+              </span>
-                <span class="item-field-label-very-short">
+              
-                  <label class="short-label">OCV</label>
+              {{#if (eq mtype "mental")}}
-                </span>
+              <span class="item-field-label-very-short">
-                <span class="item-field-label-very-short">
+                <label class="short-label">OMCV</label>
-                  <label class="short-label">DCV</label>
+              </span>
-                </span>
+              <span class="item-field-label-very-short">
-                <span class="item-field-text-long">
+                <label class="short-label">DMCV</label>
-                  <label class="short-label">Effects</label>
+              </span>
-                </span>
+              {{else}}
-              </li>
+              <span class="item-field-label-very-short">
-              {{#each mlist as |maneuver key|}}
+                <label class="short-label">OCV</label>
-              <li class="item flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
+              </span>
              <span class="item-field-label-very-short">
                <label class="short-label">DCV</label>
              </span>
              {{/if}} 
              <span class="item-field-text-long">
                <label class="short-label">Effects</label>
              </span>
            </li>
            {{#each mlist as |maneuver key|}}
            <li class="item flexrow list-item list-item-shadow " data-item-id="{{maneuver._id}}">
                <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                    src="{{maneuver.img}}" /></a>
+                    src="{{maneuver.img}}" />
-                <span class="item-field-label-long">{{maneuver.name}}
+                </a>
                <span class="item-field-label-long">
                  <a class="roll-item"><i class="fas fa-dice"></i></a>
                  {{maneuver.name}}
                </span>
-                <span class="item-field-label-very-short">{{maneuver.system.pha}}</span>
+              <span class="item-field-label-very-short content-center">{{maneuver.system.pha}}</span>
-                <span class="item-field-label-very-short">{{maneuver.system.ocv}}</span>
+              {{#if (eq ../mtype "mental")}}
-                <span class="item-field-label-very-short">{{maneuver.system.dcv}}</span>
+              <span class="item-field-label-very-short content-center">{{maneuver.system.omcv}}</span>
              <span class="item-field-label-very-short content-center">{{maneuver.system.dmcv}}</span>
              {{else}}
              <span class="item-field-label-very-short content-center">{{maneuver.system.ocv}}</span>
              <span class="item-field-label-very-short content-center">{{maneuver.system.dcv}}</span>
              {{/if}}
-                <span class="item-field-text-long">{{maneuver.system.effects}}
+              <span class="item-field-text-long">{{maneuver.system.effects}}
-                  {{#if maneuver.system.haseffectroll}}
+                {{#if maneuver.system.haseffectroll}}
-                  <a class="roll-direct" data-roll-source="Maneuver {{maneuver.name}}" data-roll-formula="{{maneuver.system.effectrollformula}}">
+                <a class="roll-direct" data-roll-source="Maneuver {{maneuver.name}}"
-                    <i class="fas fa-dice"></i>{{maneuver.system.effectrollformula}}
+                  data-roll-formula="{{maneuver.system.effectrollformula}}">
-                  </a>
+                  <i class="fas fa-dice"></i>{{maneuver.system.effectrollformula}}
-                  {{/if}}
+                </a>
-                </span>
+                {{/if}}
              </span>
-                <span class="">&nbsp;</span>
+            </li>
-                <div class="item-controls item-controls-fixed">
+            {{/each}}
-                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </ul>
                </div>
              </li>
              {{/each}}
            </ul>
          {{/each}}
        </div>
@ -189,16 +218,23 @@
            <li class="flexrow item">
              <label class="item-packed">Initiative</label>
-              <input type="text" class="margin-left-4item-packed item-field-label-very-short update-field" data-field-name="system.characteristics.dex.initiative" value="{{characteristics.dex.initiative}}" data-dtype="Number" />
+              <input type="text" class="margin-left-4item-packed item-field-label-very-short update-field"
                data-field-name="system.characteristics.dex.initiative" value="{{characteristics.dex.initiative}}"
                data-dtype="Number" />
              <label class="items-title-text item-packed margin-left-8">SPD</label>
-              <input type="text" class="item-field-label-very-short margin-left-4 update-field item-packed" data-field-name="system.characteristics.spd.value" value="{{characteristics.spd.value}}" data-dtype="Number" />
+              <input type="text" class="item-field-label-very-short margin-left-4 update-field item-packed"
                data-field-name="system.characteristics.spd.value" value="{{characteristics.spd.value}}"
                data-dtype="Number" />
-              <button class="chat-card-small-button item-field-label-short margin-left-8 hold-action item-packed">{{#if isHold}}Unhold{{else}}Hold{{/if}}</button>
+              <button class="chat-card-small-button item-field-label-short margin-left-8 hold-action item-packed">{{#if
-              <button class="chat-card-small-button item-field-label-short margin-left-4 abort-action item-packed">{{#if isAbort}}Unabort{{else}}Abort{{/if}}</button>
+                isHold}}Unhold{{else}}Hold{{/if}}</button>
              <button class="chat-card-small-button item-field-label-short margin-left-4 abort-action item-packed">{{#if
                isAbort}}Unabort{{else}}Abort{{/if}}</button>
              <label class="items-title-text margin-left-8">Presence attack</label>
-              <a class="roll-direct" data-roll-source="Presence attack"  data-roll-formula="{{system.biodata.presenceattack.rollFormula}}">
+              <a class="roll-direct" data-roll-source="Presence attack"
                data-roll-formula="{{system.biodata.presenceattack.rollFormula}}">
                <i class="fas fa-dice"></i>{{system.biodata.presenceattack.displayFormula}}
              </a>
@ -209,24 +245,26 @@
            <div>
              <ul class="stat-list alternate-list">
                <li class="item flexrow list-item items-title-bg">
-                <span class="item-field-label-long">
+                  <span class="item-field-label-long">
-                  <label class="">Vitals</label>
+                    <label class="">Vitals</label>
-                </span>
+                  </span>
-                <span class="item-field-label-short">
+                  <span class="item-field-label-short">
-                  <label class="short-label">Val</label>
+                    <label class="short-label">Val</label>
-                </span>
+                  </span>
-                <span class="item-field-label-short">
+                  <span class="item-field-label-short">
-                  <label class="short-label">Dmg</label>
+                    <label class="short-label">Dmg</label>
-                </span>
+                  </span>
                </li>
                {{#each characteristics as |char key|}}
-                  {{#if char.isvital}}
+                {{#if char.isvital}}
-                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
-                    <span class="item-field-label-long">{{char.label}}</span>
+                  <span class="item-field-label-long">{{char.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short update-field"
-                    <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.damage" value="{{char.damage}}" data-dtype="Number" />
+                    data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
-                  </li>
+                  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.damage"
-                  {{/if}}
+                    value="{{char.damage}}" data-dtype="Number" />
                </li>
                {{/if}}
                {{/each}}
              </ul>
@ -236,57 +274,73 @@
              <ul class="stat-list alternate-list">
                <li class="item flexrow list-item items-title-bg">
-                <span class="item-field-label-long">
+                  <span class="item-field-label-long">
-                  <label class="">Defenses</label>
+                    <label class="">Defenses</label>
-                </span>
+                  </span>
-                <span class="item-field-label-short">
+                  <span class="item-field-label-short">
-                  <label class="short-label">Normal</label>
+                    <label class="short-label">Normal</label>
-                </span>
+                  </span>
-                <span class="item-field-label-short">
+                  <span class="item-field-label-short">
-                  <label class="short-label">Resistant</label>
+                    <label class="short-label">Resistant</label>
-                </span>
+                  </span>
                </li>
                {{#each characteristics as |char key|}}
-                  {{#if char.isdefense}}
+                {{#if char.isdefense}}
-                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
-                    <span class="item-field-label-long">{{char.label}}</span>
+                  <span class="item-field-label-long">{{char.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short update-field"
-                    <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.resistant" value="{{char.resistant}}" data-dtype="Number" />
+                    data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
-                  </li>
+                  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.resistant"
-                  {{/if}}
+                    value="{{char.resistant}}" data-dtype="Number" />
                </li>
                {{/if}}
                {{/each}}
                {{#each defenses as |def key|}}
-                  <li class="item flexrow list-item list-item-shadow" data-defense-key="{{key}}">
+                <li class="item flexrow list-item list-item-shadow" data-defense-key="{{key}}">
-                    {{#if  def.iseditable}}
+                  {{#if def.iseditable}}
-                    <input type="text" class="item-field-label-long update-field" data-field-name="system.defenses.{{key}}.label" value="{{def.label}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-long update-field"
-                    {{else}}
+                    data-field-name="system.defenses.{{key}}.label" value="{{def.label}}" data-dtype="String" />
-                    <span class="item-field-label-long">{{def.label}}</span>
+                  {{else}}
-                    {{/if}}
+                  <span class="item-field-label-long">{{def.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.defenses.{{key}}.value" value="{{def.value}}" data-dtype="Number" />
+                  {{/if}}
-                    <input type="text" class="item-field-label-short" name="system.defenses.{{key}}.resistant" value="{{def.resistant}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short update-field"
-                  </li>
+                    data-field-name="system.defenses.{{key}}.value" value="{{def.value}}" data-dtype="Number" />
                  <input type="text" class="item-field-label-short" name="system.defenses.{{key}}.resistant"
                    value="{{def.resistant}}" data-dtype="Number" />
                </li>
                {{/each}}
              </ul>
            </div>
          </div>
          <div class="item">
-            <label class="item-field-label-short">OCV</label>
+            <label class="item-field-label-short">
-            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.ocv.value" value="{{characteristics.ocv.value}}" data-dtype="Number" />
+              <a class="roll-charac" data-charac-key="ocv"><i class="fas fa-dice"></i>OCV</a>
            </label>
            <input type="text" class="item-field-label-short update-field"
              data-field-name="system.characteristics.ocv.value" value="{{characteristics.ocv.value}}"
              data-dtype="Number" />
            <label class="item-field-label-short">&nbsp;</label>
            <label class="item-field-label-short">DCV</label>
-            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.dcv.value" value="{{characteristics.dcv.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short update-field"
              data-field-name="system.characteristics.dcv.value" value="{{characteristics.dcv.value}}"
              data-dtype="Number" />
            <label class="item-field-label-short">&nbsp;</label>
-            <label class="item-field-label-short">OMCV</label>
+            <label class="item-field-label-short">
-            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.omcv.value" value="{{characteristics.omcv.value}}" data-dtype="Number" />
+              <a class="roll-charac" data-charac-key="omcv"><i class="fas fa-dice"></i>OMCV</a>
            </label>
            <input type="text" class="item-field-label-short update-field"
              data-field-name="system.characteristics.omcv.value" value="{{characteristics.omcv.value}}"
              data-dtype="Number" />
            <label class="item-field-label-short">&nbsp;</label>
            <label class="item-field-label-short">DMCV</label>
-            <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.dmcv.value" value="{{characteristics.dmcv.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short update-field"
              data-field-name="system.characteristics.dmcv.value" value="{{characteristics.dmcv.value}}"
              data-dtype="Number" />
          </div>
          <div class="flexrow">
@ -299,54 +353,63 @@
            <div>
              <ul class="stat-list alternate-list">
                <li class="item flexrow list-item items-title-bg">
-                <span class="item-field-label-long">
+                  <span class="item-field-label-long">
-                  <label class="">Senses</label>
+                    <label class="">Senses</label>
-                </span>
+                  </span>
-                <span class="item-field-label-short">
+                  <span class="item-field-label-short">
-                </span>
+                  </span>
                </li>
                <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                  <span class="item-field-label-long">
                    <a class="roll-perception"><i class="fas fa-dice"></i>Perception Roll</a>
                  </span>
                  <input type="text" class="item-field-label-short update-field"
                    data-field-name="system.characteristics.int.perceptionroll"
                    value="{{characteristics.int.perceptionroll}}" data-dtype="Number" />
                </li>
                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                    <span class="item-field-label-long">
                      <a class="roll-perception"><i class="fas fa-dice"></i>Perception Roll</a>
                    </span>
                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.int.perceptionroll" value="{{characteristics.int.perceptionroll}}" data-dtype="Number" />
                  </li>
              </ul>
-              <textarea type="text" class="textarea-full-height padd-right" name="system.biodata.combatnotes1" data-dtype="String">{{system.biodata.combatnotes1}}</textarea>
+              <textarea rows="20" type="text" class="textarea-full-height padd-right" name="system.biodata.combatnotes1"
                data-dtype="String">{{system.biodata.combatnotes1}}</textarea>
            </div>
            <div>
              <ul class="stat-list alternate-list">
                <li class="item flexrow list-item items-title-bg">
-                <span class="item-field-label-long">
+                  <span class="item-field-label-long">
-                  <label class="">Movement</label>
+                    <label class="">Movement</label>
-                </span>
+                  </span>
-                <span class="item-field-label-short">
+                  <span class="item-field-label-short">
-                  <label class="short-label">Combat</label>
+                    <label class="short-label">Combat</label>
-                </span>
+                  </span>
-                <span class="item-field-label-short">
+                  <span class="item-field-label-short">
-                  <label class="short-label">NC</label>
+                    <label class="short-label">NC</label>
-                </span>
+                  </span>
                </li>
                {{#each characteristics as |char key|}}
-                  {{#if char.ismovement}}
+                {{#if char.ismovement}}
-                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
-                    <span class="item-field-label-long">{{char.label}}</span>
+                  <span class="item-field-label-long">{{char.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short update-field"
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.ncvalue" value="{{char.ncvalue}}" data-dtype="Number" />
+                    data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
-                  </li>
+                  <input type="text" class="item-field-label-short update-field"
-                  {{/if}}
+                    data-field-name="system.characteristics.{{key}}.ncvalue" value="{{char.ncvalue}}"
                    data-dtype="Number" />
                </li>
                {{/if}}
                {{/each}}
                {{#each movements as |move key|}}
-                  <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
+                <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
-                    {{#if  move.iseditable}}
+                  {{#if move.iseditable}}
-                    <input type="text" class="item-field-label-long update-field" data-field-name="system.movements.{{key}}.label" value="{{move.label}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-long update-field"
-                    {{else}}
+                    data-field-name="system.movements.{{key}}.label" value="{{move.label}}" data-dtype="String" />
-                    <span class="item-field-label-long">{{move.label}}</span>
+                  {{else}}
-                    {{/if}}
+                  <span class="item-field-label-long">{{move.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.movements.{{key}}.value" value="{{move.value}}" data-dtype="Number" />
+                  {{/if}}
-                    <input type="text" class="item-field-label-short" value="{{mul move.value 2}}" disabled data-dtype="Number" />
+                  <input type="text" class="item-field-label-short update-field"
-                  </li>
+                    data-field-name="system.movements.{{key}}.value" value="{{move.value}}" data-dtype="Number" />
                  <input type="text" class="item-field-label-short" value="{{mul move.value 2}}" disabled
                    data-dtype="Number" />
                </li>
                {{/each}}
              </ul>
@ -363,26 +426,26 @@
      <div class="charac-item">
        <ul>
          <li class="item flexrow list-item items-title-bg">
-          <span class="item-field-label-medium">
+            <span class="item-field-label-medium">
-            <label class="">Value</label>
+              <label class="">Value</label>
-          </span>
+            </span>
-          <span class="item-field-label-medium">
+            <span class="item-field-label-medium">
-            <label class="item-field-label-medium">CHAR</label>
+              <label class="item-field-label-medium">CHAR</label>
-          </span>
+            </span>
-          <span class="item-field-label-short">
+            <span class="item-field-label-short">
-            <label class="short-label">Base</label>
+              <label class="short-label">Base</label>
-          </span>
+            </span>
-          <span class="item-field-label-short">
+            <span class="item-field-label-short">
-            <label class="short-label">Roll</label>
+              <label class="short-label">Roll</label>
-          </span>
+            </span>
-          <span class="item-field-label-long">
+            <span class="item-field-label-long">
-            <label class="short-label">Notes</label>
+              <label class="short-label">Notes</label>
-          </span>
+            </span>
-          <div class="item-filler">&nbsp;</div>
+            <div class="item-filler">&nbsp;</div>
-        </li>
+          </li>
          {{#each characteristics as |charac key|}}
-              {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-full-charac.hbs charac=charac key=key}}
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-full-charac.hbs charac=charac key=key}}
          {{/each}}
        </ul>
      </div>
@ -411,7 +474,8 @@
              src="{{skill.img}}" /></a>
          <span class="item-field-label-long">{{skill.name}}</span>
          <span class="item-field-label-medium">{{upper skill.charac}}</span>
-          <span class="item-field-label-short"><a class="roll-item" data-type="skill"><i class="fas fa-dice"></i>{{skill.roll}}-</a></span>
+          <span class="item-field-label-short"><a class="roll-item" data-type="skill"><i
                class="fas fa-dice"></i>{{skill.roll}}-</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>
@ -439,7 +503,8 @@
              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>
+          <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}}
@ -470,7 +535,8 @@
              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>
+          <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}}
@ -486,6 +552,10 @@
    {{!-- Maneuvers Tab --}}
    <div class="tab maneuver" data-group="primary" data-tab="maneuver">
      <div>
        <button class="show-stock-maneuver">Show/Hide stock maneuvers</button>
      </div>
      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
          <span class="item-field-label-long-img">
@ -500,29 +570,80 @@
          <span class="item-field-label-short">
            <label class="short-label">DCV</label>
          </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-long3">
            <label class="short-label">Effects</label>
          </span>
        </li>
-        {{#each nonstockmaneuvers as |maneuver key|}}
+        {{#each allmaneuvers as |maneuver key|}}
-            <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
+        {{#if (ne maneuver.system.maneuvertype "mental")}}
          <div class="{{#if maneuver.system.isstock}}maneuver-list maneuver-is-stock{{/if}}">
            <li class="item stat flexrow list-item list-item-shadow " data-item-id="{{maneuver._id}}">
              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                  src="{{maneuver.img}}" /></a>
-              <span class="item-field-label-long">{{maneuver.name}}</span>
+              <span class="item-field-label-long"><a class="roll-item"><i class="fas fa-dice"></i>{{maneuver.name}}</a></span>
              <span class="item-field-label-short">{{maneuver.system.pha}}</span>
              <span class="item-field-label-short">{{maneuver.system.ocv}}</span>
              <span class="item-field-label-short">{{maneuver.system.dcv}}</span>
-              <span class="item-field-label-long">{{maneuver.system.effects}}</span>
+              <span class="item-field-label-long3">{{maneuver.system.effects}}</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>
          </div>
        {{/if}}
        {{/each}}
      </ul>
      <ul class="stat-list alternate-list item-list">
        <li class="item flexrow list-item items-title-bg">
          <span class="item-field-label-long-img">
            <label class="">Mental Maneuvers</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">PHA</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">OMCV</label>
          </span>
          <span class="item-field-label-short">
            <label class="short-label">DMCV</label>
          </span>
          <span class="item-field-label-long3">
            <label class="short-label">Effects</label>
          </span>
        </li>
        {{#each allmaneuvers as |maneuver key|}}
        {{#if (eq maneuver.system.maneuvertype "mental")}}
          <div class="">
            <li class="item stat flexrow list-item list-item-shadow " data-item-id="{{maneuver._id}}">
              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                  src="{{maneuver.img}}" /></a>
              <span class="item-field-label-long">
                <a class="roll-item"><i class="fas fa-dice"></i>
                  {{maneuver.name}}
                </a>
              </span>
              <span class="item-field-label-short content-center">{{maneuver.system.pha}}</span>
              <span class="item-field-label-short content-center">{{maneuver.system.omcv}}</span>
              <span class="item-field-label-short content-center">{{maneuver.system.dmcv}}</span>
              <span class="item-field-label-long3">{{maneuver.system.effects}}</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>
          </div>
        {{/if}}
        {{/each}}
      </ul>
    </div>
    {{!-- Powers Tab --}}
@ -557,11 +678,22 @@
          <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>
          {{#if (eq system.typemodifier "attack")}}
          <span class="item-field-label-long3">
             <a class="roll-power-attack">
              <i class="fas fa-dice"></i>
                {{power.name}}
             </a>
          </span>
          {{else}}
          <span class="item-field-label-long3">{{power.name}}</span>
          {{/if}}
          <span class="item-field-label-long2">{{power.system.displayname}}</span>
-          <span class="item-field-label-medium"><a class="roll-damage" data-type="power"><i class="fas fa-dice"></i>{{power.system.damage}}</a></span>
+          <span class="item-field-label-medium"><a class="roll-damage" data-type="power"><i
                class="fas fa-dice"></i>{{power.system.damage}}</a></span>
          {{#if power.system.hasroll}}
-          <span class="item-field-label-short"><a class="roll-item" data-type="power"><i class="fas fa-dice"></i>{{power.system.roll}}-</a></span>
+          <span class="item-field-label-short"><a class="roll-item" data-type="power"><i
                class="fas fa-dice"></i>{{power.system.roll}}-</a></span>
          {{else}}
          <span class="item-field-label-short">&nbsp;</span>
          {{/if}}
@ -593,7 +725,8 @@
              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>
+          <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}}
@ -616,13 +749,19 @@
        <span class="small-label">Total value : {{totalValue}}</span>
      </div>
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" items=weapons}}
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Money"
      items=moneys}}
      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons"
      items=weapons}}
      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Armor" items=armors}}
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Shields" items=shields}}
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Shields"
      items=shields}}
-      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Equipment" items=equipments}}
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Equipment"
      items=equipments}}
      <hr>
@ -705,7 +844,7 @@
    </div>
-  </div>
+    </div>
  </section>
 </form>
--- a/templates/apps/roll-dialog-generic.hbs
+++ b/templates/apps/roll-dialog-generic.hbs
@ -15,6 +15,27 @@
      </div>
    {{/if}}
    {{#if weapon}}    
      <div class="flexrow">
        <span class="item-field-label-long margin-item-list">{{weapon.name}} : </span>
        <span class="item-field-label-medium margin-item-list">{{weaponRoll}}-</span>
      </div>
    {{/if}}
    {{#if maneuver}}    
      <div class="flexrow">
        <span class="item-field-label-long margin-item-list">{{maneuver.name}} : </span>
        <span class="item-field-label-medium margin-item-list">{{maneuverRoll}}-</span>
      </div>
    {{/if}}
    {{#if power}}    
      <div class="flexrow">
        <span class="item-field-label-long margin-item-list">{{power.name}} : </span>
        <span class="item-field-label-medium margin-item-list">{{powerRoll}}-</span>
      </div>
    {{/if}}
    {{#if item}}    
    <div class="flexrow">
      <span class="item-field-label-long margin-item-list">{{upperFirst item.type}} - {{upperFirst item.name}}</span>
--- a/templates/chat/chat-attack-defense-result.hbs
+++ b/templates/chat/chat-attack-defense-result.hbs
@ -7,12 +7,6 @@
  <hr>
  {{#if img}}
  <div >
    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
  </div>
  {{/if}}
  <div class="flexcol">
    </div>
--- a/templates/chat/chat-damage-result.hbs
+++ b/templates/chat/chat-damage-result.hbs
@ -7,21 +7,29 @@
  <hr>
  {{#if img}}
  <div >
    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
  </div>
  {{/if}}
  <div class="flexcol">
    </div>
    <div>
      <ul>
        <li>Name : {{title}}</li>
        <li>Damage Effect: {{upperFirst item.system.damageeffect}}</li>
        <li>Damage formula : {{diceFormula}}</li>
        <li><strong>TOTAL : {{result}}</strong></li>
        {{#if (or (eq item.system.damageeffect "killing") (eq item.system.damageeffect "normal"))}}      
        <li><strong>1d3 result + STUNx : {{killingMultiplier}} + {{item.system.stunx}}</strong></li>
        <li><strong>STUN : {{stunValue}}</strong></li>
        <li><strong>BODY : {{bodyValue}}</strong></li>
        {{/if}}
        {{#if (eq item.system.damageeffect "stunonly")}}
        <li><strong>STUN : {{stunValue}}</strong></li>
        {{/if}}
        {{#if (eq item.system.damageeffect "bodyonly")}}
        <li><strong>BODY : {{stunValue}}</strong></li>
        {{/if}}
      </ul>  
    </div>
--- a/templates/chat/chat-generic-result.hbs
+++ b/templates/chat/chat-generic-result.hbs
@ -7,12 +7,6 @@
  <hr>
  {{#if img}}
  <div >
    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
  </div>
  {{/if}}
  <div class="flexcol">
    </div>
@ -23,6 +17,21 @@
        </li>
        {{/if}}
        {{#if weapon}}
        <li>Weapon : {{weapon.name}}
        </li>
        {{/if}}
        {{#if maneuver}}
        <li>Maneuver : {{maneuver.name}}
        </li>
        {{/if}}
        {{#if power}}
        <li>Power : {{power.name}}
        </li>
        {{/if}}
        {{#if rollSource}}  
        <li>Roll : {{rollSource}}</li>
        {{/if}}
@ -33,6 +42,12 @@
        {{#if item}}  
        <li>{{item.name}} ({{upperFirst item.type}})</li>
          {{#if (eq item.type "maneuver")}}
          <li>{{item.system.effects}}</li>
            {{#if item.system.haseffectroll}}
            <li>{{item.system.effectrollformula}}</li>
            {{/if}}
          {{/if}}
        {{/if}}
        {{#if (exists bonusMalus)}}
--- a/templates/chat/chat-lift-dice-result.hbs
+++ b/templates/chat/chat-lift-dice-result.hbs
@ -7,12 +7,6 @@
  <hr>
  {{#if img}}
  <div >
    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
  </div>
  {{/if}}
  <div class="flexcol">
    </div>
--- a/templates/items/item-advantage-sheet.hbs
+++ b/templates/items/item-advantage-sheet.hbs
@ -21,5 +21,7 @@
        </ul>
      </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-armor-sheet.hbs
+++ b/templates/items/item-armor-sheet.hbs
@ -67,5 +67,7 @@
      </div>
    </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-complication-sheet.hbs
+++ b/templates/items/item-complication-sheet.hbs
@ -21,5 +21,8 @@
          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
        </ul>
      </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-currency-sheet.hbs
+++ b/templates/items/item-currency-sheet.hbs
@ -24,5 +24,7 @@
      </ul>
    </div>
    {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
  </section>
 </form>
--- a/templates/items/item-equipment-sheet.hbs
+++ b/templates/items/item-equipment-sheet.hbs
@ -56,8 +56,88 @@
          </select>
        </li>
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+        {{#if (eq system.subtype "weapon") }}
        <li class="flexrow"><label class="item-field-label-long">OCV</label>
          <input type="text" class="item-field-label-short" name="system.ocv" value="{{system.ocv}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">OMCV</label>
          <input type="text" class="item-field-label-short" name="system.omcv" value="{{system.omcv}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">RMod</label>
          <input type="text" class="item-field-label-short" name="system.rmod" value="{{system.rmod}}"
            data-dtype="Number" />
        </li>
        {{/if}}
        {{#if (eq system.subtype "shield") }}
        <li class="flexrow"><label class="item-field-label-long">OCV</label>
          <input type="text" class="item-field-label-short" name="system.ocv" value="{{system.ocv}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">DCV</label>
          <input type="text" class="item-field-label-short" name="system.dcv" value="{{system.dcv}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">OMCV</label>
          <input type="text" class="item-field-label-short" name="system.omcv" value="{{system.omcv}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">DMCV</label>
          <input type="text" class="item-field-label-short" name="system.dmcv" value="{{system.dmcv}}"
            data-dtype="Number" />
        </li>
        {{/if}}
        {{#if (eq system.subtype "armor") }}
        <li class="flexrow"><label class="item-field-label-long">DCV</label>
          <input type="text" class="item-field-label-short" name="system.dcv" value="{{system.dcv}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">DMCV</label>
          <input type="text" class="item-field-label-short" name="system.dmcv" value="{{system.dmcv}}"
            data-dtype="Number" />
        </li>
        {{/if}}
        {{#if (or (eq system.subtype "armor") (eq system.subtype "shield")) }}
        <li class="flexrow"><label class="item-field-label-long">PD</label>
          <input type="text" class="item-field-label-short" name="system.pd" value="{{system.pd}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">ED</label>
          <input type="text" class="item-field-label-short" name="system.ed" value="{{system.ed}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">rPD</label>
          <input type="text" class="item-field-label-short" name="system.rpd" value="{{system.rpd}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">rED</label>
          <input type="text" class="item-field-label-short" name="system.red" value="{{system.red}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">Mental Defense</label>
          <input type="text" class="item-field-label-short" name="system.mentaldefense" value="{{system.mentaldefense}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">Power Defense</label>
          <input type="text" class="item-field-label-short" name="system.powerdefense" value="{{system.powerdefense}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">Flash Defense</label>
          <input type="text" class="item-field-label-short" name="system.flashdefense" value="{{system.flashdefense}}"
            data-dtype="Number" />
        </li>
        <li class="flexrow"><label class="item-field-label-long">Other Defense</label>
          <input type="text" class="item-field-label-short" name="system.otherdefense" value="{{system.otherdefense}}"
            data-dtype="Number" />
        </li>
        {{/if}}
        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
@ -65,5 +145,7 @@
      </ul>
    </div>
    {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
  </section>
 </form>
--- a/templates/items/item-limitation-sheet.hbs
+++ b/templates/items/item-limitation-sheet.hbs
@ -11,13 +11,16 @@
    {{!-- Sheet Body --}}
    <section class="sheet-body">
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
      <div class="tab details" data-group="primary" data-tab="details">
        <ul>
          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
        </ul>
      </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-maneuver-sheet.hbs
+++ b/templates/items/item-maneuver-sheet.hbs
@ -37,14 +37,21 @@
            <input type="text" class="item-field-label-medium" name="system.pha" value="{{system.pha}}" data-dtype="String"/>
          </li>
          {{#if (eq system.maneuvertype "mental")}}
          <li class="flexrow"><label class="item-field-label-medium">OMCV</label>
            <input type="text" class="item-field-label-medium" name="system.omcv" value="{{system.omcv}}" data-dtype="String"/>
          </li>
          <li class="flexrow"><label class="item-field-label-medium">DMCV</label>
            <input type="text" class="item-field-label-medium" name="system.dmcv" value="{{system.dmcv}}" data-dtype="String"/>
          </li>
          {{else}}
          <li class="flexrow"><label class="item-field-label-medium">OCV</label>
            <input type="text" class="item-field-label-medium" name="system.ocv" value="{{system.ocv}}" data-dtype="String"/>
          </li>
          <li class="flexrow"><label class="item-field-label-medium">DCV</label>
            <input type="text" class="item-field-label-medium" name="system.dcv" value="{{system.dcv}}" data-dtype="String"/>
          </li>
-
+           {{/if}}
          <li class="flexrow"><label class="item-field-label-medium">Effects</label>
            <input type="text" class="item-field-label-long" name="system.effects" value="{{system.effects}}" data-dtype="String"/>
          </li>
@ -53,5 +60,8 @@
        </ul>
      </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-perk-sheet.hbs
+++ b/templates/items/item-perk-sheet.hbs
@ -21,5 +21,8 @@
          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
        </ul>
      </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-power-sheet.hbs
+++ b/templates/items/item-power-sheet.hbs
@ -25,5 +25,8 @@
          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
        </ul>
      </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-skill-sheet.hbs
+++ b/templates/items/item-skill-sheet.hbs
@ -52,22 +52,21 @@
                data-dtype="Number"/>
            </li>
-            <li class="flexrow"><label class="item-field-label-long">Familiarity only</label>
+            <li class="flexrow"><label class="item-field-label-long">Proficency</label>
-              <input type="checkbox" class="item-field-label-medium item-skill-familiarity" name="system.skillfamiliarity" {{checked system.skillfamiliarity}} 
+              <input type="checkbox" class="item-field-label-medium item-skill-profiency" name="system.skillprofiency" {{checked system.skillprofiency}}  
                {{#if (or system.skillprofiency system.skilllevelonly)}}disabled{{/if}}                 
                data-dtype="Number"/>
            </li>
-              {{#if system.skillfamiliarity}}
+
            {{#if (not system.skillprofiency)}}         
              <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}} 
                  data-dtype="Number"/>
              </li>
              <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}}
+            {{/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>
@ -79,5 +78,8 @@
          </ul>
        </div>
        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-talent-sheet.hbs
+++ b/templates/items/item-talent-sheet.hbs
@ -23,5 +23,7 @@
      </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
    </section>
 </form>
--- a/templates/items/item-weapon-sheet.hbs
+++ b/templates/items/item-weapon-sheet.hbs
@ -103,5 +103,7 @@
    </div>
  </div>
      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
  </section>
 </form>
--- a/templates/partials/partial-actor-equipment-section.hbs
+++ b/templates/partials/partial-actor-equipment-section.hbs
@ -3,33 +3,114 @@
          <span class="item-name-img">
            <label class="">&nbsp;</label>
          </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-very-short">
-            <label class="item-field-label-short">Qty</label>
+            <label class="item-field-label-very-short">Qty</label>
          </span>
-          <span class="item-field-label-long3">
+          <span class="item-field-label-long2">
-            <label class="item-field-label-long3">{{title}}</label>
+            <label class="item-field-label-long2">{{title}}</label>
          </span>
-          <span class="item-field-label-long">
+
-            <label class="item-field-label-long4">Display</label>
+          {{#if (or (eq title "Money") (eq title "Equipment"))}}
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">&nbsp;</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">&nbsp;</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">&nbsp;</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">&nbsp;</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">&nbsp;</label>
          </span>
          {{/if}}
          {{#if (eq title "Weapons")}}
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">OCV</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">DCV</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">rMod</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">Rng</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">&nbsp;</label>
          </span>
          {{/if}}
          {{#if (eq title "Shields")}}
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">OCV</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">DCV</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">OMCV</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">DMCV</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">&nbsp;</label>
          </span>
          {{/if}}
          {{#if (eq title "Armor")}}
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">PD</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">ED</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">rPD</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">rED</label>
          </span>
          <span class="item-field-label-very-short">
            <label class="item-field-label-very-short">DCV</label>
          </span>
          {{/if}}
          <span class="item-field-label-long2">
            <label class="item-field-label-long2">Display</label>
          </span>
          {{#if (and (ne title "Armor") (ne title "Shields"))}}
          <span class="item-field-label-short">
            <label class="item-field-label-short">Effect</label>
          </span>
          {{else}}
          <span class="item-field-label-short">
            <label class="item-field-label-short">&nbsp;</label>
          </span>
          {{/if}}
          <span class="item-field-label-short">
            <label class="item-field-label-short">Roll</label>
          </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-very-short">
-            <label class="item-field-label-short">END</label>
+            <label class="item-field-label-very-short">END</label>
          </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-very-short">
-            <label class="item-field-label-short">Value</label>
+            <label class="item-field-label-very-short">Value</label>
          </span>
          <span class="item-field-label-short">
            <label class="item-field-label-short">Weight</label>
          </span>
-          <div class="item-filler">&nbsp;</div>
+        
-          <div class="item-controls item-controls-fixed">
+          <div class="item-controls item-controls-fixed-small">
-            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus item-controls-fixed-small"></i></a>
          </div>
        </li>
--- a/templates/partials/partial-actor-equipment.hbs
+++ b/templates/partials/partial-actor-equipment.hbs
@ -1,17 +1,59 @@
 <li class="item flexrow list-item list-item-shadow" data-item-id="{{equip._id}}">
  <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{equip.img}}" /></a>
-  <span class="item-field-label-short"><label>{{equip.system.quantity}}</label>  </span>          
+  <span class="item-field-label-very-short content-center" ><label class="content-center">{{equip.system.quantity}}</label>  </span>          
-  <span class="item-field-label-long3">{{equip.name}}</span>
+  <span class="item-field-label-long2">
    {{#if (eq equip.system.subtype "weapon")}}
    <a class="roll-weapon"><i class="fas fa-dice"></i>{{equip.name}}</a>
    {{else}}
    {{equip.name}}
    {{/if}}
  </span>
-  <span class="item-field-label-long"><label>{{equip.system.displayname}}
+  {{#if (or (eq equip.system.subtype "money") (eq equip.system.subtype "equipment"))}}
  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
  <span class="item-field-label-very-short"><label>&nbsp;</label>  </span>          
  {{/if}}
  {{#if (eq equip.system.subtype "weapon")}}
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.ocv) decimals=0 sign=true}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.omcv) decimals=0 sign=true}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.rmod) decimals=0 sign=true}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{equip.system.range}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>&nbsp;</label>  </span>          
  {{/if}}
  {{#if (eq equip.system.subtype "shield")}}
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.ocv) decimals=0 sign=true}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.dcv) decimals=0 sign=true}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.omcv) decimals=0 sign=true}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.dmcv) decimals=0 sign=true}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>&nbsp;</label>  </span>          
  {{/if}}
  {{#if (eq equip.system.subtype "armor")}}
  <span class="item-field-label-very-short content-center"><label>{{equip.system.pd}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{equip.system.ed}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{equip.system.rpd}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{equip.system.red}}</label>  </span>          
  <span class="item-field-label-very-short content-center"><label>{{numberFormat (fixNum equip.system.dcv) decimals=0 sign=true}}</label>  </span>          
  {{/if}}
  <span class="item-field-label-long2"><label>{{equip.system.displayname}}
  </label>
  </span>          
  {{#if (and (ne equip.system.subtype "armor") (ne equip.system.subtype "shield"))}}
  <span class="item-field-label-short"><label><a class="roll-damage" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.damage}}</a>
  </label>
  </span>
  {{else}}
  <span class="item-field-label-short"><label>&nbsp;</label></span>
  {{/if}}
  {{#if equip.system.hasroll}}          
  <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.roll}}-</a></span>
@ -19,13 +61,12 @@
  <span class="item-field-label-short">&nbsp;</span>
  {{/if}}
-  <span class="item-field-label-short"><label>{{equip.system.endurance}}</label>  </span>          
+  <span class="item-field-label-very-short content-center"><label>{{equip.system.endurance}}</label>  </span>          
-  <span class="item-field-label-short"><label>{{mul equip.system.quantity equip.system.value}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{mul equip.system.quantity equip.system.value}}</label>  </span>          
-  <span class="item-field-label-short"><label>{{mul equip.system.quantity equip.system.weight}}</label>  </span>          
+  <span class="item-field-label-short content-center"><label>{{mul equip.system.quantity equip.system.weight}}</label>  </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>
--- a/templates/partials/partial-item-description.hbs
+++ b/templates/partials/partial-item-description.hbs
@ -4,13 +4,6 @@
    <input type="text" class="" name="system.displayname" value="{{system.displayname}}" data-dtype="string"/>
  </div>
  <div>
    <label class="generic-label">Notes</label>
    <div class="small-editor item-text-long-line">
    {{editor notes target="system.notes" button=true owner=owner editable=editable}}
    </div>
  </div>
  <div>
    <label class="generic-label">Description</label>
    <div class="medium-editor item-text-long-line">
--- a/templates/partials/partial-item-nav.hbs
+++ b/templates/partials/partial-item-nav.hbs
@ -2,4 +2,5 @@
 <nav class="sheet-tabs tabs" data-group="primary">
  <a class="item" data-tab="description">Description</a>
  <a class="item" data-tab="details">Details</a>
  <a class="item" data-tab="notes">Notes</a>
 </nav>
--- a/templates/partials/partial-item-notes.hbs
+++ b/templates/partials/partial-item-notes.hbs
@ -0,0 +1,8 @@
 <div class="tab notes" data-group="primary" data-tab="notes">
  <div>
    <label class="generic-label">Notes</label>
    <div class="small-editor item-text-long-line">
    {{editor notes target="system.notes" button=true owner=owner editable=editable}}
    </div>
  </div>
 </div>
--- a/templates/partials/partial-power-equipment-cost.hbs
+++ b/templates/partials/partial-power-equipment-cost.hbs
@ -18,16 +18,49 @@
        </select> 
      </li>
      {{#if (eq (lower system.typemodifier) "attack")}}
      <li class="flexrow"><label class="item-field-label-long">Attack Roll Uses OCV or OMCV</label>
        <select class="item-field-label-long" type="text" name="system.attackvalue" value="{{system.attackvalue}}" data-dtype="String">
          {{#select system.attackvalue}}
            {{#each config.attackTypes as |name key|}}
              <option value="{{key}}">{{name}}</option>
            {{/each}}
          {{/select}}
        </select> 
      </li>
      {{/if}}
      <li class="flexrow"><label class="item-field-label-long">Is sense affecting ?</label>
        <label class="item-field-label-medium"><input type="checkbox" name="system.senseaffecting" {{checked system.senseaffecting}}/></label>
      </li>
      {{#if (and (ne system.subtype "armor") (ne system.subtype "shield"))}}
      <li class="flexrow"><label class="item-field-label-long">Range</label>
        <input type="text" class="item-field-label-medium" name="system.range" value="{{system.range}}" data-dtype="String"/>
      </li>
      <li class="flexrow"><label class="item-field-label-long">Damage Effect</label>
        <select class="item-field-label-long" type="text" name="system.damageeffect" value="{{system.damageeffect}}" data-dtype="String">
          {{#select (lower system.damageeffect)}}
            {{#each config.damageEffect as |name key|}}
              <option value="{{key}}">{{name}}</option>
            {{/each}}
          {{/select}}
        </select> 
      </li>
      <li class="flexrow"><label class="item-field-label-long">Damage</label>
        <input type="text" class="item-field-label-medium" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
      </li>
      {{#if (eq system.damageeffect "killing")}}
      <li class="flexrow"><label class="item-field-label-long">STUNx</label>
        <input type="text" class="item-field-label-medium" name="system.stunx" value="{{system.stunx}}" data-dtype="Number"/>
      </li>
      {{/if}}
      {{/if}}
      <li class="flexrow"><label class="item-field-label-long">Endurance</label>
        <input type="text" class="item-field-label-short" name="system.endurance" value="{{system.endurance}}" data-dtype="Number"/>
      </li>
Author	SHA1	Message	Date
LeRatierBretonnien	1d4d3054c3	Fix various issues	2023-08-26 22:27:17 +02:00
LeRatierBretonnien	e5c6d3f42f	Fix various issues	2023-08-26 22:25:28 +02:00
LeRatierBretonnien	f914b9838e	#7 Fix starting round	2023-08-26 21:22:42 +02:00
LeRatierBretonnien	8a543068d2	#8 Fix column alignement	2023-08-26 21:03:25 +02:00
LeRatierBretonnien	379b8358ee	#2 Fix skill profiency	2023-08-26 20:59:41 +02:00
LeRatierBretonnien	40ee7c3c40	Move repo to public area	2023-08-26 09:49:13 +02:00
LeRatierBretonnien	a07f367b0c	Move repo to public area	2023-08-26 09:48:07 +02:00
LeRatierBretonnien	09bb7fb692	Move repo to public area	2023-08-26 05:38:10 +02:00
LeRatierBretonnien	92dc81af24	Move repo to public area	2023-08-26 05:36:15 +02:00
LeRatierBretonnien	d2430ee482	Move repo to public area	2023-08-26 05:15:18 +02:00
LeRatierBretonnien	86780ce8ae	Move repo to public area	2023-08-26 05:14:08 +02:00
LeRatierBretonnien	b383481915	First official release	2023-08-25 23:00:21 +02:00
LeRatierBretonnien	dca78fd4b6	Add changelog	2023-08-25 19:02:40 +02:00
LeRatierBretonnien	f381269acf	Add changelog	2023-08-25 18:58:48 +02:00
LeRatierBretonnien	686ea4cea6	Fix manifest link	2023-08-25 18:55:34 +02:00
LeRatierBretonnien	c915b85a7b	Update README	2023-08-25 16:34:10 +02:00
LeRatierBretonnien	5026e120c1	Equipment management	2023-08-24 23:12:55 +02:00
LeRatierBretonnien	9cefc6f816	Equipment management	2023-08-24 20:32:12 +02:00
LeRatierBretonnien	11d7c7d1c0	Equipment management	2023-08-24 20:32:00 +02:00
LeRatierBretonnien	3abf9a9f8f	Equipment management	2023-08-24 18:45:54 +02:00
LeRatierBretonnien	f5c0faffd3	Equipment management	2023-08-24 15:59:54 +02:00
LeRatierBretonnien	3f0e0a41b8	Update equipments type	2023-08-22 23:30:31 +02:00
LeRatierBretonnien	20c49eb48c	Fix Maneuvers	2023-08-15 22:12:02 +02:00
LeRatierBretonnien	6275319164	Various fixes	2023-08-10 13:06:16 +02:00
LeRatierBretonnien	19fb872824	Various fixes	2023-08-10 13:05:56 +02:00
LeRatierBretonnien	002d6f4fbd	Various fixes	2023-08-09 18:05:16 +02:00
LeRatierBretonnien	43a3a2ccfa	Various fixes and enhancents	2023-08-08 08:17:48 +02:00
LeRatierBretonnien	356f0fee5f	Various fixes and enhancents	2023-08-08 08:17:30 +02:00