First official release

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.
 

changelog.md

@@ -0,0 +1,4 @@
+v11.0.14
+
+
+- Initial public release

lang/en.json

@@ -5,17 +5,17 @@
         "minion": "Minion"
       },
       "Item": {
-        "Skill": "Skill",
+        "skill": "Skill",
-        "Perk": "Perk",
+        "perk": "Perk",
-        "Power": "Power",
+        "power": "Power",
-        "Talent": "Talent",
+        "talent": "Talent",
-        "Advantage": "Advantage",
+        "advantage": "Advantage",
-        "Martialart": "Martial art",
+        "martialart": "Martial art",
-        "Limitation": "Limitation",
+        "limitation": "Limitation",
-        "Complication": "Complication",
+        "complication": "Complication",
-        "Equipment": "Equipment",
+        "equipment": "Equipment",
-        "Currency": "Currency",
+        "currency": "Currency",
-        "Maneuver": "Maneuver"  
+        "maneuver": "Maneuver"  
       }
     },
     "COMBAT": {

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;
@@ -158,6 +162,18 @@ 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-mental-maneuver').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      this.actor.rollMentalManeuver(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")
@@ -180,11 +196,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")
@@ -198,6 +209,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);

modules/hero6-actor.js

@@ -304,11 +304,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() {
@@ -321,6 +328,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)
@@ -734,7 +746,7 @@ export class Hero6Actor extends Actor {
   }
   /* -------------------------------------------- */
   rollManeuver(maneuverId) {
-    let skill = this.items.get(skillId)
+    let skill = this.items.get(maneuverId)
     if (skill) {
       if (skill.system.islore && skill.system.level == 0) {
         ui.notifications.warn("You can't use Lore Skills with a SL of 0.")
@@ -778,34 +790,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 + this.system.characteristics.ocv.value + (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 + this.system.characteristics.omcv.value + (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 + this.system.characteristics.ocv.value + (Number(power.system.ocv) || 0)
+      } else {
+        rollData.powerRoll = 11 + this.system.characteristics.omcv.value + (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)

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",
@@ -29,6 +30,10 @@ export const Hero6_CONFIG = {
     "combat": "Combat" ,
     "custom": "Custom"
   },
+  attackTypes: {
+    "ocv": "OCV",
+    "omcv": "OMCV"
+  },
   powerEquipmentType: {
     "adjustment": "Adjustment",
     "mental": "Mental",

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,13 @@ 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.charac) {
       target = rollData.charac.roll
     }

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000066
+MANIFEST-000104

packs/complications/LOG

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.564375 7fd68f7fe6c0 Recovering log #64
+2023/08/25-22:33:43.637308 7f2dea7fc6c0 Recovering log #102
-2023/08/10-13:03:20.579793 7fd68f7fe6c0 Delete type=3 #62
+2023/08/25-22:33:43.656562 7f2dea7fc6c0 Delete type=3 #100
-2023/08/10-13:03:20.579835 7fd68f7fe6c0 Delete type=0 #64
+2023/08/25-22:33:43.656635 7f2dea7fc6c0 Delete type=0 #102
-2023/08/10-13:05:41.069254 7fd40dfff6c0 Level-0 table #69: started
+2023/08/25-23:00:06.995735 7f2b69bff6c0 Level-0 table #107: started
-2023/08/10-13:05:41.069298 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/25-23:00:06.995769 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/10-13:05:41.080890 7fd40dfff6c0 Delete type=0 #67
+2023/08/25-23:00:07.032420 7f2b69bff6c0 Delete type=0 #105
-2023/08/10-13:05:41.092975 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148662 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.100392 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148788 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/complications/LOG.old

@@ -1,8 +1,8 @@
-2023/08/09-19:54:51.996463 7fd68effd6c0 Recovering log #60
+2023/08/25-22:03:49.171457 7f2debfff6c0 Recovering log #99
-2023/08/09-19:54:52.012482 7fd68effd6c0 Delete type=3 #58
+2023/08/25-22:03:49.191726 7f2debfff6c0 Delete type=0 #99
-2023/08/09-19:54:52.012521 7fd68effd6c0 Delete type=0 #60
+2023/08/25-22:03:49.191857 7f2debfff6c0 Delete type=3 #98
-2023/08/09-22:32:48.122436 7fd40dfff6c0 Level-0 table #65: started
+2023/08/25-22:33:29.419721 7f2b69bff6c0 Level-0 table #103: started
-2023/08/09-22:32:48.122465 7fd40dfff6c0 Level-0 table #65: 0 bytes OK
+2023/08/25-22:33:29.419749 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/09-22:32:48.140182 7fd40dfff6c0 Delete type=0 #63
+2023/08/25-22:33:29.426232 7f2b69bff6c0 Delete type=0 #101
-2023/08/09-22:32:48.152651 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.435893 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/09-22:32:48.161955 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.442710 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000066
+MANIFEST-000106

packs/equipment/LOG

@@ -1,7 +1,8 @@
-2023/08/10-13:03:20.538109 7fd6a4bfa6c0 Recovering log #64
+2023/08/25-22:33:43.623322 7f2deb7fe6c0 Recovering log #104
-2023/08/10-13:03:20.547376 7fd6a4bfa6c0 Delete type=3 #62
+2023/08/25-22:33:43.633958 7f2deb7fe6c0 Delete type=3 #102
-2023/08/10-13:03:20.547429 7fd6a4bfa6c0 Delete type=0 #64
+2023/08/25-22:33:43.634029 7f2deb7fe6c0 Delete type=0 #104
-2023/08/10-13:05:41.019934 7fd40dfff6c0 Level-0 table #69: started
+2023/08/25-23:00:06.835716 7f2b69bff6c0 Level-0 table #109: started
-2023/08/10-13:05:41.019967 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/25-23:00:06.835770 7f2b69bff6c0 Level-0 table #109: 0 bytes OK
-2023/08/10-13:05:41.026189 7fd40dfff6c0 Delete type=0 #67
+2023/08/25-23:00:06.878030 7f2b69bff6c0 Delete type=0 #107
-2023/08/10-13:05:41.026358 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:06.934520 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:06.995606 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,7 +1,8 @@
-2023/08/09-19:54:51.957957 7fd68f7fe6c0 Recovering log #60
+2023/08/25-22:03:49.155681 7f2deaffd6c0 Recovering log #101
-2023/08/09-19:54:51.976885 7fd68f7fe6c0 Delete type=3 #58
+2023/08/25-22:03:49.166583 7f2deaffd6c0 Delete type=0 #101
-2023/08/09-19:54:51.976927 7fd68f7fe6c0 Delete type=0 #60
+2023/08/25-22:03:49.166702 7f2deaffd6c0 Delete type=3 #100
-2023/08/09-22:32:48.065963 7fd40dfff6c0 Level-0 table #65: started
+2023/08/25-22:33:29.368510 7f2b69bff6c0 Level-0 table #105: started
-2023/08/09-22:32:48.065996 7fd40dfff6c0 Level-0 table #65: 0 bytes OK
+2023/08/25-22:33:29.368545 7f2b69bff6c0 Level-0 table #105: 0 bytes OK
-2023/08/09-22:32:48.072796 7fd40dfff6c0 Delete type=0 #63
+2023/08/25-22:33:29.374540 7f2b69bff6c0 Delete type=0 #103
-2023/08/09-22:32:48.073083 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.384577 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.395889 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000058
+MANIFEST-000096

packs/maneuvers/LOG

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.566148 7fd6a4bfa6c0 Recovering log #56
+2023/08/25-22:33:43.656478 7f2deb7fe6c0 Recovering log #94
-2023/08/10-13:03:20.582806 7fd6a4bfa6c0 Delete type=3 #54
+2023/08/25-22:33:43.672940 7f2deb7fe6c0 Delete type=3 #92
-2023/08/10-13:03:20.582865 7fd6a4bfa6c0 Delete type=0 #56
+2023/08/25-22:33:43.673310 7f2deb7fe6c0 Delete type=0 #94
-2023/08/10-13:05:41.081044 7fd40dfff6c0 Level-0 table #61: started
+2023/08/25-23:00:07.111419 7f2b69bff6c0 Level-0 table #99: started
-2023/08/10-13:05:41.081087 7fd40dfff6c0 Level-0 table #61: 0 bytes OK
+2023/08/25-23:00:07.111451 7f2b69bff6c0 Level-0 table #99: 0 bytes OK
-2023/08/10-13:05:41.092838 7fd40dfff6c0 Delete type=0 #59
+2023/08/25-23:00:07.148478 7f2b69bff6c0 Delete type=0 #97
-2023/08/10-13:05:41.100288 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148766 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109268 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148848 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/maneuvers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/09-19:54:51.998063 7fd68f7fe6c0 Recovering log #52
+2023/08/25-22:03:49.194406 7f2deb7fe6c0 Recovering log #91
-2023/08/09-19:54:52.015485 7fd68f7fe6c0 Delete type=3 #50
+2023/08/25-22:03:49.208360 7f2deb7fe6c0 Delete type=0 #91
-2023/08/09-19:54:52.015523 7fd68f7fe6c0 Delete type=0 #52
+2023/08/25-22:03:49.208425 7f2deb7fe6c0 Delete type=3 #90
-2023/08/09-22:32:48.140349 7fd40dfff6c0 Level-0 table #57: started
+2023/08/25-22:33:29.426425 7f2b69bff6c0 Level-0 table #95: started
-2023/08/09-22:32:48.140375 7fd40dfff6c0 Level-0 table #57: 0 bytes OK
+2023/08/25-22:33:29.426459 7f2b69bff6c0 Level-0 table #95: 0 bytes OK
-2023/08/09-22:32:48.152529 7fd40dfff6c0 Delete type=0 #55
+2023/08/25-22:33:29.435592 7f2b69bff6c0 Delete type=0 #93
-2023/08/09-22:32:48.161932 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.442698 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/09-22:32:48.168159 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.449825 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000066
+MANIFEST-000104

packs/perks/LOG

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.581819 7fd68f7fe6c0 Recovering log #64
+2023/08/25-22:33:43.658173 7f2debfff6c0 Recovering log #102
-2023/08/10-13:03:20.598440 7fd68f7fe6c0 Delete type=3 #62
+2023/08/25-22:33:43.676709 7f2debfff6c0 Delete type=3 #100
-2023/08/10-13:03:20.598503 7fd68f7fe6c0 Delete type=0 #64
+2023/08/25-22:33:43.676789 7f2debfff6c0 Delete type=0 #102
-2023/08/10-13:05:41.093002 7fd40dfff6c0 Level-0 table #69: started
+2023/08/25-23:00:07.148917 7f2b69bff6c0 Level-0 table #107: started
-2023/08/10-13:05:41.093032 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/25-23:00:07.148979 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/10-13:05:41.100152 7fd40dfff6c0 Delete type=0 #67
+2023/08/25-23:00:07.190254 7f2b69bff6c0 Delete type=0 #105
-2023/08/10-13:05:41.109249 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.227324 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109302 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.227354 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/perks/LOG.old

@@ -1,8 +1,8 @@
-2023/08/09-19:54:52.014139 7fd68effd6c0 Recovering log #60
+2023/08/25-22:03:49.195155 7f2dea7fc6c0 Recovering log #99
-2023/08/09-19:54:52.030828 7fd68effd6c0 Delete type=3 #58
+2023/08/25-22:03:49.211553 7f2dea7fc6c0 Delete type=0 #99
-2023/08/09-19:54:52.030868 7fd68effd6c0 Delete type=0 #60
+2023/08/25-22:03:49.211615 7f2dea7fc6c0 Delete type=3 #98
-2023/08/09-22:32:48.152675 7fd40dfff6c0 Level-0 table #65: started
+2023/08/25-22:33:29.435955 7f2b69bff6c0 Level-0 table #103: started
-2023/08/09-22:32:48.152695 7fd40dfff6c0 Level-0 table #65: 0 bytes OK
+2023/08/25-22:33:29.436016 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/09-22:32:48.161677 7fd40dfff6c0 Delete type=0 #63
+2023/08/25-22:33:29.442590 7f2b69bff6c0 Delete type=0 #101
-2023/08/09-22:32:48.168140 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.449794 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/09-22:32:48.168192 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.449873 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/powers/CURRENT

@@ -1 +1 @@
-MANIFEST-000067
+MANIFEST-000105

packs/powers/LOG

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.550530 7fd6a4bfa6c0 Recovering log #65
+2023/08/25-22:33:43.636903 7f2deaffd6c0 Recovering log #103
-2023/08/10-13:03:20.564384 7fd6a4bfa6c0 Delete type=3 #63
+2023/08/25-22:33:43.653604 7f2deaffd6c0 Delete type=3 #101
-2023/08/10-13:03:20.564676 7fd6a4bfa6c0 Delete type=0 #65
+2023/08/25-22:33:43.653664 7f2deaffd6c0 Delete type=0 #103
-2023/08/10-13:05:41.056785 7fd40dfff6c0 Level-0 table #70: started
+2023/08/25-23:00:07.074697 7f2b69bff6c0 Level-0 table #108: started
-2023/08/10-13:05:41.056809 7fd40dfff6c0 Level-0 table #70: 0 bytes OK
+2023/08/25-23:00:07.074729 7f2b69bff6c0 Level-0 table #108: 0 bytes OK
-2023/08/10-13:05:41.069063 7fd40dfff6c0 Delete type=0 #68
+2023/08/25-23:00:07.111279 7f2b69bff6c0 Delete type=0 #106
-2023/08/10-13:05:41.081017 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148710 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.092990 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148825 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/powers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/09-19:54:51.978931 7fd68f7fe6c0 Recovering log #60
+2023/08/25-22:03:49.171203 7f2deb7fe6c0 Recovering log #100
-2023/08/09-19:54:51.996667 7fd68f7fe6c0 Delete type=3 #58
+2023/08/25-22:03:49.188376 7f2deb7fe6c0 Delete type=0 #100
-2023/08/09-19:54:51.996711 7fd68f7fe6c0 Delete type=0 #60
+2023/08/25-22:03:49.188518 7f2deb7fe6c0 Delete type=3 #99
-2023/08/09-22:32:48.104080 7fd40dfff6c0 Level-0 table #66: started
+2023/08/25-22:33:29.412461 7f2b69bff6c0 Level-0 table #104: started
-2023/08/09-22:32:48.104109 7fd40dfff6c0 Level-0 table #66: 0 bytes OK
+2023/08/25-22:33:29.412486 7f2b69bff6c0 Level-0 table #104: 0 bytes OK
-2023/08/09-22:32:48.122280 7fd40dfff6c0 Delete type=0 #64
+2023/08/25-22:33:29.419516 7f2b69bff6c0 Delete type=0 #102
-2023/08/09-22:32:48.140320 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.426395 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/09-22:32:48.152663 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.435927 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000066
+MANIFEST-000104

packs/skills/LOG

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.550530 7fd68f7fe6c0 Recovering log #64
+2023/08/25-22:33:43.623321 7f2dea7fc6c0 Recovering log #102
-2023/08/10-13:03:20.561274 7fd68f7fe6c0 Delete type=3 #62
+2023/08/25-22:33:43.633958 7f2dea7fc6c0 Delete type=3 #100
-2023/08/10-13:03:20.561313 7fd68f7fe6c0 Delete type=0 #64
+2023/08/25-22:33:43.634019 7f2dea7fc6c0 Delete type=0 #102
-2023/08/10-13:05:41.037917 7fd40dfff6c0 Level-0 table #69: started
+2023/08/25-23:00:07.032595 7f2b69bff6c0 Level-0 table #107: started
-2023/08/10-13:05:41.037949 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/25-23:00:07.032643 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/10-13:05:41.044140 7fd40dfff6c0 Delete type=0 #67
+2023/08/25-23:00:07.074550 7f2b69bff6c0 Delete type=0 #105
-2023/08/10-13:05:41.069221 7fd40dfff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148689 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.081033 7fd40dfff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.148806 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/skills/LOG.old

@@ -1,8 +1,8 @@
-2023/08/09-19:54:51.975261 7fd68effd6c0 Recovering log #60
+2023/08/25-22:03:49.155679 7f2deb7fe6c0 Recovering log #99
-2023/08/09-19:54:51.993273 7fd68effd6c0 Delete type=3 #58
+2023/08/25-22:03:49.166527 7f2deb7fe6c0 Delete type=0 #99
-2023/08/09-19:54:51.993352 7fd68effd6c0 Delete type=0 #60
+2023/08/25-22:03:49.166599 7f2deb7fe6c0 Delete type=3 #98
-2023/08/09-22:32:48.083211 7fd40dfff6c0 Level-0 table #65: started
+2023/08/25-22:33:29.406141 7f2b69bff6c0 Level-0 table #103: started
-2023/08/09-22:32:48.083253 7fd40dfff6c0 Level-0 table #65: 0 bytes OK
+2023/08/25-22:33:29.406187 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/09-22:32:48.089578 7fd40dfff6c0 Delete type=0 #63
+2023/08/25-22:33:29.412334 7f2b69bff6c0 Delete type=0 #101
-2023/08/09-22:32:48.122406 7fd40dfff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.419707 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/09-22:32:48.140337 7fd40dfff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.426413 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/talents/CURRENT

@@ -1 +1 @@
-MANIFEST-000066
+MANIFEST-000104

packs/talents/LOG

@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.584203 7fd6a4bfa6c0 Recovering log #64
+2023/08/25-22:33:43.675716 7f2deaffd6c0 Recovering log #102
-2023/08/10-13:03:20.602339 7fd6a4bfa6c0 Delete type=3 #62
+2023/08/25-22:33:43.687652 7f2deaffd6c0 Delete type=3 #100
-2023/08/10-13:03:20.602426 7fd6a4bfa6c0 Delete type=0 #64
+2023/08/25-22:33:43.687775 7f2deaffd6c0 Delete type=0 #102
-2023/08/10-13:05:41.100405 7fd40dfff6c0 Level-0 table #69: started
+2023/08/25-23:00:07.190524 7f2b69bff6c0 Level-0 table #107: started
-2023/08/10-13:05:41.100432 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/25-23:00:07.190606 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/10-13:05:41.109117 7fd40dfff6c0 Delete type=0 #67
+2023/08/25-23:00:07.227189 7f2b69bff6c0 Delete type=0 #105
-2023/08/10-13:05:41.109289 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.227339 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109316 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/25-23:00:07.227364 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

packs/talents/LOG.old

@@ -1,8 +1,8 @@
-2023/08/09-19:54:52.016781 7fd68f7fe6c0 Recovering log #60
+2023/08/25-22:03:49.214304 7f2deb7fe6c0 Recovering log #99
-2023/08/09-19:54:52.033878 7fd68f7fe6c0 Delete type=3 #58
+2023/08/25-22:03:49.224837 7f2deb7fe6c0 Delete type=0 #99
-2023/08/09-19:54:52.033921 7fd68f7fe6c0 Delete type=0 #60
+2023/08/25-22:03:49.224905 7f2deb7fe6c0 Delete type=3 #98
-2023/08/09-22:32:48.161969 7fd40dfff6c0 Level-0 table #65: started
+2023/08/25-22:33:29.442721 7f2b69bff6c0 Level-0 table #103: started
-2023/08/09-22:32:48.162008 7fd40dfff6c0 Level-0 table #65: 0 bytes OK
+2023/08/25-22:33:29.442743 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/09-22:32:48.168054 7fd40dfff6c0 Delete type=0 #63
+2023/08/25-22:33:29.449583 7f2b69bff6c0 Delete type=0 #101
-2023/08/09-22:32:48.168167 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.449849 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/09-22:32:48.168181 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/25-22:33:29.449897 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

packs/weapons/CURRENT

@@ -1 +1 @@
-MANIFEST-000066
+MANIFEST-000086

packs/weapons/LOG

@@ -1,7 +1,7 @@
-2023/08/10-13:03:20.538110 7fd68f7fe6c0 Recovering log #64
+2023/08/24-15:57:43.392826 7fab4affd6c0 Recovering log #84
-2023/08/10-13:03:20.547376 7fd68f7fe6c0 Delete type=3 #62
+2023/08/24-15:57:43.403060 7fab4affd6c0 Delete type=3 #82
-2023/08/10-13:03:20.547427 7fd68f7fe6c0 Delete type=0 #64
+2023/08/24-15:57:43.403157 7fab4affd6c0 Delete type=0 #84
-2023/08/10-13:05:41.044355 7fd40dfff6c0 Level-0 table #69: started
+2023/08/24-15:59:11.995583 7fab497fa6c0 Level-0 table #89: started
-2023/08/10-13:05:41.044380 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
+2023/08/24-15:59:11.995614 7fab497fa6c0 Level-0 table #89: 0 bytes OK
-2023/08/10-13:05:41.056662 7fd40dfff6c0 Delete type=0 #67
+2023/08/24-15:59:12.004480 7fab497fa6c0 Delete type=0 #87
-2023/08/10-13:05:41.069241 7fd40dfff6c0 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)

packs/weapons/LOG.old

@@ -1,7 +1,7 @@
-2023/08/09-19:54:51.957872 7fd68effd6c0 Recovering log #60
+2023/08/24-15:09:37.452353 7fab4b7fe6c0 Recovering log #80
-2023/08/09-19:54:51.973552 7fd68effd6c0 Delete type=3 #58
+2023/08/24-15:09:37.462595 7fab4b7fe6c0 Delete type=3 #78
-2023/08/09-19:54:51.973583 7fd68effd6c0 Delete type=0 #60
+2023/08/24-15:09:37.462673 7fab4b7fe6c0 Delete type=0 #80
-2023/08/09-22:32:48.089701 7fd40dfff6c0 Level-0 table #65: started
+2023/08/24-15:56:20.976153 7fab497fa6c0 Level-0 table #85: started
-2023/08/09-22:32:48.089745 7fd40dfff6c0 Level-0 table #65: 0 bytes OK
+2023/08/24-15:56:20.976179 7fab497fa6c0 Level-0 table #85: 0 bytes OK
-2023/08/09-22:32:48.103941 7fd40dfff6c0 Delete type=0 #63
+2023/08/24-15:56:20.984268 7fab497fa6c0 Delete type=0 #83
-2023/08/09-22:32:48.122422 7fd40dfff6c0 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)

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;
 }
 
@@ -1411,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,4 +1436,11 @@ 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
+}

system.json

@@ -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,14 +91,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.6",
+  "version": "11.0.14",
   "compatibility": {
     "minimum": "11",
     "verified": "11"
   },
   "title": "Hero System v6 for FoundrtVTT (Official)",
-  "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
+  "manifest": "https://www.uberwald.me/gitea/uberwald/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.6.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.14.zip",
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp",
   "id": "fvtt-hero-system-6"

template.json

@@ -357,6 +357,7 @@
         "damage": "",
         "endurance": 0,
         "hasroll": false,
+        "attackvalue": "ocv",
         "roll": 0,
         "computebody": false,
         "haseffectroll": false,
@@ -375,6 +376,8 @@
       "pha": "",
       "ocv": "",
       "dcv" : "",
+      "omcv": "",
+      "dmcv" : "",
       "isstock": false,
       "active": false
     },
@@ -416,7 +419,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": [

templates/actors/actor-sheet.hbs

@@ -169,15 +169,15 @@
               </span>
             </li>
             {{#each mlist as |maneuver key|}}
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
+            <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>
               <a class="roll-item"><i class="fas fa-dice"></i></a><span class="item-field-label-long">{{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>
+              <span class="item-field-label-very-short content-center">{{maneuver.system.ocv}}</span>
-              <span class="item-field-label-very-short">{{maneuver.system.dcv}}</span>
+              <span class="item-field-label-very-short content-center">{{maneuver.system.dcv}}</span>
 
               <span class="item-field-text-long">{{maneuver.system.effects}}
                 {{#if maneuver.system.haseffectroll}}
@@ -188,10 +188,6 @@
                 {{/if}}
               </span>
 
-              <span class="">&nbsp;</span>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
             </li>
             {{/each}}
           </ul>
@@ -537,6 +533,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">
@@ -551,29 +551,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")}}
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+          <div class="{{#if maneuver.system.isstock}}maneuver-list maneuver-is-stock{{/if}}">
-              src="{{maneuver.img}}" /></a>
+            <li class="item stat flexrow list-item list-item-shadow " data-item-id="{{maneuver._id}}">
-          <span class="item-field-label-long">{{maneuver.name}}</span>
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{maneuver.img}}" /></a>
+              <span class="item-field-label-long">{{maneuver.name}}</span>
 
-          <span class="item-field-label-short">{{maneuver.system.pha}}</span>
+              <span class="item-field-label-short">{{maneuver.system.pha}}</span>
-          <span class="item-field-label-short">{{maneuver.system.ocv}}</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-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-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
+              <div class="item-controls item-controls-fixed">
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
           </div>
-        </li>
+        {{/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-mental-maneuver">
+                  <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.omcv}}</span>
+              <span class="item-field-label-short">{{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 --}}
@@ -608,7 +659,16 @@
           <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>
@@ -670,6 +730,9 @@
         <span class="small-label">Total value : {{totalValue}}</span>
       </div>
 
+      {{> 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}}
 

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>

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>
 

templates/chat/chat-damage-result.hbs

@@ -7,12 +7,6 @@
 
   <hr>
   
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
-
   <div class="flexcol">
     </div>
 

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}}

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>
 

templates/items/item-advantage-sheet.hbs

@@ -20,6 +20,8 @@
           </li>
         </ul>
       </div>
+
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
       
     </section>
 </form>

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>

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>

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>

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>

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>

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>

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>

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>

templates/items/item-skill-sheet.hbs

@@ -79,5 +79,8 @@
 
           </ul>
         </div>
+  
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
+
     </section>
 </form>

templates/items/item-talent-sheet.hbs

@@ -22,6 +22,8 @@
         </ul>
 
       </div>
-  
+
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}}
+
     </section>
 </form>

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>

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>

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>

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">

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>

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>

templates/partials/partial-power-equipment-cost.hbs

@@ -18,16 +18,31 @@
         </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</label>
         <input type="text" class="item-field-label-medium" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
       </li>
+      {{/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>