Fix manifest link

README.md

@@ -2,8 +2,17 @@ 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
 
 For manual installation, use the provided manifest URL in the "Install System" popup window while managing game systems.
 

lang/en.json

@@ -1,19 +1,22 @@
   {
-    "ACTOR": {
+    "TYPES": {
-      "TypeCharacter": "Character"
+      "Actor": {
+        "character": "Character",
+        "minion": "Minion"
       },
-    "ITEM": {
+      "Item": {
-      "TypeSkill": "Skill",
+        "skill": "Skill",
-      "TypePerk": "Perk",
+        "perk": "Perk",
-      "TypePower": "Power",
+        "power": "Power",
-      "TypeTalent": "Talent",
+        "talent": "Talent",
-      "TypeAdvantage": "Advantage",
+        "advantage": "Advantage",
-      "TypeMartialart": "Martial art",
+        "martialart": "Martial art",
-      "TypeLimitation": "Limitation",
+        "limitation": "Limitation",
-      "TypeComplication": "Complication",
+        "complication": "Complication",
-      "TypeEquipment": "Equipment",
+        "equipment": "Equipment",
-      "TypeCurrency": "Currency",
+        "currency": "Currency",
-      "TypeManeuver": "Maneuver"
+        "maneuver": "Maneuver"  
+      }
     },
     "COMBAT": {
       "TurnPrev": "Previous initiative",

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 => {
@@ -198,6 +202,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

@@ -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()
     if (newSTREND != this.system.characteristics.str.strend) {
       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
@@ -303,6 +311,11 @@ export class Hero6Actor extends Actor {
     Hero6Utility.sortArrayObjectsByName(maneuvers.defensive)
     return maneuvers
   }
+  getAllManeuvers() {
+    let maneuvers = this.items.filter(item => item.type == "maneuver")
+    Hero6Utility.sortArrayObjectsByName(maneuvers)
+    return maneuvers
+  }
   getNonStockManeuvers() {
     let maneuvers = this.items.filter(item => item.type == "maneuver" && !item.system.isstock)
     Hero6Utility.sortArrayObjectsByName(maneuvers)
@@ -313,6 +326,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)
@@ -516,9 +534,14 @@ export class Hero6Actor extends Actor {
 
   /* -------------------------------------------- */
   prepareCharacValues(charac) {
+    if (charac.label == "OCV" || charac.label == "OMCV" ) {
+      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)
     for (let key in characs) {

modules/hero6-config.js

@@ -53,6 +53,5 @@ export const Hero6_CONFIG = {
     "standard": "Standard",
     "normal": "Normal",
     "killing": "Killing",
-    "countbody": "Killing (Count BODY)"
   }
 }

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

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',
@@ -355,7 +359,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

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000046
+MANIFEST-000098

packs/complications/LOG

@@ -1,8 +1,3 @@
-2023/08/08-08:16:25.461187 7f5afd5f96c0 Recovering log #44
+2023/08/24-20:28:52.588130 7fda7bbff6c0 Recovering log #96
-2023/08/08-08:16:25.474679 7f5afd5f96c0 Delete type=3 #42
+2023/08/24-20:28:52.597974 7fda7bbff6c0 Delete type=3 #94
-2023/08/08-08:16:25.474715 7f5afd5f96c0 Delete type=0 #44
+2023/08/24-20:28:52.598068 7fda7bbff6c0 Delete type=0 #96
-2023/08/08-08:17:06.635707 7f58677fe6c0 Level-0 table #49: started
-2023/08/08-08:17:06.635749 7f58677fe6c0 Level-0 table #49: 0 bytes OK
-2023/08/08-08:17:06.642802 7f58677fe6c0 Delete type=0 #47
-2023/08/08-08:17:06.643044 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/08-08:17:06.643110 7f58677fe6c0 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/07-22:18:14.000526 7f5afddfa6c0 Recovering log #40
+2023/08/24-20:11:49.190057 7fda7abfd6c0 Recovering log #92
-2023/08/07-22:18:14.012956 7f5afddfa6c0 Delete type=3 #38
+2023/08/24-20:11:49.204015 7fda7abfd6c0 Delete type=3 #90
-2023/08/07-22:18:14.012989 7f5afddfa6c0 Delete type=0 #40
+2023/08/24-20:11:49.204065 7fda7abfd6c0 Delete type=0 #92
-2023/08/07-23:27:51.013130 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-20:28:26.993087 7fda79bfb6c0 Level-0 table #97: started
-2023/08/07-23:27:51.013173 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-20:28:26.993130 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/07-23:27:51.019258 7f58677fe6c0 Delete type=0 #43
+2023/08/24-20:28:27.002024 7fda79bfb6c0 Delete type=0 #95
-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/24-20:28:27.002188 7fda79bfb6c0 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/24-20:28:27.002221 7fda79bfb6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000046
+MANIFEST-000100

packs/equipment/LOG

@@ -1,7 +1,3 @@
-2023/08/08-08:16:25.435366 7f5afcdf86c0 Recovering log #44
+2023/08/24-20:28:52.572724 7fda7a3fc6c0 Recovering log #97
-2023/08/08-08:16:25.445289 7f5afcdf86c0 Delete type=3 #42
+2023/08/24-20:28:52.584112 7fda7a3fc6c0 Delete type=3 #95
-2023/08/08-08:16:25.445363 7f5afcdf86c0 Delete type=0 #44
+2023/08/24-20:28:52.584178 7fda7a3fc6c0 Delete type=0 #97
-2023/08/08-08:17:06.600288 7f58677fe6c0 Level-0 table #49: started
-2023/08/08-08:17:06.600344 7f58677fe6c0 Level-0 table #49: 0 bytes OK
-2023/08/08-08:17:06.607987 7f58677fe6c0 Delete type=0 #47
-2023/08/08-08:17:06.615309 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,7 +1,15 @@
-2023/08/07-22:18:13.969369 7f5afd5f96c0 Recovering log #40
+2023/08/24-20:11:49.176021 7fda7b3fe6c0 Recovering log #92
-2023/08/07-22:18:13.978774 7f5afd5f96c0 Delete type=3 #38
+2023/08/24-20:11:49.186442 7fda7b3fe6c0 Delete type=3 #90
-2023/08/07-22:18:13.978872 7f5afd5f96c0 Delete type=0 #40
+2023/08/24-20:11:49.186511 7fda7b3fe6c0 Delete type=0 #92
-2023/08/07-23:27:50.976450 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-20:28:26.929251 7fda79bfb6c0 Level-0 table #98: started
-2023/08/07-23:27:50.976502 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-20:28:26.933483 7fda79bfb6c0 Level-0 table #98: 61208 bytes OK
-2023/08/07-23:27:50.982719 7f58677fe6c0 Delete type=0 #43
+2023/08/24-20:28:26.940562 7fda79bfb6c0 Delete type=0 #96
-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/24-20:28:26.961338 7fda79bfb6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/24-20:28:26.961409 7fda79bfb6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at '!items!zFQRJSrYV4E12NgW' @ 355 : 1
+2023/08/24-20:28:26.961416 7fda79bfb6c0 Compacting 1@1 + 1@2 files
+2023/08/24-20:28:26.966548 7fda79bfb6c0 Generated table #99@1: 125 keys, 61208 bytes
+2023/08/24-20:28:26.966578 7fda79bfb6c0 Compacted 1@1 + 1@2 files => 61208 bytes
+2023/08/24-20:28:26.974691 7fda79bfb6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/08/24-20:28:26.974830 7fda79bfb6c0 Delete type=2 #94
+2023/08/24-20:28:26.975013 7fda79bfb6c0 Delete type=2 #98
+2023/08/24-20:28:27.002145 7fda79bfb6c0 Manual compaction at level-1 from '!items!zFQRJSrYV4E12NgW' @ 355 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000038
+MANIFEST-000090

packs/maneuvers/LOG

@@ -1,8 +1,3 @@
-2023/08/08-08:16:25.461251 7f5afddfa6c0 Recovering log #36
+2023/08/24-20:28:52.601708 7fda7a3fc6c0 Recovering log #88
-2023/08/08-08:16:25.477680 7f5afddfa6c0 Delete type=3 #34
+2023/08/24-20:28:52.613896 7fda7a3fc6c0 Delete type=3 #86
-2023/08/08-08:16:25.477718 7f5afddfa6c0 Delete type=0 #36
+2023/08/24-20:28:52.614012 7fda7a3fc6c0 Delete type=0 #88
-2023/08/08-08:17:06.629201 7f58677fe6c0 Level-0 table #41: started
-2023/08/08-08:17:06.629246 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/08-08:17:06.635576 7f58677fe6c0 Delete type=0 #39
-2023/08/08-08:17:06.643022 7f58677fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/08-08:17:06.643086 7f58677fe6c0 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/07-22:18:14.000527 7f5afd5f96c0 Recovering log #32
+2023/08/24-20:11:49.203061 7fda7bbff6c0 Recovering log #84
-2023/08/07-22:18:14.012956 7f5afd5f96c0 Delete type=3 #30
+2023/08/24-20:11:49.219726 7fda7bbff6c0 Delete type=3 #82
-2023/08/07-22:18:14.012992 7f5afd5f96c0 Delete type=0 #32
+2023/08/24-20:11:49.219820 7fda7bbff6c0 Delete type=0 #84
-2023/08/07-23:27:51.026690 7f58677fe6c0 Level-0 table #37: started
+2023/08/24-20:28:27.002307 7fda79bfb6c0 Level-0 table #89: started
-2023/08/07-23:27:51.026730 7f58677fe6c0 Level-0 table #37: 0 bytes OK
+2023/08/24-20:28:27.002338 7fda79bfb6c0 Level-0 table #89: 0 bytes OK
-2023/08/07-23:27:51.033892 7f58677fe6c0 Delete type=0 #35
+2023/08/24-20:28:27.008560 7fda79bfb6c0 Delete type=0 #87
-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/24-20:28:27.051981 7fda79bfb6c0 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/24-20:28:27.052022 7fda79bfb6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000046
+MANIFEST-000098

packs/perks/LOG

@@ -1,8 +1,3 @@
-2023/08/08-08:16:25.476569 7f5afd5f96c0 Recovering log #44
+2023/08/24-20:28:52.601706 7fda7abfd6c0 Recovering log #96
-2023/08/08-08:16:25.493410 7f5afd5f96c0 Delete type=3 #42
+2023/08/24-20:28:52.613896 7fda7abfd6c0 Delete type=3 #94
-2023/08/08-08:16:25.493503 7f5afd5f96c0 Delete type=0 #44
+2023/08/24-20:28:52.613994 7fda7abfd6c0 Delete type=0 #96
-2023/08/08-08:17:06.643184 7f58677fe6c0 Level-0 table #49: started
-2023/08/08-08:17:06.643236 7f58677fe6c0 Level-0 table #49: 0 bytes OK
-2023/08/08-08:17:06.650531 7f58677fe6c0 Delete type=0 #47
-2023/08/08-08:17:06.658850 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/08-08:17:06.658878 7f58677fe6c0 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/07-22:18:14.015482 7f5afcdf86c0 Recovering log #40
+2023/08/24-20:11:49.205472 7fda7b3fe6c0 Recovering log #92
-2023/08/07-22:18:14.031405 7f5afcdf86c0 Delete type=3 #38
+2023/08/24-20:11:49.222633 7fda7b3fe6c0 Delete type=3 #90
-2023/08/07-22:18:14.031513 7f5afcdf86c0 Delete type=0 #40
+2023/08/24-20:11:49.222697 7fda7b3fe6c0 Delete type=0 #92
-2023/08/07-23:27:51.019445 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-20:28:27.019936 7fda79bfb6c0 Level-0 table #97: started
-2023/08/07-23:27:51.019492 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-20:28:27.019979 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/07-23:27:51.026550 7f58677fe6c0 Delete type=0 #43
+2023/08/24-20:28:27.051866 7fda79bfb6c0 Delete type=0 #95
-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/24-20:28:27.052012 7fda79bfb6c0 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/24-20:28:27.052040 7fda79bfb6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/powers/CURRENT

@@ -1 +1 @@
-MANIFEST-000046
+MANIFEST-000099

packs/powers/LOG

@@ -1,8 +1,3 @@
-2023/08/08-08:16:25.447883 7f5afddfa6c0 Recovering log #44
+2023/08/24-20:28:52.588130 7fda7abfd6c0 Recovering log #97
-2023/08/08-08:16:25.457469 7f5afddfa6c0 Delete type=3 #42
+2023/08/24-20:28:52.597915 7fda7abfd6c0 Delete type=3 #95
-2023/08/08-08:16:25.457528 7f5afddfa6c0 Delete type=0 #44
+2023/08/24-20:28:52.597970 7fda7abfd6c0 Delete type=0 #97
-2023/08/08-08:17:06.621801 7f58677fe6c0 Level-0 table #49: started
-2023/08/08-08:17:06.621842 7f58677fe6c0 Level-0 table #49: 0 bytes OK
-2023/08/08-08:17:06.629025 7f58677fe6c0 Delete type=0 #47
-2023/08/08-08:17:06.642970 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/08-08:17:06.643067 7f58677fe6c0 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/07-22:18:13.982354 7f5afd5f96c0 Recovering log #40
+2023/08/24-20:11:49.190059 7fda7a3fc6c0 Recovering log #93
-2023/08/07-22:18:13.997957 7f5afd5f96c0 Delete type=3 #38
+2023/08/24-20:11:49.201012 7fda7a3fc6c0 Delete type=3 #91
-2023/08/07-22:18:13.998008 7f5afd5f96c0 Delete type=0 #40
+2023/08/24-20:11:49.201080 7fda7a3fc6c0 Delete type=0 #93
-2023/08/07-23:27:51.005564 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-20:28:26.985277 7fda79bfb6c0 Level-0 table #98: started
-2023/08/07-23:27:51.005735 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-20:28:26.985305 7fda79bfb6c0 Level-0 table #98: 0 bytes OK
-2023/08/07-23:27:51.012861 7f58677fe6c0 Delete type=0 #43
+2023/08/24-20:28:26.992913 7fda79bfb6c0 Delete type=0 #96
-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/24-20:28:27.002175 7fda79bfb6c0 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/24-20:28:27.002210 7fda79bfb6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000046
+MANIFEST-000098

packs/skills/LOG

@@ -1,8 +1,3 @@
-2023/08/08-08:16:25.447873 7f5afcdf86c0 Recovering log #44
+2023/08/24-20:28:52.572723 7fda7b3fe6c0 Recovering log #96
-2023/08/08-08:16:25.457419 7f5afcdf86c0 Delete type=3 #42
+2023/08/24-20:28:52.584114 7fda7b3fe6c0 Delete type=3 #94
-2023/08/08-08:16:25.457478 7f5afcdf86c0 Delete type=0 #44
+2023/08/24-20:28:52.584178 7fda7b3fe6c0 Delete type=0 #96
-2023/08/08-08:17:06.615328 7f58677fe6c0 Level-0 table #49: started
-2023/08/08-08:17:06.615361 7f58677fe6c0 Level-0 table #49: 0 bytes OK
-2023/08/08-08:17:06.621611 7f58677fe6c0 Delete type=0 #47
-2023/08/08-08:17:06.629182 7f58677fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/08-08:17:06.643000 7f58677fe6c0 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/07-22:18:13.982353 7f5afddfa6c0 Recovering log #40
+2023/08/24-20:11:49.176021 7fda7bbff6c0 Recovering log #92
-2023/08/07-22:18:13.997971 7f5afddfa6c0 Delete type=3 #38
+2023/08/24-20:11:49.186443 7fda7bbff6c0 Delete type=3 #90
-2023/08/07-22:18:13.998032 7f5afddfa6c0 Delete type=0 #40
+2023/08/24-20:11:49.186509 7fda7bbff6c0 Delete type=0 #92
-2023/08/07-23:27:50.999438 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-20:28:26.975180 7fda79bfb6c0 Level-0 table #97: started
-2023/08/07-23:27:50.999471 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-20:28:26.975225 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/07-23:27:51.005436 7f58677fe6c0 Delete type=0 #43
+2023/08/24-20:28:26.985137 7fda79bfb6c0 Delete type=0 #95
-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/24-20:28:27.002160 7fda79bfb6c0 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/24-20:28:27.002199 7fda79bfb6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/talents/CURRENT

@@ -1 +1 @@
-MANIFEST-000046
+MANIFEST-000098

packs/talents/LOG

@@ -1,8 +1,3 @@
-2023/08/08-08:16:25.478881 7f5afddfa6c0 Recovering log #44
+2023/08/24-20:28:52.617237 7fda7abfd6c0 Recovering log #96
-2023/08/08-08:16:25.496212 7f5afddfa6c0 Delete type=3 #42
+2023/08/24-20:28:52.627761 7fda7abfd6c0 Delete type=3 #94
-2023/08/08-08:16:25.496252 7f5afddfa6c0 Delete type=0 #44
+2023/08/24-20:28:52.627835 7fda7abfd6c0 Delete type=0 #96
-2023/08/08-08:17:06.650728 7f58677fe6c0 Level-0 table #49: started
-2023/08/08-08:17:06.650795 7f58677fe6c0 Level-0 table #49: 0 bytes OK
-2023/08/08-08:17:06.658621 7f58677fe6c0 Delete type=0 #47
-2023/08/08-08:17:06.658890 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/08-08:17:06.658907 7f58677fe6c0 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/07-22:18:14.015482 7f5afd5f96c0 Recovering log #40
+2023/08/24-20:11:49.221624 7fda7a3fc6c0 Recovering log #92
-2023/08/07-22:18:14.034395 7f5afd5f96c0 Delete type=3 #38
+2023/08/24-20:11:49.232090 7fda7a3fc6c0 Delete type=3 #90
-2023/08/07-22:18:14.034433 7f5afd5f96c0 Delete type=0 #40
+2023/08/24-20:11:49.232138 7fda7a3fc6c0 Delete type=0 #92
-2023/08/07-23:27:51.034000 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-20:28:27.008700 7fda79bfb6c0 Level-0 table #97: started
-2023/08/07-23:27:51.034031 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-20:28:27.008737 7fda79bfb6c0 Level-0 table #97: 0 bytes OK
-2023/08/07-23:27:51.040235 7f58677fe6c0 Delete type=0 #43
+2023/08/24-20:28:27.019736 7fda79bfb6c0 Delete type=0 #95
-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/24-20:28:27.051993 7fda79bfb6c0 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/24-20:28:27.052030 7fda79bfb6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

packs/weapons/CURRENT

@@ -1 +1 @@
-MANIFEST-000046
+MANIFEST-000086

packs/weapons/LOG

@@ -1,7 +1,7 @@
-2023/08/08-08:16:25.435335 7f5afddfa6c0 Recovering log #44
+2023/08/24-15:57:43.392826 7fab4affd6c0 Recovering log #84
-2023/08/08-08:16:25.445302 7f5afddfa6c0 Delete type=3 #42
+2023/08/24-15:57:43.403060 7fab4affd6c0 Delete type=3 #82
-2023/08/08-08:16:25.445339 7f5afddfa6c0 Delete type=0 #44
+2023/08/24-15:57:43.403157 7fab4affd6c0 Delete type=0 #84
-2023/08/08-08:17:06.608167 7f58677fe6c0 Level-0 table #49: started
+2023/08/24-15:59:11.995583 7fab497fa6c0 Level-0 table #89: started
-2023/08/08-08:17:06.608235 7f58677fe6c0 Level-0 table #49: 0 bytes OK
+2023/08/24-15:59:11.995614 7fab497fa6c0 Level-0 table #89: 0 bytes OK
-2023/08/08-08:17:06.615092 7f58677fe6c0 Delete type=0 #47
+2023/08/24-15:59:12.004480 7fab497fa6c0 Delete type=0 #87
-2023/08/08-08:17:06.621758 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)

packs/weapons/LOG.old

@@ -1,7 +1,7 @@
-2023/08/07-22:18:13.969369 7f5afddfa6c0 Recovering log #40
+2023/08/24-15:09:37.452353 7fab4b7fe6c0 Recovering log #80
-2023/08/07-22:18:13.978774 7f5afddfa6c0 Delete type=3 #38
+2023/08/24-15:09:37.462595 7fab4b7fe6c0 Delete type=3 #78
-2023/08/07-22:18:13.978889 7f5afddfa6c0 Delete type=0 #40
+2023/08/24-15:09:37.462673 7fab4b7fe6c0 Delete type=0 #80
-2023/08/07-23:27:50.992870 7f58677fe6c0 Level-0 table #45: started
+2023/08/24-15:56:20.976153 7fab497fa6c0 Level-0 table #85: started
-2023/08/07-23:27:50.992899 7f58677fe6c0 Level-0 table #45: 0 bytes OK
+2023/08/24-15:56:20.976179 7fab497fa6c0 Level-0 table #85: 0 bytes OK
-2023/08/07-23:27:50.999291 7f58677fe6c0 Delete type=0 #43
+2023/08/24-15:56:20.984268 7fab497fa6c0 Delete type=0 #83
-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: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;
 }
 
@@ -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
+}

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.3",
+  "version": "11.0.13",
   "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.3.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.13.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

@@ -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": {
@@ -406,7 +416,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

@@ -18,8 +18,8 @@
             <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>
@@ -29,21 +29,23 @@
               <ul class="item-list alternate-list">
                 <li class="flexrow item">
                   <label class="item-field-label-medium">Campaign</label>
-                <input type="text" class="item-field-label-long3" name="system.biodata.campaign" value="{{system.biodata.campaign}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-long3" name="system.biodata.campaign"
+                    value="{{system.biodata.campaign}}" data-dtype="String" />
                 </li>
                 <li class="flexrow item">
                   <label class="item-field-label-medium">Player</label>
-                <input type="text" class="item-field-label-long3" name="system.biodata.player" value="{{system.biodata.player}}"
+                  <input type="text" class="item-field-label-long3" name="system.biodata.player"
-                  data-dtype="String" />
+                    value="{{system.biodata.player}}" data-dtype="String" />
                 </li>
                 <li class="flexrow item">
                   <label class="item-field-label-medium">GM</label>
-                <input type="text" class="item-field-label-long3" name="system.biodata.gm" value="{{system.biodata.gm}}"
+                  <input type="text" class="item-field-label-long3" name="system.biodata.gm"
-                  data-dtype="String" />
+                    value="{{system.biodata.gm}}" data-dtype="String" />
                 </li>
                 <li class="item flexrow">
                   <label class="item-field-label-medium">Hair</label>
-                <input type="text" class="item-field-label-long3" name="system.biodata.hair" value="{{system.biodata.hair}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-long3" name="system.biodata.hair"
+                    value="{{system.biodata.hair}}" data-dtype="String" />
                 </li>
               </ul>
             </div>
@@ -51,19 +53,23 @@
               <ul class="item-list alternate-list">
                 <li class="flexrow item">
                   <label class="item-field-label-medium">Gender</label>
-                <input type="text" class="item-field-label-medium" name="system.biodata.gender" value="{{system.biodata.gender}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-medium" name="system.biodata.gender"
+                    value="{{system.biodata.gender}}" data-dtype="String" />
                 </li>
                 <li class="item flexrow">
                   <label class="item-field-label-medium">Height</label>
-                <input type="text" class="item-field-label-medium" name="system.biodata.height" value="{{system.biodata.height}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-medium" name="system.biodata.height"
+                    value="{{system.biodata.height}}" data-dtype="String" />
                 </li>
                 <li class="item flexrow">
                   <label class="item-field-label-medium">Mass</label>
-                <input type="text" class="item-field-label-medium" name="system.biodata.mass" value="{{system.biodata.mass}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-medium" name="system.biodata.mass"
+                    value="{{system.biodata.mass}}" data-dtype="String" />
                 </li>
                 <li class="item flexrow">
                   <label class="item-field-label-medium">Eyes</label>
-                <input type="text" class="item-field-label-medium" name="system.biodata.eyes" value="{{system.biodata.eyes}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-medium" name="system.biodata.eyes"
+                    value="{{system.biodata.eyes}}" data-dtype="String" />
                 </li>
               </ul>
             </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>
@@ -127,10 +137,14 @@
               <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>
@@ -158,8 +172,7 @@
             <li class="item flexrow list-item list-item-shadow " data-item-id="{{maneuver._id}}">
               <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                   src="{{maneuver.img}}" /></a>
-                <span class="item-field-label-long">{{maneuver.name}}
+              <a class="roll-item"><i class="fas fa-dice"></i></a><span class="item-field-label-long">{{maneuver.name}}
-                  <a class="roll-item"><i class="fas fa-dice"></i></a>
               </span>
 
               <span class="item-field-label-very-short">{{maneuver.system.pha}}</span>
@@ -168,16 +181,13 @@
 
               <span class="item-field-text-long">{{maneuver.system.effects}}
                 {{#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}}"
+                  data-roll-formula="{{maneuver.system.effectrollformula}}">
                   <i class="fas fa-dice"></i>{{maneuver.system.effectrollformula}}
                 </a>
                 {{/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>
@@ -189,16 +199,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>
 
@@ -223,8 +240,10 @@
                 {{#if char.isvital}}
                 <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                   <span class="item-field-label-long">{{char.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short 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" />
+                  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.damage"
+                    value="{{char.damage}}" data-dtype="Number" />
                 </li>
                 {{/if}}
                 {{/each}}
@@ -250,43 +269,59 @@
                 {{#if char.isdefense}}
                 <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                   <span class="item-field-label-long">{{char.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short 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" />
+                  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.resistant"
+                    value="{{char.resistant}}" data-dtype="Number" />
                 </li>
                 {{/if}}
                 {{/each}}
                 {{#each defenses as |def key|}}
                 <li class="item flexrow list-item list-item-shadow" data-defense-key="{{key}}">
                   {{#if def.iseditable}}
-                    <input type="text" class="item-field-label-long update-field" data-field-name="system.defenses.{{key}}.label" value="{{def.label}}" data-dtype="String" />
+                  <input type="text" class="item-field-label-long update-field"
+                    data-field-name="system.defenses.{{key}}.label" value="{{def.label}}" data-dtype="String" />
                   {{else}}
                   <span class="item-field-label-long">{{def.label}}</span>
                   {{/if}}
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.defenses.{{key}}.value" value="{{def.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short update-field"
-                    <input type="text" class="item-field-label-short" name="system.defenses.{{key}}.resistant" value="{{def.resistant}}" data-dtype="Number" />
+                    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">
@@ -309,10 +344,13 @@
                   <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" />
+                  <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>
@@ -332,20 +370,26 @@
                 {{#if char.ismovement}}
                 <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                   <span class="item-field-label-long">{{char.label}}</span>
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short 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" />
+                  <input type="text" class="item-field-label-short update-field"
+                    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}}">
                   {{#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"
+                    data-field-name="system.movements.{{key}}.label" value="{{move.label}}" data-dtype="String" />
                   {{else}}
                   <span class="item-field-label-long">{{move.label}}</span>
                   {{/if}}
-                    <input type="text" class="item-field-label-short update-field" data-field-name="system.movements.{{key}}.value" value="{{move.value}}" data-dtype="Number" />
+                  <input type="text" class="item-field-label-short update-field"
-                    <input type="text" class="item-field-label-short" value="{{mul move.value 2}}" disabled data-dtype="Number" />
+                    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>
@@ -411,7 +455,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 +484,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 +516,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 +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">
@@ -500,11 +551,12 @@
           <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|}}
+        <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>
@@ -514,13 +566,14 @@
             <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>
         {{/each}}
       </ul>
     </div>
@@ -559,9 +612,11 @@
           <span class="item-field-label-short">{{power.system.cost}}</span>
           <span class="item-field-label-long3">{{power.name}}</span>
           <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 +648,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 +672,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>
 

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>
 
@@ -33,6 +27,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)}}

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

@@ -21,5 +21,7 @@
         </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

@@ -53,5 +53,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

@@ -23,5 +23,7 @@
 
       </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,53 @@
 <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">{{equip.name}}</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 +55,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

@@ -22,12 +22,15 @@
         <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>