Fix #25

.gitattributes

@@ -0,0 +1 @@
+packs/* filter=lfs diff=lfs merge=lfs -text

changelog.md

@@ -1,3 +1,17 @@
+v11.0.20
+
+- Enhance chat message output (cf #25)
+- Enhance roll window
+- Code simplification
+  
+v11.0.19
+
+- Fix killing damage computation (again)
+
+v11.0.18
+
+- Fix killing damage computation
+
 v11.0.17
 
 - Fix tickets 1, 2, 3, 7, 8, 9, 10

modules/hero6-actor.js

@@ -223,8 +223,10 @@ export class Hero6Actor extends Actor {
 
   /* -------------------------------------------- */
   prepareManeuver(maneuver) {
+    let subMode = "normal"
     if (maneuver.system.maneuvertype == "mental") {
-      maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
+      maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)      
+      subMode = "omcv"
       if (Number(maneuver.system.omcv)) {
         maneuver.roll += (Number(maneuver.system.omcv) || 0)
       } else {
@@ -232,12 +234,14 @@ export class Hero6Actor extends Actor {
       }
     } else {
       maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
+      subMode = "ocv"
       if (Number(maneuver.system.ocv)) {
         maneuver.roll += (Number(maneuver.system.ocv) || 0)
       } else {
         maneuver.noOCV = true
       }
     }
+    return subMode
   }
 
   /* -------------------------------------------- */
@@ -637,6 +641,9 @@ export class Hero6Actor extends Actor {
     rollData.actorImg = this.img
     rollData.actorId = this.id
     rollData.img = this.img
+    rollData.title = this.name
+    rollData.subMode = "normal"
+    rollData.characteristics = duplicate(this.system.characteristics)
     if (chKey) {
       rollData.charac = duplicate(this.system.characteristics[chKey])
       this.prepareCharacValues(rollData.charac)
@@ -669,6 +676,7 @@ export class Hero6Actor extends Actor {
   rollPerception() {
     let rollData = this.getCommonRollData("int")
     rollData.isPerception = true
+    rollData.title = "Perception roll"
     rollData.charac.roll = Number(rollData.charac.perceptionroll)
     rollData.mode = "perception"
     if (rollData.target) {
@@ -682,6 +690,7 @@ export class Hero6Actor extends Actor {
   rollCharac(chKey) {
     let rollData = this.getCommonRollData(chKey)
     rollData.mode = "charac"
+    rollData.title = "Characteristic roll"
     if (rollData.target) {
       ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
       return
@@ -693,12 +702,13 @@ export class Hero6Actor extends Actor {
     let item = this.items.get(itemId)
     let rollData = this.getCommonRollData()
     rollData.mode = "item"
+    rollData.title = Hero6Utility.upperFirst(item.type) + " - " + item.name
     rollData.item = duplicate(item)
     if (item.type == "skill") {
       this.prepareSkill(rollData.item)
     }
     if (item.type == "maneuver") {
-      this.prepareManeuver(rollData.item)
+      rollData.subMode = this.prepareManeuver(rollData.item)
     }
     this.startRoll(rollData)
   }
@@ -792,9 +802,10 @@ export class Hero6Actor extends Actor {
     if (weapon) {
       weapon = duplicate(weapon)
       let rollData = this.getCommonRollData()
-      rollData.weaponRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
+      rollData.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
+      rollData.subMode = "ocv"
       rollData.mode = "weapon"
-      rollData.weapon = weapon
+      rollData.item = weapon
       rollData.img = weapon.img
       this.startRoll(rollData)
     } else {
@@ -807,9 +818,9 @@ export class Hero6Actor extends Actor {
     if (maneuver) {
       maneuver = duplicate(maneuver)
       let rollData = this.getCommonRollData()
-      rollData.maneuverRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
+      rollData.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
       rollData.mode = "mentalmaneuver"
-      rollData.maneuver = maneuver
+      rollData.item = maneuver
       rollData.img = maneuver.img
       this.startRoll(rollData)
     } else {
@@ -823,12 +834,14 @@ export class Hero6Actor extends Actor {
       power = duplicate(power)
       let rollData = this.getCommonRollData()
       if (power.system.attackvalue == "ocv")  {
-        rollData.powerRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
+        rollData.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
+        rollData.subMode = "ocv"
       } else {
-        rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
+        rollData.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
+        rollData.subMode = "omcv"
       }
       rollData.mode = "powerattack"
-      rollData.power = power
+      rollData.item = power
       rollData.img = power.img
       this.startRoll(rollData)
     } else {

modules/hero6-roll-dialog.js

@@ -5,7 +5,7 @@ export class Hero6RollDialog extends Dialog {
   /* -------------------------------------------- */
   static async create(actor, rollData) {
 
-    let options = { classes: ["Hero6Dialog"], width: 460, height: 'fit-content', 'z-index': 99999 };
+    let options = { classes: ["Hero6Dialog"], width: 320, height: 'fit-content', 'z-index': 99999 };
     let html = await renderTemplate('systems/fvtt-hero-system-6/templates/apps/roll-dialog-generic.hbs', rollData);
 
     return new Hero6RollDialog(actor, rollData, html, options);
@@ -14,7 +14,7 @@ export class Hero6RollDialog extends Dialog {
   /* -------------------------------------------- */
   constructor(actor, rollData, html, options, close = undefined) {
     let conf = {
-      title: (rollData.mode == "skill") ? "Skill" : "Attribute",
+      title: "Roll window",
       content: html,
       buttons: {
         roll: {

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]
     })
@@ -347,15 +350,6 @@ export class Hero6Utility {
     let diceFormula = "3d6"
     let target = 10
     
-    if(rollData.weapon) {
-      target = rollData.weaponRoll
-    }
-    if(rollData.maneuver) {
-      target = rollData.maneuverRoll
-    }
-    if(rollData.power) {
-      target = rollData.powerRoll
-    }
     if (rollData.charac) {
       target = rollData.charac.roll
     }

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000132
+MANIFEST-000156

packs/complications/LOG

@@ -1,8 +1,8 @@
-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)
+2023/08/29-16:25:42.990569 7f2deaffd6c0 Recovering log #154
+2023/08/29-16:25:43.182272 7f2deaffd6c0 Delete type=3 #152
+2023/08/29-16:25:43.182363 7f2deaffd6c0 Delete type=0 #154
+2023/08/29-16:40:28.792648 7f2b69bff6c0 Level-0 table #159: started
+2023/08/29-16:40:28.792681 7f2b69bff6c0 Level-0 table #159: 0 bytes OK
+2023/08/29-16:40:28.800879 7f2b69bff6c0 Delete type=0 #157
+2023/08/29-16:40:28.808756 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/29-16:40:28.808800 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-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)
+2023/08/29-16:09:59.520040 7f2deb7fe6c0 Recovering log #150
+2023/08/29-16:09:59.534549 7f2deb7fe6c0 Delete type=3 #148
+2023/08/29-16:09:59.534629 7f2deb7fe6c0 Delete type=0 #150
+2023/08/29-16:24:59.318786 7f2b69bff6c0 Level-0 table #155: started
+2023/08/29-16:24:59.318844 7f2b69bff6c0 Level-0 table #155: 0 bytes OK
+2023/08/29-16:24:59.325770 7f2b69bff6c0 Delete type=0 #153
+2023/08/29-16:24:59.342348 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/29-16:24:59.342392 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-000134
+MANIFEST-000158

packs/equipment/LOG

@@ -1,8 +1,8 @@
-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)
+2023/08/29-16:25:42.891384 7f2deb7fe6c0 Recovering log #156
+2023/08/29-16:25:42.986762 7f2deb7fe6c0 Delete type=3 #154
+2023/08/29-16:25:42.986861 7f2deb7fe6c0 Delete type=0 #156
+2023/08/29-16:40:28.741963 7f2b69bff6c0 Level-0 table #161: started
+2023/08/29-16:40:28.742013 7f2b69bff6c0 Level-0 table #161: 0 bytes OK
+2023/08/29-16:40:28.749774 7f2b69bff6c0 Delete type=0 #159
+2023/08/29-16:40:28.776172 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/29-16:40:28.776271 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-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)
+2023/08/29-16:09:59.496232 7f2dea7fc6c0 Recovering log #152
+2023/08/29-16:09:59.514894 7f2dea7fc6c0 Delete type=3 #150
+2023/08/29-16:09:59.515025 7f2dea7fc6c0 Delete type=0 #152
+2023/08/29-16:24:59.281362 7f2b69bff6c0 Level-0 table #157: started
+2023/08/29-16:24:59.281398 7f2b69bff6c0 Level-0 table #157: 0 bytes OK
+2023/08/29-16:24:59.289117 7f2b69bff6c0 Delete type=0 #155
+2023/08/29-16:24:59.305137 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/29-16:24:59.312278 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-000125
+MANIFEST-000150

packs/maneuvers/LOG

@@ -1,15 +1,8 @@
-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)
+2023/08/29-16:25:43.164843 7f2debfff6c0 Recovering log #148
+2023/08/29-16:25:43.338845 7f2debfff6c0 Delete type=3 #146
+2023/08/29-16:25:43.338920 7f2debfff6c0 Delete type=0 #148
+2023/08/29-16:40:28.801017 7f2b69bff6c0 Level-0 table #153: started
+2023/08/29-16:40:28.801061 7f2b69bff6c0 Level-0 table #153: 0 bytes OK
+2023/08/29-16:40:28.808558 7f2b69bff6c0 Delete type=0 #151
+2023/08/29-16:40:28.808780 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/29-16:40:28.808811 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/maneuvers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/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)
+2023/08/29-16:09:59.537488 7f2debfff6c0 Recovering log #144
+2023/08/29-16:09:59.555680 7f2debfff6c0 Delete type=3 #142
+2023/08/29-16:09:59.555787 7f2debfff6c0 Delete type=0 #144
+2023/08/29-16:24:59.334341 7f2b69bff6c0 Level-0 table #149: started
+2023/08/29-16:24:59.334391 7f2b69bff6c0 Level-0 table #149: 0 bytes OK
+2023/08/29-16:24:59.342219 7f2b69bff6c0 Delete type=0 #147
+2023/08/29-16:24:59.342377 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/29-16:24:59.342413 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-000132
+MANIFEST-000156

packs/perks/LOG

@@ -1,8 +1,8 @@
-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)
+2023/08/29-16:25:43.185065 7f2dea7fc6c0 Recovering log #154
+2023/08/29-16:25:43.371993 7f2dea7fc6c0 Delete type=3 #152
+2023/08/29-16:25:43.372074 7f2dea7fc6c0 Delete type=0 #154
+2023/08/29-16:40:28.785308 7f2b69bff6c0 Level-0 table #159: started
+2023/08/29-16:40:28.785364 7f2b69bff6c0 Level-0 table #159: 0 bytes OK
+2023/08/29-16:40:28.792517 7f2b69bff6c0 Delete type=0 #157
+2023/08/29-16:40:28.808742 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/29-16:40:28.808790 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-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)
+2023/08/29-16:09:59.537875 7f2dea7fc6c0 Recovering log #150
+2023/08/29-16:09:59.558667 7f2dea7fc6c0 Delete type=3 #148
+2023/08/29-16:09:59.558997 7f2dea7fc6c0 Delete type=0 #150
+2023/08/29-16:24:59.312392 7f2b69bff6c0 Level-0 table #155: started
+2023/08/29-16:24:59.312430 7f2b69bff6c0 Level-0 table #155: 0 bytes OK
+2023/08/29-16:24:59.318578 7f2b69bff6c0 Delete type=0 #153
+2023/08/29-16:24:59.342333 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/29-16:24:59.342384 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-000133
+MANIFEST-000157

packs/powers/LOG

@@ -1,8 +1,8 @@
-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)
+2023/08/29-16:25:42.990448 7f2deb7fe6c0 Recovering log #155
+2023/08/29-16:25:43.154128 7f2deb7fe6c0 Delete type=3 #153
+2023/08/29-16:25:43.154225 7f2deb7fe6c0 Delete type=0 #155
+2023/08/29-16:40:28.776406 7f2b69bff6c0 Level-0 table #160: started
+2023/08/29-16:40:28.776459 7f2b69bff6c0 Level-0 table #160: 0 bytes OK
+2023/08/29-16:40:28.785118 7f2b69bff6c0 Delete type=0 #158
+2023/08/29-16:40:28.808720 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/29-16:40:28.808771 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-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)
+2023/08/29-16:09:59.520160 7f2debfff6c0 Recovering log #151
+2023/08/29-16:09:59.534547 7f2debfff6c0 Delete type=3 #149
+2023/08/29-16:09:59.534665 7f2debfff6c0 Delete type=0 #151
+2023/08/29-16:24:59.305197 7f2b69bff6c0 Level-0 table #156: started
+2023/08/29-16:24:59.305251 7f2b69bff6c0 Level-0 table #156: 0 bytes OK
+2023/08/29-16:24:59.312157 7f2b69bff6c0 Delete type=0 #154
+2023/08/29-16:24:59.312296 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/29-16:24:59.312312 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-000132
+MANIFEST-000158

packs/skills/LOG

@@ -1,8 +1,8 @@
-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)
+2023/08/29-16:25:42.891392 7f2dea7fc6c0 Recovering log #156
+2023/08/29-16:25:42.986777 7f2dea7fc6c0 Delete type=3 #154
+2023/08/29-16:25:42.986886 7f2dea7fc6c0 Delete type=0 #156
+2023/08/29-16:40:28.763206 7f2b69bff6c0 Level-0 table #161: started
+2023/08/29-16:40:28.763254 7f2b69bff6c0 Level-0 table #161: 0 bytes OK
+2023/08/29-16:40:28.775955 7f2b69bff6c0 Delete type=0 #159
+2023/08/29-16:40:28.776250 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/29-16:40:28.776293 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-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)
+2023/08/29-16:09:59.496231 7f2deb7fe6c0 Recovering log #152
+2023/08/29-16:09:59.514870 7f2deb7fe6c0 Delete type=3 #150
+2023/08/29-16:09:59.515006 7f2deb7fe6c0 Delete type=0 #152
+2023/08/29-16:24:59.297215 7f2b69bff6c0 Level-0 table #157: started
+2023/08/29-16:24:59.297268 7f2b69bff6c0 Level-0 table #157: 0 bytes OK
+2023/08/29-16:24:59.304916 7f2b69bff6c0 Delete type=0 #155
+2023/08/29-16:24:59.312266 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/29-16:24:59.312303 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-000132
+MANIFEST-000156

packs/talents/LOG

@@ -1,8 +1,8 @@
-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)
+2023/08/29-16:25:43.341031 7f2deb7fe6c0 Recovering log #154
+2023/08/29-16:25:43.476661 7f2deb7fe6c0 Delete type=3 #152
+2023/08/29-16:25:43.476735 7f2deb7fe6c0 Delete type=0 #154
+2023/08/29-16:40:28.808880 7f2b69bff6c0 Level-0 table #159: started
+2023/08/29-16:40:28.808911 7f2b69bff6c0 Level-0 table #159: 0 bytes OK
+2023/08/29-16:40:28.815205 7f2b69bff6c0 Delete type=0 #157
+2023/08/29-16:40:28.815419 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/29-16:40:28.815460 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-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)
+2023/08/29-16:09:59.560765 7f2deaffd6c0 Recovering log #150
+2023/08/29-16:09:59.570734 7f2deaffd6c0 Delete type=3 #148
+2023/08/29-16:09:59.570804 7f2deaffd6c0 Delete type=0 #150
+2023/08/29-16:24:59.325881 7f2b69bff6c0 Level-0 table #155: started
+2023/08/29-16:24:59.325905 7f2b69bff6c0 Level-0 table #155: 0 bytes OK
+2023/08/29-16:24:59.334131 7f2b69bff6c0 Delete type=0 #153
+2023/08/29-16:24:59.342366 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/29-16:24:59.342401 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -821,10 +821,13 @@ ul, li {
 .roll-dialog-header {
   height: 52px;
 }
-
+.dialog-roll-title {
+  margin-left: 8px;
+}
 .actor-icon {
   float: left;
   width: 48px;
+  max-width: 48px;
   height: 48px;
   padding: 2px 6px 2px 2px;
 }

system.json

@@ -91,14 +91,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.18",
+  "version": "11.0.20",
   "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.18.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.20.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"

templates/apps/roll-dialog-generic.hbs

@@ -1,9 +1,11 @@
 <form class="skill-roll-dialog">
   <header class="roll-dialog-header">
-    {{#if img}}
-    <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
-    {{/if}}
-    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
+    <div class="flexrow">
+      {{#if img}}
+      <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
+      {{/if}}
+      <h2 class="dialog-roll-title roll-dialog-header">{{title}}</h2>
+    </div>
   </header>
 
   <div class="flexcol">
@@ -15,24 +17,25 @@
       </div>
     {{/if}}
 
-    {{#if weapon}}    
+    {{#if (eq subMode "ocv")}}
       <div class="flexrow">
-        <span class="item-field-label-long margin-item-list">{{weapon.name}} : </span>
-        <span class="item-field-label-medium margin-item-list">{{weaponRoll}}-</span>
+        <span class="item-field-label-long margin-item-list">OCV : </span>
+        <span class="item-field-label-medium margin-item-list">{{characteristics.ocv.value}}</span>
+      </div>
+      <div class="flexrow">
+        <span class="item-field-label-long margin-item-list">{{upperFirst item.type}} OCV : </span>
+        <span class="item-field-label-medium margin-item-list">{{fixNum item.system.ocv}}</span>
       </div>
     {{/if}}
 
-    {{#if maneuver}}    
+    {{#if (eq subMode "omcv")}}
       <div class="flexrow">
-        <span class="item-field-label-long margin-item-list">{{maneuver.name}} : </span>
-        <span class="item-field-label-medium margin-item-list">{{maneuverRoll}}-</span>
+        <span class="item-field-label-long margin-item-list">OMCV : </span>
+        <span class="item-field-label-medium margin-item-list">{{characteristics.omcv.value}}</span>
       </div>
-    {{/if}}
-
-    {{#if power}}    
       <div class="flexrow">
-        <span class="item-field-label-long margin-item-list">{{power.name}} : </span>
-        <span class="item-field-label-medium margin-item-list">{{powerRoll}}-</span>
+        <span class="item-field-label-long margin-item-list">{{upperFirst item.type}} OMCV : </span>
+        <span class="item-field-label-medium margin-item-list">{{fixNum item.system.omcv}}</span>
       </div>
     {{/if}}
 

templates/chat/chat-generic-result.hbs

@@ -57,7 +57,7 @@
 
         <li><strong>TOTAL : {{result}}</strong>
           {{#if (exists margin)}}
-            ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})
+            (<strong>{{#if isSuccess}}Success!!{{else}}Failure!{{/if}}</strong>)
           {{/if}}
         </li>
 
@@ -66,7 +66,15 @@
         {{/if}}
         
         {{#if (exists margin)}}
-        <li><strong>Margin : {{margin}}</strong>
+          {{#if (eq subMode "normal")}}
+          <li><strong>Margin : {{margin}}</strong>
+          {{/if}}
+          {{#if (eq subMode "ocv")}}
+          <li><strong>Margin (DCV Hit): {{margin}}</strong>
+          {{/if}}
+          {{#if (eq subMode "omcv")}}
+          <li><strong>Margin (DMCV Hit): {{margin}}</strong>
+          {{/if}}
         {{/if}}
 
       </ul>