Fix #21 : Add the missing helper

changelog.md

@@ -1,4 +1,23 @@
+v11.0.18
+
+- Fix killing damage computation
+
+v11.0.17
+
+- Fix tickets 1, 2, 3, 7, 8, 9, 10
+- Implements effects tagging (#11)
+  
+v11.0.16
+
+- Fix mental maneuvers rolls
+- Renamed title
+
+v11.0.15
+
+- Fix target rolls for power
+- Add maneuvers roll in the maneuver tab
+- Renamed title
+ 
 v11.0.14
 
-
 - Initial public release

modules/hero6-actor-sheet.js

@@ -166,21 +166,15 @@ export class Hero6ActorSheet extends ActorSheet {
       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")
       const rollSource = $(event.currentTarget).data("roll-source")
       Hero6Utility.processDirectRoll( { actorId: this.actor.id, rollFormula: rollFormula, rollSource: rollSource, mode:"directroll"} )
-    });
-    
+    });    
     html.find('.roll-item').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       let itemId = li.data("item-id")
@@ -196,11 +190,6 @@ export class Hero6ActorSheet extends ActorSheet {
       let itemId = li.data("item-id")
       this.actor.rollLiftDice(itemId);
     });    
-    html.find('.roll-maneuver').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
-      const maneuverId = li.data("maneuver-id")
-      this.actor.rollManeuver(maneuverId)
-    });
     
     html.find('.hold-action').click((event) => {
       this.actor.holdAction()

modules/hero6-actor.js

@@ -216,7 +216,6 @@ export class Hero6Actor extends Actor {
         skill.roll = charac.roll
       }
     }
-    console.log("SILL", skill)
     if (skill.system.levels > 0) {
       skill.roll += skill.system.levels
     }
@@ -224,12 +223,20 @@ export class Hero6Actor extends Actor {
 
   /* -------------------------------------------- */
   prepareManeuver(maneuver) {
-
-    maneuver.roll = 11 + this.system.characteristics.ocv.value
-    if (Number(maneuver.system.ocv)) {
-      maneuver.roll += Number(maneuver.system.ocv)
+    if (maneuver.system.maneuvertype == "mental") {
+      maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
+      if (Number(maneuver.system.omcv)) {
+        maneuver.roll += (Number(maneuver.system.omcv) || 0)
+      } else {
+        maneuver.noOMCV = true
+      }
     } else {
-      maneuver.noOCV = true
+      maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
+      if (Number(maneuver.system.ocv)) {
+        maneuver.roll += (Number(maneuver.system.ocv) || 0)
+      } else {
+        maneuver.noOCV = true
+      }
     }
   }
 
@@ -648,12 +655,10 @@ export class Hero6Actor extends Actor {
         const ray = new Ray(token.object?.center || token.center, defenderToken.center)
         rollData.tokensDistance = canvas.grid.measureDistances([{ ray }], { gridSpaces: false })[0] / canvas.grid.grid.options.dimensions.distance
       } else {
-        ui.notifications.info("No token connected to this actor, unable to compute distance.")
-        return
+        //ui.notifications.info("No token connected to this actor, unable to compute distance.")
+        //return
       }
       if (defender) {
-        rollData.forceAdvantage = defender.isAttackerAdvantage()
-        rollData.advantageFromTarget = true
       }
     }
     console.log("ROLLDATA", rollData)
@@ -706,11 +711,20 @@ export class Hero6Actor extends Actor {
     rollData.title = item.name
     rollData.diceFormula = Hero6Utility.convertRollHeroSyntax(item.system.damage)
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
-    await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+    //await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
 
     rollData.roll = myRoll
     rollData.result = myRoll.total
     rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll)
+    
+    let mult
+    if (item.system.damageeffect == "killing") { // As per issue #11
+      mult = new Roll("1d3").roll({ async: false })
+      rollData.killingMultiplier = mult.total
+      rollData.stunValue = Number(myRoll.total) * (Number(mult.total) + (Number(item.system.stunx) || 0))
+    } else {
+      rollData.stunValue = myRoll.total
+    }
 
     let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
     let msg = await rollData.roll.toMessage({
@@ -718,6 +732,11 @@ export class Hero6Actor extends Actor {
       rollMode: game.settings.get("core", "rollMode"),
       flavor: msgFlavor
     })
+    
+    if (mult) {
+      await Hero6Utility.showDiceSoNice(mult, game.settings.get("core", "rollMode"))
+    }
+
     rollData.roll = duplicate(rollData.roll) // Convert to object
     msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)
@@ -745,28 +764,6 @@ export class Hero6Actor extends Actor {
     console.log("Rolldata result", rollData)
   }
   /* -------------------------------------------- */
-  rollManeuver(maneuverId) {
-    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.")
-        return
-      }
-      skill = duplicate(skill)
-      Hero6Utility.updateSkill(skill)
-      let abilityKey = skill.system.ability
-      let rollData = this.getCommonRollData(abilityKey)
-      rollData.mode = "skill"
-      rollData.skill = skill
-      rollData.img = skill.img
-      if (rollData.target) {
-        ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
-        return
-      }
-      this.startRoll(rollData)
-    }
-  }
-  /* -------------------------------------------- */
   rollSkill(skillId) {
     let skill = this.items.get(skillId)
     if (skill) {
@@ -795,7 +792,7 @@ export class Hero6Actor extends Actor {
     if (weapon) {
       weapon = duplicate(weapon)
       let rollData = this.getCommonRollData()
-      rollData.weaponRoll = 11 + this.system.characteristics.ocv.value + (Number(weapon.system.ocv) || 0)
+      rollData.weaponRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
       rollData.mode = "weapon"
       rollData.weapon = weapon
       rollData.img = weapon.img
@@ -810,7 +807,7 @@ export class Hero6Actor extends Actor {
     if (maneuver) {
       maneuver = duplicate(maneuver)
       let rollData = this.getCommonRollData()
-      rollData.maneuverRoll = 11 + this.system.characteristics.omcv.value + (Number(maneuver.system.omcv) || 0)
+      rollData.maneuverRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
       rollData.mode = "mentalmaneuver"
       rollData.maneuver = maneuver
       rollData.img = maneuver.img
@@ -826,9 +823,9 @@ export class Hero6Actor extends Actor {
       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)
+        rollData.powerRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
       } else {
-        rollData.powerRoll = 11 + this.system.characteristics.omcv.value + (Number(power.system.omcv) || 0)
+        rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
       }
       rollData.mode = "powerattack"
       rollData.power = power

modules/hero6-combat.js

@@ -54,6 +54,9 @@ export class Hero6Combat extends Combat {
 
   /* -------------------------------------------- */
   constructor(data, context) {
+    
+    data.flags = { world: { turnData: { turnNumber: 0, segmentNumber: 12} } }
+
     super(data, context);
 
     this.turnNumber = 0;
@@ -280,12 +283,13 @@ export class Hero6Combat extends Combat {
 
 
   /* -------------------------------------------- */
-  async _onCreateEmbeddedDocuments(type, documents, result, options, userId) {
+  async _onCreateDescendantDocuments(type, documents, result, options, userId) {
     //console.log("Added...")
-    await super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
-    await this.rebuildInitiative()
+    if (game.user.isGM) {
+      await super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
+      await this.rebuildInitiative()
+    }
   }
-
   /* -------------------------------------------- 
   _onUpdate(changed, options, userId) {
   }*/

modules/hero6-config.js

@@ -22,6 +22,13 @@ export const Hero6_CONFIG = {
     "pre": "Presence",
     "manual": "Manual",
   },
+  damageEffect: {
+    "normal": "Normal",
+    "killing": "Killing",
+    "stunonly": "Stun Only",
+    "bodyonly": "Body Only",
+    "effect": "Effect"
+  },
   skillType: {
     "agility": "Agility",
     "interaction": "Interaction",

modules/hero6-item-sheet.js

@@ -147,13 +147,13 @@ export class Hero6ItemSheet extends ItemSheet {
     });
 
     html.find('.item-skill-profiency').click(ev => {
-      this.object.update( {'system.levels': 12, 'system.cost': 2} )
+      this.object.update( {'system.skillfamiliarity': false, 'system.cost': 2} )
     } )
     html.find('.item-skill-familiarity').click(ev => {
-      this.object.update( {'system.levels': 10, 'system.cost': 1} )
+      this.object.update( {'system.skillprofiency': false, 'system.cost': 1} )
     } )
     html.find('.item-skill-everyman').click(ev => {
-      this.object.update( {'system.levels': 8, 'system.cost': 0} )
+      this.object.update( {'system.cost': 0} )
     } )
 
     html.find('.view-subitem').click(ev => {

modules/hero6-utility.js

@@ -43,6 +43,9 @@ export class Hero6Utility {
     Handlebars.registerHelper('mul', function (a, b) {
       return Number(a) * Number(b);
     })
+    Handlebars.registerHelper('add', function (a, b) {
+      return (Number(a) || 0) + (Number(b) || 0);
+    })
     Handlebars.registerHelper('locationLabel', function (key) {
       return __locationNames[key]
     })
@@ -353,6 +356,9 @@ export class Hero6Utility {
     if(rollData.maneuver) {
       target = rollData.maneuverRoll
     }
+    if(rollData.power) {
+      target = rollData.powerRoll
+    }
     if (rollData.charac) {
       target = rollData.charac.roll
     }

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000104
+MANIFEST-000136

packs/complications/LOG

@@ -1,8 +1,8 @@
-2023/08/25-22:33:43.637308 7f2dea7fc6c0 Recovering log #102
-2023/08/25-22:33:43.656562 7f2dea7fc6c0 Delete type=3 #100
-2023/08/25-22:33:43.656635 7f2dea7fc6c0 Delete type=0 #102
-2023/08/25-23:00:06.995735 7f2b69bff6c0 Level-0 table #107: started
-2023/08/25-23:00:06.995769 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/25-23:00:07.032420 7f2b69bff6c0 Delete type=0 #105
-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/25-23:00:07.148788 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/27-20:39:44.235927 7f2debfff6c0 Recovering log #134
+2023/08/27-20:39:44.247428 7f2debfff6c0 Delete type=3 #132
+2023/08/27-20:39:44.247497 7f2debfff6c0 Delete type=0 #134
+2023/08/27-20:41:56.186877 7f2b69bff6c0 Level-0 table #139: started
+2023/08/27-20:41:56.186908 7f2b69bff6c0 Level-0 table #139: 0 bytes OK
+2023/08/27-20:41:56.193027 7f2b69bff6c0 Delete type=0 #137
+2023/08/27-20:41:56.200719 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/27-20:41:56.200780 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/25-22:03:49.171457 7f2debfff6c0 Recovering log #99
-2023/08/25-22:03:49.191726 7f2debfff6c0 Delete type=0 #99
-2023/08/25-22:03:49.191857 7f2debfff6c0 Delete type=3 #98
-2023/08/25-22:33:29.419721 7f2b69bff6c0 Level-0 table #103: started
-2023/08/25-22:33:29.419749 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/25-22:33:29.426232 7f2b69bff6c0 Delete type=0 #101
-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/25-22:33:29.442710 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/27-08:29:22.284274 7f2dea7fc6c0 Recovering log #130
+2023/08/27-08:29:22.301134 7f2dea7fc6c0 Delete type=3 #128
+2023/08/27-08:29:22.301181 7f2dea7fc6c0 Delete type=0 #130
+2023/08/27-08:39:31.996089 7f2b69bff6c0 Level-0 table #135: started
+2023/08/27-08:39:31.996115 7f2b69bff6c0 Level-0 table #135: 0 bytes OK
+2023/08/27-08:39:32.003139 7f2b69bff6c0 Delete type=0 #133
+2023/08/27-08:39:32.003292 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/27-08:39:32.003321 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-000106
+MANIFEST-000138

packs/equipment/LOG

@@ -1,8 +1,8 @@
-2023/08/25-22:33:43.623322 7f2deb7fe6c0 Recovering log #104
-2023/08/25-22:33:43.633958 7f2deb7fe6c0 Delete type=3 #102
-2023/08/25-22:33:43.634029 7f2deb7fe6c0 Delete type=0 #104
-2023/08/25-23:00:06.835716 7f2b69bff6c0 Level-0 table #109: started
-2023/08/25-23:00:06.835770 7f2b69bff6c0 Level-0 table #109: 0 bytes OK
-2023/08/25-23:00:06.878030 7f2b69bff6c0 Delete type=0 #107
-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)
+2023/08/27-20:39:44.212532 7f2deaffd6c0 Recovering log #136
+2023/08/27-20:39:44.228081 7f2deaffd6c0 Delete type=3 #134
+2023/08/27-20:39:44.228439 7f2deaffd6c0 Delete type=0 #136
+2023/08/27-20:41:56.142827 7f2b69bff6c0 Level-0 table #141: started
+2023/08/27-20:41:56.142857 7f2b69bff6c0 Level-0 table #141: 0 bytes OK
+2023/08/27-20:41:56.150099 7f2b69bff6c0 Delete type=0 #139
+2023/08/27-20:41:56.161751 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/27-20:41:56.172058 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,8 +1,8 @@
-2023/08/25-22:03:49.155681 7f2deaffd6c0 Recovering log #101
-2023/08/25-22:03:49.166583 7f2deaffd6c0 Delete type=0 #101
-2023/08/25-22:03:49.166702 7f2deaffd6c0 Delete type=3 #100
-2023/08/25-22:33:29.368510 7f2b69bff6c0 Level-0 table #105: started
-2023/08/25-22:33:29.368545 7f2b69bff6c0 Level-0 table #105: 0 bytes OK
-2023/08/25-22:33:29.374540 7f2b69bff6c0 Delete type=0 #103
-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)
+2023/08/27-08:29:22.269478 7f2deaffd6c0 Recovering log #132
+2023/08/27-08:29:22.279442 7f2deaffd6c0 Delete type=3 #130
+2023/08/27-08:29:22.279516 7f2deaffd6c0 Delete type=0 #132
+2023/08/27-08:39:31.935876 7f2b69bff6c0 Level-0 table #137: started
+2023/08/27-08:39:31.935922 7f2b69bff6c0 Level-0 table #137: 0 bytes OK
+2023/08/27-08:39:31.943117 7f2b69bff6c0 Delete type=0 #135
+2023/08/27-08:39:31.968194 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/27-08:39:31.968240 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-000096
+MANIFEST-000130

packs/maneuvers/LOG

@@ -1,8 +1,8 @@
-2023/08/25-22:33:43.656478 7f2deb7fe6c0 Recovering log #94
-2023/08/25-22:33:43.672940 7f2deb7fe6c0 Delete type=3 #92
-2023/08/25-22:33:43.673310 7f2deb7fe6c0 Delete type=0 #94
-2023/08/25-23:00:07.111419 7f2b69bff6c0 Level-0 table #99: started
-2023/08/25-23:00:07.111451 7f2b69bff6c0 Level-0 table #99: 0 bytes OK
-2023/08/25-23:00:07.148478 7f2b69bff6c0 Delete type=0 #97
-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/25-23:00:07.148848 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/27-20:39:44.250167 7f2debfff6c0 Recovering log #127
+2023/08/27-20:39:44.264324 7f2debfff6c0 Delete type=3 #125
+2023/08/27-20:39:44.264390 7f2debfff6c0 Delete type=0 #127
+2023/08/27-20:41:56.193390 7f2b69bff6c0 Level-0 table #133: started
+2023/08/27-20:41:56.193461 7f2b69bff6c0 Level-0 table #133: 0 bytes OK
+2023/08/27-20:41:56.200226 7f2b69bff6c0 Delete type=0 #131
+2023/08/27-20:41:56.200753 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/27-20:41:56.200791 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,15 @@
-2023/08/25-22:03:49.194406 7f2deb7fe6c0 Recovering log #91
-2023/08/25-22:03:49.208360 7f2deb7fe6c0 Delete type=0 #91
-2023/08/25-22:03:49.208425 7f2deb7fe6c0 Delete type=3 #90
-2023/08/25-22:33:29.426425 7f2b69bff6c0 Level-0 table #95: started
-2023/08/25-22:33:29.426459 7f2b69bff6c0 Level-0 table #95: 0 bytes OK
-2023/08/25-22:33:29.435592 7f2b69bff6c0 Delete type=0 #93
-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/25-22:33:29.449825 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/27-08:29:22.300538 7f2deaffd6c0 Recovering log #123
+2023/08/27-08:29:22.317575 7f2deaffd6c0 Delete type=3 #121
+2023/08/27-08:29:22.317668 7f2deaffd6c0 Delete type=0 #123
+2023/08/27-08:39:31.985594 7f2b69bff6c0 Level-0 table #128: started
+2023/08/27-08:39:31.989270 7f2b69bff6c0 Level-0 table #128: 885 bytes OK
+2023/08/27-08:39:31.995966 7f2b69bff6c0 Delete type=0 #126
+2023/08/27-08:39:32.003282 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/27-08:39:32.003339 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at '!items!M7GTfolCobuXkfpd' @ 28 : 1
+2023/08/27-08:39:32.003347 7f2b69bff6c0 Compacting 1@1 + 1@2 files
+2023/08/27-08:39:32.006911 7f2b69bff6c0 Generated table #129@1: 26 keys, 15634 bytes
+2023/08/27-08:39:32.006934 7f2b69bff6c0 Compacted 1@1 + 1@2 files => 15634 bytes
+2023/08/27-08:39:32.013790 7f2b69bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/08/27-08:39:32.013955 7f2b69bff6c0 Delete type=2 #116
+2023/08/27-08:39:32.014188 7f2b69bff6c0 Delete type=2 #128
+2023/08/27-08:39:32.026889 7f2b69bff6c0 Manual compaction at level-1 from '!items!M7GTfolCobuXkfpd' @ 28 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000104
+MANIFEST-000136

packs/perks/LOG

@@ -1,8 +1,8 @@
-2023/08/25-22:33:43.658173 7f2debfff6c0 Recovering log #102
-2023/08/25-22:33:43.676709 7f2debfff6c0 Delete type=3 #100
-2023/08/25-22:33:43.676789 7f2debfff6c0 Delete type=0 #102
-2023/08/25-23:00:07.148917 7f2b69bff6c0 Level-0 table #107: started
-2023/08/25-23:00:07.148979 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/25-23:00:07.190254 7f2b69bff6c0 Delete type=0 #105
-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/25-23:00:07.227354 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/27-20:39:44.250167 7f2deaffd6c0 Recovering log #134
+2023/08/27-20:39:44.264323 7f2deaffd6c0 Delete type=3 #132
+2023/08/27-20:39:44.264388 7f2deaffd6c0 Delete type=0 #134
+2023/08/27-20:41:56.200945 7f2b69bff6c0 Level-0 table #139: started
+2023/08/27-20:41:56.200983 7f2b69bff6c0 Level-0 table #139: 0 bytes OK
+2023/08/27-20:41:56.207779 7f2b69bff6c0 Delete type=0 #137
+2023/08/27-20:41:56.214215 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/27-20:41:56.214249 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/25-22:03:49.195155 7f2dea7fc6c0 Recovering log #99
-2023/08/25-22:03:49.211553 7f2dea7fc6c0 Delete type=0 #99
-2023/08/25-22:03:49.211615 7f2dea7fc6c0 Delete type=3 #98
-2023/08/25-22:33:29.435955 7f2b69bff6c0 Level-0 table #103: started
-2023/08/25-22:33:29.436016 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/25-22:33:29.442590 7f2b69bff6c0 Delete type=0 #101
-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/25-22:33:29.449873 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/27-08:29:22.302661 7f2debfff6c0 Recovering log #130
+2023/08/27-08:29:22.321361 7f2debfff6c0 Delete type=3 #128
+2023/08/27-08:29:22.321420 7f2debfff6c0 Delete type=0 #130
+2023/08/27-08:39:32.020735 7f2b69bff6c0 Level-0 table #135: started
+2023/08/27-08:39:32.020763 7f2b69bff6c0 Level-0 table #135: 0 bytes OK
+2023/08/27-08:39:32.026780 7f2b69bff6c0 Delete type=0 #133
+2023/08/27-08:39:32.026919 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/27-08:39:32.026945 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-000105
+MANIFEST-000137

packs/powers/LOG

@@ -1,8 +1,8 @@
-2023/08/25-22:33:43.636903 7f2deaffd6c0 Recovering log #103
-2023/08/25-22:33:43.653604 7f2deaffd6c0 Delete type=3 #101
-2023/08/25-22:33:43.653664 7f2deaffd6c0 Delete type=0 #103
-2023/08/25-23:00:07.074697 7f2b69bff6c0 Level-0 table #108: started
-2023/08/25-23:00:07.074729 7f2b69bff6c0 Level-0 table #108: 0 bytes OK
-2023/08/25-23:00:07.111279 7f2b69bff6c0 Delete type=0 #106
-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/25-23:00:07.148825 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/27-20:39:44.235304 7f2deb7fe6c0 Recovering log #135
+2023/08/27-20:39:44.247427 7f2deb7fe6c0 Delete type=3 #133
+2023/08/27-20:39:44.247491 7f2deb7fe6c0 Delete type=0 #135
+2023/08/27-20:41:56.178462 7f2b69bff6c0 Level-0 table #140: started
+2023/08/27-20:41:56.178510 7f2b69bff6c0 Level-0 table #140: 0 bytes OK
+2023/08/27-20:41:56.186727 7f2b69bff6c0 Delete type=0 #138
+2023/08/27-20:41:56.200700 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/27-20:41:56.200765 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/25-22:03:49.171203 7f2deb7fe6c0 Recovering log #100
-2023/08/25-22:03:49.188376 7f2deb7fe6c0 Delete type=0 #100
-2023/08/25-22:03:49.188518 7f2deb7fe6c0 Delete type=3 #99
-2023/08/25-22:33:29.412461 7f2b69bff6c0 Level-0 table #104: started
-2023/08/25-22:33:29.412486 7f2b69bff6c0 Level-0 table #104: 0 bytes OK
-2023/08/25-22:33:29.419516 7f2b69bff6c0 Delete type=0 #102
-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/25-22:33:29.435927 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/27-08:29:22.281768 7f2deb7fe6c0 Recovering log #131
+2023/08/27-08:29:22.298260 7f2deb7fe6c0 Delete type=3 #129
+2023/08/27-08:29:22.298361 7f2deb7fe6c0 Delete type=0 #131
+2023/08/27-08:39:31.977972 7f2b69bff6c0 Level-0 table #136: started
+2023/08/27-08:39:31.978008 7f2b69bff6c0 Level-0 table #136: 0 bytes OK
+2023/08/27-08:39:31.985417 7f2b69bff6c0 Delete type=0 #134
+2023/08/27-08:39:32.003270 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/27-08:39:32.003309 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-000104
+MANIFEST-000136

packs/skills/LOG

@@ -1,8 +1,8 @@
-2023/08/25-22:33:43.623321 7f2dea7fc6c0 Recovering log #102
-2023/08/25-22:33:43.633958 7f2dea7fc6c0 Delete type=3 #100
-2023/08/25-22:33:43.634019 7f2dea7fc6c0 Delete type=0 #102
-2023/08/25-23:00:07.032595 7f2b69bff6c0 Level-0 table #107: started
-2023/08/25-23:00:07.032643 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/25-23:00:07.074550 7f2b69bff6c0 Delete type=0 #105
-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/25-23:00:07.148806 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/27-20:39:44.212540 7f2debfff6c0 Recovering log #134
+2023/08/27-20:39:44.228086 7f2debfff6c0 Delete type=3 #132
+2023/08/27-20:39:44.228309 7f2debfff6c0 Delete type=0 #134
+2023/08/27-20:41:56.172072 7f2b69bff6c0 Level-0 table #139: started
+2023/08/27-20:41:56.172106 7f2b69bff6c0 Level-0 table #139: 0 bytes OK
+2023/08/27-20:41:56.178249 7f2b69bff6c0 Delete type=0 #137
+2023/08/27-20:41:56.193350 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/27-20:41:56.200736 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/25-22:03:49.155679 7f2deb7fe6c0 Recovering log #99
-2023/08/25-22:03:49.166527 7f2deb7fe6c0 Delete type=0 #99
-2023/08/25-22:03:49.166599 7f2deb7fe6c0 Delete type=3 #98
-2023/08/25-22:33:29.406141 7f2b69bff6c0 Level-0 table #103: started
-2023/08/25-22:33:29.406187 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/25-22:33:29.412334 7f2b69bff6c0 Delete type=0 #101
-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/25-22:33:29.426413 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/27-08:29:22.269474 7f2debfff6c0 Recovering log #130
+2023/08/27-08:29:22.282410 7f2debfff6c0 Delete type=3 #128
+2023/08/27-08:29:22.282470 7f2debfff6c0 Delete type=0 #130
+2023/08/27-08:39:31.960813 7f2b69bff6c0 Level-0 table #135: started
+2023/08/27-08:39:31.960840 7f2b69bff6c0 Level-0 table #135: 0 bytes OK
+2023/08/27-08:39:31.968065 7f2b69bff6c0 Delete type=0 #133
+2023/08/27-08:39:31.968231 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/27-08:39:31.968249 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-000104
+MANIFEST-000136

packs/talents/LOG

@@ -1,8 +1,8 @@
-2023/08/25-22:33:43.675716 7f2deaffd6c0 Recovering log #102
-2023/08/25-22:33:43.687652 7f2deaffd6c0 Delete type=3 #100
-2023/08/25-22:33:43.687775 7f2deaffd6c0 Delete type=0 #102
-2023/08/25-23:00:07.190524 7f2b69bff6c0 Level-0 table #107: started
-2023/08/25-23:00:07.190606 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/25-23:00:07.227189 7f2b69bff6c0 Delete type=0 #105
-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/25-23:00:07.227364 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/27-20:39:44.268226 7f2deb7fe6c0 Recovering log #134
+2023/08/27-20:39:44.283633 7f2deb7fe6c0 Delete type=3 #132
+2023/08/27-20:39:44.283696 7f2deb7fe6c0 Delete type=0 #134
+2023/08/27-20:41:56.208002 7f2b69bff6c0 Level-0 table #139: started
+2023/08/27-20:41:56.208063 7f2b69bff6c0 Level-0 table #139: 0 bytes OK
+2023/08/27-20:41:56.214116 7f2b69bff6c0 Delete type=0 #137
+2023/08/27-20:41:56.214260 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/27-20:41:56.214285 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/25-22:03:49.214304 7f2deb7fe6c0 Recovering log #99
-2023/08/25-22:03:49.224837 7f2deb7fe6c0 Delete type=0 #99
-2023/08/25-22:03:49.224905 7f2deb7fe6c0 Delete type=3 #98
-2023/08/25-22:33:29.442721 7f2b69bff6c0 Level-0 table #103: started
-2023/08/25-22:33:29.442743 7f2b69bff6c0 Level-0 table #103: 0 bytes OK
-2023/08/25-22:33:29.449583 7f2b69bff6c0 Delete type=0 #101
-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/25-22:33:29.449897 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/27-08:29:22.319586 7f2deb7fe6c0 Recovering log #130
+2023/08/27-08:29:22.330371 7f2deb7fe6c0 Delete type=3 #128
+2023/08/27-08:29:22.330427 7f2deb7fe6c0 Delete type=0 #130
+2023/08/27-08:39:32.014249 7f2b69bff6c0 Level-0 table #135: started
+2023/08/27-08:39:32.014276 7f2b69bff6c0 Level-0 table #135: 0 bytes OK
+2023/08/27-08:39:32.020634 7f2b69bff6c0 Delete type=0 #133
+2023/08/27-08:39:32.026909 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/27-08:39:32.026927 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

system.json

@@ -5,7 +5,7 @@
       "flags": {}
     }
   ],
-  "description": "Hero System v6 for FoundryVTT (Official)",
+  "description": "Hero System 6E for FoundryVTT (Official)",
   "esmodules": [
     "modules/hero6-main.js"
   ],
@@ -91,15 +91,15 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.14",
+  "version": "11.0.19",
   "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/master/system.json",
-  "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/",
+  "title": "Hero System 6E Basic (Official)",
+  "manifest": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/raw/branch/master/system.json",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.19.zip",
+  "url": "https://www.uberwald.me/public/uberwald/",
   "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp",
   "id": "fvtt-hero-system-6"
 }

template.json

@@ -354,7 +354,9 @@
         "levels": 0,
         "quantity": 1,
         "range": "",
+        "damageeffect": "normal",
         "damage": "",
+        "stunx": 0,
         "endurance": 0,
         "hasroll": false,
         "attackvalue": "ocv",

templates/actors/actor-sheet.hbs

@@ -149,36 +149,55 @@
             </li>
           </ul>
 
-          {{#each maneuvers as |mlist key|}}
+          {{#each maneuvers as |mlist mtype|}}
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-field-label-long-img">
-                <label class="">{{upperFirst key}} Maneuver</label>
+                <label class="">{{upperFirst mtype}} Maneuver</label>
               </span>
               <span class="item-field-label-very-short">
                 <label class="short-label">PHA</label>
               </span>
+              
+              {{#if (eq mtype "mental")}}
+              <span class="item-field-label-very-short">
+                <label class="short-label">OMCV</label>
+              </span>
+              <span class="item-field-label-very-short">
+                <label class="short-label">DMCV</label>
+              </span>
+              {{else}}
               <span class="item-field-label-very-short">
                 <label class="short-label">OCV</label>
               </span>
               <span class="item-field-label-very-short">
                 <label class="short-label">DCV</label>
               </span>
+              {{/if}} 
+
               <span class="item-field-text-long">
                 <label class="short-label">Effects</label>
               </span>
             </li>
             {{#each mlist as |maneuver key|}}
             <li class="item flexrow list-item list-item-shadow " data-item-id="{{maneuver._id}}">
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                  src="{{maneuver.img}}" /></a>
-              <a class="roll-item"><i class="fas fa-dice"></i></a><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">
+                  <a class="roll-item"><i class="fas fa-dice"></i></a>
+                  {{maneuver.name}}
+                </span>
 
               <span class="item-field-label-very-short content-center">{{maneuver.system.pha}}</span>
+              {{#if (eq ../mtype "mental")}}
+              <span class="item-field-label-very-short content-center">{{maneuver.system.omcv}}</span>
+              <span class="item-field-label-very-short content-center">{{maneuver.system.dmcv}}</span>
+              {{else}}
               <span class="item-field-label-very-short content-center">{{maneuver.system.ocv}}</span>
               <span class="item-field-label-very-short content-center">{{maneuver.system.dcv}}</span>
-
+              {{/if}}
+              
               <span class="item-field-text-long">{{maneuver.system.effects}}
                 {{#if maneuver.system.haseffectroll}}
                 <a class="roll-direct" data-roll-source="Maneuver {{maneuver.name}}"
@@ -561,7 +580,7 @@
             <li class="item stat flexrow list-item list-item-shadow " data-item-id="{{maneuver._id}}">
               <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                   src="{{maneuver.img}}" /></a>
-              <span class="item-field-label-long">{{maneuver.name}}</span>
+              <span class="item-field-label-long"><a class="roll-item"><i class="fas fa-dice"></i>{{maneuver.name}}</a></span>
 
               <span class="item-field-label-short">{{maneuver.system.pha}}</span>
               <span class="item-field-label-short">{{maneuver.system.ocv}}</span>
@@ -604,14 +623,14 @@
               <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 class="roll-item"><i class="fas fa-dice"></i>
+                  {{maneuver.name}}
                 </a>
               </span>
 
-              <span class="item-field-label-short">{{maneuver.system.pha}}</span>
-              <span class="item-field-label-short">{{maneuver.system.omcv}}</span>
-              <span class="item-field-label-short">{{maneuver.system.dmcv}}</span>
+              <span class="item-field-label-short content-center">{{maneuver.system.pha}}</span>
+              <span class="item-field-label-short content-center">{{maneuver.system.omcv}}</span>
+              <span class="item-field-label-short content-center">{{maneuver.system.dmcv}}</span>
 
               <span class="item-field-label-long3">{{maneuver.system.effects}}</span>
 

templates/chat/chat-damage-result.hbs

@@ -13,10 +13,29 @@
     <div>
       <ul>
         <li>Name : {{title}}</li>
+        <li>Damage Effect: {{upperFirst item.system.damageeffect}}</li>
         <li>Damage formula : {{diceFormula}}</li>
-        <li><strong>TOTAL : {{result}}</strong></li>
+        <li><strong>Total formula : {{result}}</strong></li>
+
+        {{#if (eq item.system.damageeffect "normal")}}      
         <li><strong>BODY : {{bodyValue}}</strong></li>
-        
+        {{/if}}
+
+        {{#if (eq item.system.damageeffect "killing")}}      
+        <li><strong>1d3 result + STUNx : {{killingMultiplier}} + {{item.system.stunx}} = {{add killingMultiplier item.system.stunx}}</strong></li>
+        <li><strong>STUN : {{stunValue}}</strong></li>
+        <li><strong>BODY : {{result}}</strong></li>
+        <li><strong>Penetrating BODY : {{bodyValue}}</strong></li>
+        {{/if}}
+
+        {{#if (eq item.system.damageeffect "stunonly")}}
+        <li><strong>STUN : {{stunValue}}</strong></li>
+        {{/if}}
+
+        {{#if (eq item.system.damageeffect "bodyonly")}}
+        <li><strong>BODY : {{bodyValue}}</strong></li>
+        {{/if}}
+
       </ul>  
     </div>
 

templates/items/item-skill-sheet.hbs

@@ -52,22 +52,21 @@
                 data-dtype="Number"/>
             </li>
 
-            <li class="flexrow"><label class="item-field-label-long">Familiarity only</label>
-              <input type="checkbox" class="item-field-label-medium item-skill-familiarity" name="system.skillfamiliarity" {{checked system.skillfamiliarity}} 
-                {{#if (or system.skillprofiency system.skilllevelonly)}}disabled{{/if}}                 
+            <li class="flexrow"><label class="item-field-label-long">Proficency</label>
+              <input type="checkbox" class="item-field-label-medium item-skill-profiency" name="system.skillprofiency" {{checked system.skillprofiency}}  
                 data-dtype="Number"/>
             </li>
-              {{#if system.skillfamiliarity}}
+
+            {{#if (not system.skillprofiency)}}         
+              <li class="flexrow"><label class="item-field-label-long">Familiarity only</label>
+                <input type="checkbox" class="item-field-label-medium item-skill-familiarity" name="system.skillfamiliarity" {{checked system.skillfamiliarity}} 
+                  data-dtype="Number"/>
+              </li>
               <li class="flexrow"><label class="item-field-label-long">Everyman skill</label>
                 <input type="checkbox" class="item-field-label-medium item-skill-everyman" name="system.skilleveryman" {{checked system.skilleveryman}} data-dtype="Number"/>
               </li>
-              {{/if}}
+            {{/if}}
 
-            <li class="flexrow"><label class="item-field-label-long">Proficency</label>
-              <input type="checkbox" class="item-field-label-medium item-skill-profiency" name="system.skillprofiency" {{checked system.skillprofiency}}  
-                {{#if (or system.skillfamiliarity system.skilllevelonly)}}disabled{{/if}}                                 
-                data-dtype="Number"/>
-            </li>
 
             {{#if (ne system.skilltype "combat")}}
               <li class="flexrow"><label class="item-field-label-long">Levels Cost</label>

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

@@ -38,9 +38,27 @@
       <li class="flexrow"><label class="item-field-label-long">Range</label>
         <input type="text" class="item-field-label-medium" name="system.range" value="{{system.range}}" data-dtype="String"/>
       </li>
+
+      <li class="flexrow"><label class="item-field-label-long">Damage Effect</label>
+        <select class="item-field-label-long" type="text" name="system.damageeffect" value="{{system.damageeffect}}" data-dtype="String">
+          {{#select (lower system.damageeffect)}}
+            {{#each config.damageEffect as |name key|}}
+              <option value="{{key}}">{{name}}</option>
+            {{/each}}
+          {{/select}}
+        </select> 
+      </li>
+      
       <li class="flexrow"><label class="item-field-label-long">Damage</label>
         <input type="text" class="item-field-label-medium" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
       </li>
+
+      {{#if (eq system.damageeffect "killing")}}
+      <li class="flexrow"><label class="item-field-label-long">STUNx</label>
+        <input type="text" class="item-field-label-medium" name="system.stunx" value="{{system.stunx}}" data-dtype="Number"/>
+      </li>
+      {{/if}}
+
       {{/if}}
 
       <li class="flexrow"><label class="item-field-label-long">Endurance</label>