Fix Killing damage information

changelog.md

@@ -1,3 +1,13 @@
+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

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
     }
@@ -225,16 +224,16 @@ export class Hero6Actor extends Actor {
   /* -------------------------------------------- */
   prepareManeuver(maneuver) {
     if (maneuver.system.maneuvertype == "mental") {
-      maneuver.roll = 11 + this.system.characteristics.omcv.value
+      maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
       if (Number(maneuver.system.omcv)) {
-        maneuver.roll += Number(maneuver.system.omcv)
+        maneuver.roll += (Number(maneuver.system.omcv) || 0)
       } else {
         maneuver.noOMCV = true
       }
     } else {
-      maneuver.roll = 11 + this.system.characteristics.ocv.value
+      maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
       if (Number(maneuver.system.ocv)) {
-        maneuver.roll += Number(maneuver.system.ocv)
+        maneuver.roll += (Number(maneuver.system.ocv) || 0)
       } else {
         maneuver.noOCV = true
       }
@@ -656,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)
@@ -714,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({
@@ -726,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)
@@ -781,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
@@ -796,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
@@ -812,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 => {

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000116
+MANIFEST-000132

packs/complications/LOG

@@ -1,8 +1,8 @@
-2023/08/26-09:36:55.616025 7f2deaffd6c0 Recovering log #114
-2023/08/26-09:36:55.641371 7f2deaffd6c0 Delete type=3 #112
-2023/08/26-09:36:55.641419 7f2deaffd6c0 Delete type=0 #114
-2023/08/26-09:47:17.308368 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.308393 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.348814 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.377261 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377290 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/complications/LOG.old

@@ -1,8 +1,8 @@
-2023/08/26-05:35:25.658202 7f2deaffd6c0 Recovering log #110
-2023/08/26-05:35:25.710452 7f2deaffd6c0 Delete type=3 #108
-2023/08/26-05:35:25.710513 7f2deaffd6c0 Delete type=0 #110
-2023/08/26-05:36:09.833813 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.833846 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.840534 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.847596 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847688 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-22:07:58.627561 7f2deaffd6c0 Recovering log #126
+2023/08/26-22:07:58.748615 7f2deaffd6c0 Delete type=3 #124
+2023/08/26-22:07:58.748679 7f2deaffd6c0 Delete type=0 #126
+2023/08/26-22:16:27.923271 7f2b69bff6c0 Level-0 table #131: started
+2023/08/26-22:16:27.923312 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/08/26-22:16:27.929503 7f2b69bff6c0 Delete type=0 #129
+2023/08/26-22:16:27.949795 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949837 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-000118
+MANIFEST-000134

packs/equipment/LOG

@@ -1,8 +1,8 @@
-2023/08/26-09:36:55.581647 7f2dea7fc6c0 Recovering log #116
-2023/08/26-09:36:55.613104 7f2dea7fc6c0 Delete type=3 #114
-2023/08/26-09:36:55.613185 7f2dea7fc6c0 Delete type=0 #116
-2023/08/26-09:47:17.031250 7f2b69bff6c0 Level-0 table #121: started
-2023/08/26-09:47:17.031303 7f2b69bff6c0 Level-0 table #121: 0 bytes OK
-2023/08/26-09:47:17.068068 7f2b69bff6c0 Delete type=0 #119
-2023/08/26-09:47:17.178686 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.245324 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/equipment/LOG.old

@@ -1,8 +1,8 @@
-2023/08/26-05:35:25.591750 7f2dea7fc6c0 Recovering log #112
-2023/08/26-05:35:25.654891 7f2dea7fc6c0 Delete type=3 #110
-2023/08/26-05:35:25.654982 7f2dea7fc6c0 Delete type=0 #112
-2023/08/26-05:36:09.796628 7f2b69bff6c0 Level-0 table #117: started
-2023/08/26-05:36:09.796668 7f2b69bff6c0 Level-0 table #117: 0 bytes OK
-2023/08/26-05:36:09.803598 7f2b69bff6c0 Delete type=0 #115
-2023/08/26-05:36:09.820108 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.820164 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/26-22:07:58.520995 7f2deb7fe6c0 Recovering log #128
+2023/08/26-22:07:58.608948 7f2deb7fe6c0 Delete type=3 #126
+2023/08/26-22:07:58.609004 7f2deb7fe6c0 Delete type=0 #128
+2023/08/26-22:16:27.903755 7f2b69bff6c0 Level-0 table #133: started
+2023/08/26-22:16:27.903791 7f2b69bff6c0 Level-0 table #133: 0 bytes OK
+2023/08/26-22:16:27.909699 7f2b69bff6c0 Delete type=0 #131
+2023/08/26-22:16:27.916391 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.923165 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000108
+MANIFEST-000125

packs/maneuvers/LOG

@@ -1,8 +1,15 @@
-2023/08/26-09:36:55.640615 7f2dea7fc6c0 Recovering log #106
-2023/08/26-09:36:55.658513 7f2dea7fc6c0 Delete type=3 #104
-2023/08/26-09:36:55.658566 7f2dea7fc6c0 Delete type=0 #106
-2023/08/26-09:47:17.348939 7f2b69bff6c0 Level-0 table #111: started
-2023/08/26-09:47:17.348972 7f2b69bff6c0 Level-0 table #111: 0 bytes OK
-2023/08/26-09:47:17.377099 7f2b69bff6c0 Delete type=0 #109
-2023/08/26-09:47:17.377272 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377305 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/maneuvers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/26-05:35:25.713305 7f2debfff6c0 Recovering log #102
-2023/08/26-05:35:25.813680 7f2debfff6c0 Delete type=3 #100
-2023/08/26-05:35:25.813733 7f2debfff6c0 Delete type=0 #102
-2023/08/26-05:36:09.827049 7f2b69bff6c0 Level-0 table #107: started
-2023/08/26-05:36:09.827083 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/26-05:36:09.833693 7f2b69bff6c0 Delete type=0 #105
-2023/08/26-05:36:09.847570 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847666 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-22:07:58.730640 7f2deb7fe6c0 Recovering log #119
+2023/08/26-22:07:58.841210 7f2deb7fe6c0 Delete type=3 #117
+2023/08/26-22:07:58.841288 7f2deb7fe6c0 Delete type=0 #119
+2023/08/26-22:16:27.936844 7f2b69bff6c0 Level-0 table #124: started
+2023/08/26-22:16:27.936868 7f2b69bff6c0 Level-0 table #124: 0 bytes OK
+2023/08/26-22:16:27.942975 7f2b69bff6c0 Delete type=0 #122
+2023/08/26-22:16:27.949818 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949853 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000116
+MANIFEST-000132

packs/perks/LOG

@@ -1,8 +1,8 @@
-2023/08/26-09:36:55.643370 7f2debfff6c0 Recovering log #114
-2023/08/26-09:36:55.661508 7f2debfff6c0 Delete type=3 #112
-2023/08/26-09:36:55.661568 7f2debfff6c0 Delete type=0 #114
-2023/08/26-09:47:17.415364 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.415408 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.468404 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.468554 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.468570 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/perks/LOG.old

@@ -1,8 +1,8 @@
-2023/08/26-05:35:25.714189 7f2deaffd6c0 Recovering log #110
-2023/08/26-05:35:25.838791 7f2deaffd6c0 Delete type=3 #108
-2023/08/26-05:35:25.838847 7f2deaffd6c0 Delete type=0 #110
-2023/08/26-05:36:09.840742 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.840802 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.847326 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.847619 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847709 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-22:07:58.751122 7f2dea7fc6c0 Recovering log #126
+2023/08/26-22:07:58.864497 7f2dea7fc6c0 Delete type=3 #124
+2023/08/26-22:07:58.864580 7f2dea7fc6c0 Delete type=0 #126
+2023/08/26-22:16:27.929655 7f2b69bff6c0 Level-0 table #131: started
+2023/08/26-22:16:27.929696 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/08/26-22:16:27.936745 7f2b69bff6c0 Delete type=0 #129
+2023/08/26-22:16:27.949807 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949861 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-000117
+MANIFEST-000133

packs/powers/LOG

@@ -1,8 +1,8 @@
-2023/08/26-09:36:55.615731 7f2deb7fe6c0 Recovering log #115
-2023/08/26-09:36:55.638127 7f2deb7fe6c0 Delete type=3 #113
-2023/08/26-09:36:55.638240 7f2deb7fe6c0 Delete type=0 #115
-2023/08/26-09:47:17.273897 7f2b69bff6c0 Level-0 table #120: started
-2023/08/26-09:47:17.273922 7f2b69bff6c0 Level-0 table #120: 0 bytes OK
-2023/08/26-09:47:17.308253 7f2b69bff6c0 Delete type=0 #118
-2023/08/26-09:47:17.377250 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377280 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/powers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/26-05:35:25.658202 7f2deb7fe6c0 Recovering log #111
-2023/08/26-05:35:25.710453 7f2deb7fe6c0 Delete type=3 #109
-2023/08/26-05:35:25.710530 7f2deb7fe6c0 Delete type=0 #111
-2023/08/26-05:36:09.820280 7f2b69bff6c0 Level-0 table #116: started
-2023/08/26-05:36:09.820311 7f2b69bff6c0 Level-0 table #116: 0 bytes OK
-2023/08/26-05:36:09.826570 7f2b69bff6c0 Delete type=0 #114
-2023/08/26-05:36:09.847536 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847643 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-22:07:58.612145 7f2debfff6c0 Recovering log #127
+2023/08/26-22:07:58.728418 7f2debfff6c0 Delete type=3 #125
+2023/08/26-22:07:58.728498 7f2debfff6c0 Delete type=0 #127
+2023/08/26-22:16:27.916401 7f2b69bff6c0 Level-0 table #132: started
+2023/08/26-22:16:27.916423 7f2b69bff6c0 Level-0 table #132: 0 bytes OK
+2023/08/26-22:16:27.923048 7f2b69bff6c0 Delete type=0 #130
+2023/08/26-22:16:27.923174 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.923191 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-000116
+MANIFEST-000132

packs/skills/LOG

@@ -1,8 +1,8 @@
-2023/08/26-09:36:55.581650 7f2deaffd6c0 Recovering log #114
-2023/08/26-09:36:55.613104 7f2deaffd6c0 Delete type=3 #112
-2023/08/26-09:36:55.613190 7f2deaffd6c0 Delete type=0 #114
-2023/08/26-09:47:17.245521 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.245592 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.273789 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.377230 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377298 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/skills/LOG.old

@@ -1,8 +1,8 @@
-2023/08/26-05:35:25.591750 7f2deaffd6c0 Recovering log #110
-2023/08/26-05:35:25.654890 7f2deaffd6c0 Delete type=3 #108
-2023/08/26-05:35:25.654974 7f2deaffd6c0 Delete type=0 #110
-2023/08/26-05:36:09.813203 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.813236 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.819942 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.820154 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.820177 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-22:07:58.521207 7f2dea7fc6c0 Recovering log #126
+2023/08/26-22:07:58.625202 7f2dea7fc6c0 Delete type=3 #124
+2023/08/26-22:07:58.625257 7f2dea7fc6c0 Delete type=0 #126
+2023/08/26-22:16:27.909865 7f2b69bff6c0 Level-0 table #131: started
+2023/08/26-22:16:27.909908 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/08/26-22:16:27.916292 7f2b69bff6c0 Delete type=0 #129
+2023/08/26-22:16:27.923145 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.923202 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-000116
+MANIFEST-000132

packs/talents/LOG

@@ -1,8 +1,8 @@
-2023/08/26-09:36:55.660955 7f2deb7fe6c0 Recovering log #114
-2023/08/26-09:36:55.671184 7f2deb7fe6c0 Delete type=3 #112
-2023/08/26-09:36:55.671335 7f2deb7fe6c0 Delete type=0 #114
-2023/08/26-09:47:17.377408 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.377442 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.415173 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.468538 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.468563 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)

packs/talents/LOG.old

@@ -1,8 +1,8 @@
-2023/08/26-05:35:25.815813 7f2deb7fe6c0 Recovering log #110
-2023/08/26-05:35:25.893020 7f2deb7fe6c0 Delete type=3 #108
-2023/08/26-05:35:25.893112 7f2deb7fe6c0 Delete type=0 #110
-2023/08/26-05:36:09.847777 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.847839 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.855108 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.855336 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.855380 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-22:07:58.844046 7f2debfff6c0 Recovering log #126
+2023/08/26-22:07:58.925665 7f2debfff6c0 Delete type=3 #124
+2023/08/26-22:07:58.926331 7f2debfff6c0 Delete type=0 #126
+2023/08/26-22:16:27.943060 7f2b69bff6c0 Level-0 table #131: started
+2023/08/26-22:16:27.943083 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/08/26-22:16:27.949677 7f2b69bff6c0 Delete type=0 #129
+2023/08/26-22:16:27.949829 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-22:16:27.949845 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

system.json

@@ -91,14 +91,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.16",
+  "version": "11.0.18",
   "compatibility": {
     "minimum": "11",
     "verified": "11"
   },
   "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.16.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.18.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

@@ -181,10 +181,13 @@
             </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")}}

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>