Fix sheet and weapons roll

.gitattributes

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

changelog.md

@@ -1,3 +1,23 @@
+v11.0.22
+
+- Fix actor sheet (powers, characteristics)
+- Fix weapons roll
+
+v11.0.21
+
+- Fix grid default distance in system.json
+- Fix powers roll again (#29)
+
+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

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.subMode = "ocv"
       rollData.mode = "weapon"
-      rollData.weapon = weapon
+      rollData.item = weapon
+      rollData.item.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
       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 {
@@ -820,16 +831,19 @@ export class Hero6Actor extends Actor {
   rollPowerAttack(powerId ) {
     let power = this.items.get(powerId)
     if (power) {
-      power = duplicate(power)
+      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)
-      } else {
-        rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
-      }
       rollData.mode = "powerattack"
-      rollData.power = power
+      rollData.item = power
       rollData.img = power.img
+      
+      if (power.system.attackvalue == "ocv")  {
+        rollData.item.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
+        rollData.subMode = "ocv"
+      } else {
+        rollData.item.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
+        rollData.subMode = "omcv"
+      }
       this.startRoll(rollData)
     } else {
       ui.notifications.warn("Unable to find  power " + power.name)

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

@@ -350,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
     }
@@ -368,7 +359,7 @@ export class Hero6Utility {
     target += rollData.bonusMalus
 
     // Performs roll
-    console.log("Roll formula", diceFormula)
+    //console.log("Roll formula", diceFormula)
     let myRoll = rollData.roll
     if (!myRoll) { // New rolls only of no rerolls
       myRoll = new Roll(diceFormula).roll({ async: false })
@@ -383,6 +374,7 @@ export class Hero6Utility {
     if (rollData.result <= target) {
       rollData.isSuccess = true
     }
+    //console.log("Roll result", rollData)
     if (myRoll.terms[0].total == 3) { // Always a success
       rollData.isSuccess = true
     }

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000136
+MANIFEST-000168

packs/complications/LOG

@@ -1,8 +1,8 @@
-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)
+2023/09/01-20:34:49.006564 7fc3c77fe6c0 Recovering log #166
+2023/09/01-20:34:49.017049 7fc3c77fe6c0 Delete type=3 #164
+2023/09/01-20:34:49.017109 7fc3c77fe6c0 Delete type=0 #166
+2023/09/01-20:46:07.499525 7fc1463ff6c0 Level-0 table #171: started
+2023/09/01-20:46:07.499548 7fc1463ff6c0 Level-0 table #171: 0 bytes OK
+2023/09/01-20:46:07.507013 7fc1463ff6c0 Delete type=0 #169
+2023/09/01-20:46:07.524943 7fc1463ff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/09/01-20:46:07.525029 7fc1463ff6c0 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/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/30-20:10:47.117841 7fa55e7fc6c0 Recovering log #162
+2023/08/30-20:10:47.323059 7fa55e7fc6c0 Delete type=3 #160
+2023/08/30-20:10:47.323156 7fa55e7fc6c0 Delete type=0 #162
+2023/08/30-20:19:02.780276 7fa55d3ff6c0 Level-0 table #167: started
+2023/08/30-20:19:02.780299 7fa55d3ff6c0 Level-0 table #167: 0 bytes OK
+2023/08/30-20:19:02.786823 7fa55d3ff6c0 Delete type=0 #165
+2023/08/30-20:19:02.807165 7fa55d3ff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/30-20:19:02.807232 7fa55d3ff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000138
+MANIFEST-000170

packs/equipment/LOG

@@ -1,8 +1,8 @@
-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)
+2023/09/01-20:34:48.990689 7fc3c7fff6c0 Recovering log #168
+2023/09/01-20:34:49.001225 7fc3c7fff6c0 Delete type=3 #166
+2023/09/01-20:34:49.001331 7fc3c7fff6c0 Delete type=0 #168
+2023/09/01-20:46:07.461246 7fc1463ff6c0 Level-0 table #173: started
+2023/09/01-20:46:07.461298 7fc1463ff6c0 Level-0 table #173: 0 bytes OK
+2023/09/01-20:46:07.467444 7fc1463ff6c0 Delete type=0 #171
+2023/09/01-20:46:07.467589 7fc1463ff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/09/01-20:46:07.491206 7fc1463ff6c0 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/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/30-20:10:46.913567 7fa55effd6c0 Recovering log #164
+2023/08/30-20:10:47.085816 7fa55effd6c0 Delete type=3 #162
+2023/08/30-20:10:47.085887 7fa55effd6c0 Delete type=0 #164
+2023/08/30-20:19:02.772964 7fa55d3ff6c0 Level-0 table #169: started
+2023/08/30-20:19:02.773053 7fa55d3ff6c0 Level-0 table #169: 0 bytes OK
+2023/08/30-20:19:02.779629 7fa55d3ff6c0 Delete type=0 #167
+2023/08/30-20:19:02.780116 7fa55d3ff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/30-20:19:02.780129 7fa55d3ff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000130
+MANIFEST-000162

packs/maneuvers/LOG

@@ -1,8 +1,8 @@
-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)
+2023/09/01-20:34:49.019182 7fc3dcdfa6c0 Recovering log #160
+2023/09/01-20:34:49.041348 7fc3dcdfa6c0 Delete type=3 #158
+2023/09/01-20:34:49.041405 7fc3dcdfa6c0 Delete type=0 #160
+2023/09/01-20:46:07.491542 7fc1463ff6c0 Level-0 table #165: started
+2023/09/01-20:46:07.491644 7fc1463ff6c0 Level-0 table #165: 0 bytes OK
+2023/09/01-20:46:07.499417 7fc1463ff6c0 Delete type=0 #163
+2023/09/01-20:46:07.524909 7fc1463ff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/09/01-20:46:07.525011 7fc1463ff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/maneuvers/LOG.old

@@ -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/30-20:10:47.287095 7fa55f7fe6c0 Recovering log #156
+2023/08/30-20:10:47.496255 7fa55f7fe6c0 Delete type=3 #154
+2023/08/30-20:10:47.496306 7fa55f7fe6c0 Delete type=0 #156
+2023/08/30-20:19:02.786933 7fa55d3ff6c0 Level-0 table #161: started
+2023/08/30-20:19:02.786958 7fa55d3ff6c0 Level-0 table #161: 0 bytes OK
+2023/08/30-20:19:02.793209 7fa55d3ff6c0 Delete type=0 #159
+2023/08/30-20:19:02.807175 7fa55d3ff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/30-20:19:02.807218 7fa55d3ff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000136
+MANIFEST-000168

packs/perks/LOG

@@ -1,8 +1,8 @@
-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)
+2023/09/01-20:34:49.021891 7fc3c7fff6c0 Recovering log #166
+2023/09/01-20:34:49.046208 7fc3c7fff6c0 Delete type=3 #164
+2023/09/01-20:34:49.046276 7fc3c7fff6c0 Delete type=0 #166
+2023/09/01-20:46:07.525125 7fc1463ff6c0 Level-0 table #171: started
+2023/09/01-20:46:07.525186 7fc1463ff6c0 Level-0 table #171: 0 bytes OK
+2023/09/01-20:46:07.532898 7fc1463ff6c0 Delete type=0 #169
+2023/09/01-20:46:07.542291 7fc1463ff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/09/01-20:46:07.542317 7fc1463ff6c0 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/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/30-20:10:47.325002 7fa55effd6c0 Recovering log #162
+2023/08/30-20:10:47.532075 7fa55effd6c0 Delete type=3 #160
+2023/08/30-20:10:47.532180 7fa55effd6c0 Delete type=0 #162
+2023/08/30-20:19:02.800848 7fa55d3ff6c0 Level-0 table #167: started
+2023/08/30-20:19:02.800897 7fa55d3ff6c0 Level-0 table #167: 0 bytes OK
+2023/08/30-20:19:02.807064 7fa55d3ff6c0 Delete type=0 #165
+2023/08/30-20:19:02.807205 7fa55d3ff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/30-20:19:02.807225 7fa55d3ff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/powers/CURRENT

@@ -1 +1 @@
-MANIFEST-000137
+MANIFEST-000170

packs/powers/LOG

@@ -1,8 +1,8 @@
-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)
+2023/09/01-20:34:49.006555 7fc3c6ffd6c0 Recovering log #168
+2023/09/01-20:34:49.017044 7fc3c6ffd6c0 Delete type=3 #166
+2023/09/01-20:34:49.017107 7fc3c6ffd6c0 Delete type=0 #168
+2023/09/01-20:46:07.516008 7fc1463ff6c0 Level-0 table #173: started
+2023/09/01-20:46:07.516052 7fc1463ff6c0 Level-0 table #173: 0 bytes OK
+2023/09/01-20:46:07.524696 7fc1463ff6c0 Delete type=0 #171
+2023/09/01-20:46:07.524991 7fc1463ff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/09/01-20:46:07.525070 7fc1463ff6c0 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/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/30-20:10:47.089737 7fa55dffb6c0 Recovering log #163
+2023/08/30-20:10:47.283952 7fa55dffb6c0 Delete type=3 #161
+2023/08/30-20:10:47.284018 7fa55dffb6c0 Delete type=0 #163
+2023/08/30-20:19:02.793322 7fa55d3ff6c0 Level-0 table #169: started
+2023/08/30-20:19:02.793349 7fa55d3ff6c0 Level-0 table #169: 0 bytes OK
+2023/08/30-20:19:02.800604 7fa55d3ff6c0 Delete type=0 #167
+2023/08/30-20:19:02.807184 7fa55d3ff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/30-20:19:02.807212 7fa55d3ff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000136
+MANIFEST-000170

packs/skills/LOG

@@ -1,8 +1,8 @@
-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)
+2023/09/01-20:34:48.990681 7fc3c77fe6c0 Recovering log #168
+2023/09/01-20:34:49.001230 7fc3c77fe6c0 Delete type=3 #166
+2023/09/01-20:34:49.001299 7fc3c77fe6c0 Delete type=0 #168
+2023/09/01-20:46:07.507230 7fc1463ff6c0 Level-0 table #173: started
+2023/09/01-20:46:07.507266 7fc1463ff6c0 Level-0 table #173: 0 bytes OK
+2023/09/01-20:46:07.515830 7fc1463ff6c0 Delete type=0 #171
+2023/09/01-20:46:07.524965 7fc1463ff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/09/01-20:46:07.525047 7fc1463ff6c0 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/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/30-20:10:46.913667 7fa55f7fe6c0 Recovering log #164
+2023/08/30-20:10:47.114760 7fa55f7fe6c0 Delete type=3 #162
+2023/08/30-20:10:47.114894 7fa55f7fe6c0 Delete type=0 #164
+2023/08/30-20:19:02.757545 7fa55d3ff6c0 Level-0 table #169: started
+2023/08/30-20:19:02.757594 7fa55d3ff6c0 Level-0 table #169: 0 bytes OK
+2023/08/30-20:19:02.765676 7fa55d3ff6c0 Delete type=0 #167
+2023/08/30-20:19:02.780087 7fa55d3ff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/30-20:19:02.780123 7fa55d3ff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/talents/CURRENT

@@ -1 +1 @@
-MANIFEST-000136
+MANIFEST-000168

packs/talents/LOG

@@ -1,8 +1,8 @@
-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)
+2023/09/01-20:34:49.047409 7fc3c7fff6c0 Recovering log #166
+2023/09/01-20:34:49.060677 7fc3c7fff6c0 Delete type=3 #164
+2023/09/01-20:34:49.060778 7fc3c7fff6c0 Delete type=0 #166
+2023/09/01-20:46:07.533009 7fc1463ff6c0 Level-0 table #171: started
+2023/09/01-20:46:07.533036 7fc1463ff6c0 Level-0 table #171: 0 bytes OK
+2023/09/01-20:46:07.542144 7fc1463ff6c0 Delete type=0 #169
+2023/09/01-20:46:07.542308 7fc1463ff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/09/01-20:46:07.542326 7fc1463ff6c0 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/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/30-20:10:47.498427 7fa55dffb6c0 Recovering log #162
+2023/08/30-20:10:47.619622 7fa55dffb6c0 Delete type=3 #160
+2023/08/30-20:10:47.619685 7fa55dffb6c0 Delete type=0 #162
+2023/08/30-20:19:02.807339 7fa55d3ff6c0 Level-0 table #167: started
+2023/08/30-20:19:02.807359 7fa55d3ff6c0 Level-0 table #167: 0 bytes OK
+2023/08/30-20:19:02.814782 7fa55d3ff6c0 Delete type=0 #165
+2023/08/30-20:19:02.814992 7fa55d3ff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/30-20:19:02.815017 7fa55d3ff6c0 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;
 }
@@ -1395,6 +1398,9 @@ Focus FOC: #ff0084
 .item-control-end {
   align-self: flex-end;
 }
+.margin-space-4 {
+  margin-left: 4px;
+}
 .margin-item-list {
   margin-top: 4px;
 }

system.json

@@ -9,7 +9,7 @@
   "esmodules": [
     "modules/hero6-main.js"
   ],
-  "gridDistance": 5,
+  "gridDistance": 2,
   "gridUnits": "m",
   "languages": [
     {
@@ -91,14 +91,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.19",
+  "version": "11.0.22",
   "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.19.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.22.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/actors/actor-sheet.hbs

@@ -426,7 +426,7 @@
       <div class="charac-item">
         <ul>
           <li class="item flexrow list-item items-title-bg">
-            <span class="item-field-label-medium">
+            <span class="item-field-label-short">
               <label class="">Value</label>
             </span>
             <span class="item-field-label-medium">
@@ -669,8 +669,8 @@
           <span class="item-field-label-short">
             <label class="item-field-label-short">Roll</label>
           </span>
-          <span class="item-field-label-medium">
-            <label class="item-field-label-medium">END</label>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">END</label>
           </span>
         </li>
         {{#each powers as |power key|}}
@@ -697,7 +697,7 @@
           {{else}}
           <span class="item-field-label-short">&nbsp;</span>
           {{/if}}
-          <span class="item-field-label-medium">{{power.system.endurance}}</span>
+          <span class="item-field-label-short">{{power.system.endurance}}</span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>

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>  

templates/partials/partial-actor-full-charac.hbs

@@ -1,9 +1,9 @@
 <li class="item stat flexrow list-item list-item-shadow" data-attr-key="{{key}}">
 
-  <input type="text" class="item-field-label-medium" name="system.characteristics.{{key}}.value"
+  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.value"
     value="{{charac.value}}" data-dtype="Number" />
 
-  <span class="item-field-label-medium" name="{{key}}">
+  <span class="item-field-label-medium margin-space-4" name="{{key}}">
     <h4 class="item-field-label-medium margin-item-list">{{charac.label}}</a></h4>
   </span>