Fix #35

.gitattributes

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

changelog.md

@@ -1,3 +1,31 @@
+v11.0.23
+
+- Proper display of BODY/STUN bars on tokens
+  
+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
+
 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)      
+      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)
   }
@@ -721,7 +731,7 @@ export class Hero6Actor extends Actor {
     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)
+      rollData.stunValue = Number(myRoll.total) * (Number(mult.total) + (Number(item.system.stunx) || 0))
     } else {
       rollData.stunValue = myRoll.total
     }
@@ -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 {
@@ -822,14 +833,17 @@ export class Hero6Actor extends Actor {
     if (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

@@ -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
     }
@@ -365,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 })
@@ -380,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-000128
+MANIFEST-000188

packs/complications/LOG

@@ -1,8 +1,8 @@
-2023/08/26-22:07:58.627561 7f2deaffd6c0 Recovering log #126
+2023/10/04-21:41:44.140558 7f16d7fff6c0 Recovering log #186
-2023/08/26-22:07:58.748615 7f2deaffd6c0 Delete type=3 #124
+2023/10/04-21:41:44.150660 7f16d7fff6c0 Delete type=3 #184
-2023/08/26-22:07:58.748679 7f2deaffd6c0 Delete type=0 #126
+2023/10/04-21:41:44.150712 7f16d7fff6c0 Delete type=0 #186
-2023/08/26-22:16:27.923271 7f2b69bff6c0 Level-0 table #131: started
+2023/10/04-21:47:02.531984 7f14567ef6c0 Level-0 table #191: started
-2023/08/26-22:16:27.923312 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/10/04-21:47:02.532010 7f14567ef6c0 Level-0 table #191: 0 bytes OK
-2023/08/26-22:16:27.929503 7f2b69bff6c0 Delete type=0 #129
+2023/10/04-21:47:02.538823 7f14567ef6c0 Delete type=0 #189
-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/10/04-21:47:02.545067 7f14567ef6c0 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/10/04-21:47:02.545092 7f14567ef6c0 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-21:35:11.738363 7f2dea7fc6c0 Recovering log #122
+2023/10/04-21:35:01.811691 7f16d6ffd6c0 Recovering log #182
-2023/08/26-21:35:11.748913 7f2dea7fc6c0 Delete type=3 #120
+2023/10/04-21:35:01.822017 7f16d6ffd6c0 Delete type=3 #180
-2023/08/26-21:35:11.749017 7f2dea7fc6c0 Delete type=0 #122
+2023/10/04-21:35:01.822072 7f16d6ffd6c0 Delete type=0 #182
-2023/08/26-21:46:54.280176 7f2b69bff6c0 Level-0 table #127: started
+2023/10/04-21:41:38.795066 7f14567ef6c0 Level-0 table #187: started
-2023/08/26-21:46:54.280220 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
+2023/10/04-21:41:38.795089 7f14567ef6c0 Level-0 table #187: 0 bytes OK
-2023/08/26-21:46:54.287757 7f2b69bff6c0 Delete type=0 #125
+2023/10/04-21:41:38.801689 7f14567ef6c0 Delete type=0 #185
-2023/08/26-21:46:54.294397 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808479 7f14567ef6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/26-21:46:54.294492 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808530 7f14567ef6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000130
+MANIFEST-000190

packs/equipment/LOG

@@ -1,8 +1,8 @@
-2023/08/26-22:07:58.520995 7f2deb7fe6c0 Recovering log #128
+2023/10/04-21:41:44.100507 7f16d6ffd6c0 Recovering log #188
-2023/08/26-22:07:58.608948 7f2deb7fe6c0 Delete type=3 #126
+2023/10/04-21:41:44.111147 7f16d6ffd6c0 Delete type=3 #186
-2023/08/26-22:07:58.609004 7f2deb7fe6c0 Delete type=0 #128
+2023/10/04-21:41:44.111281 7f16d6ffd6c0 Delete type=0 #188
-2023/08/26-22:16:27.903755 7f2b69bff6c0 Level-0 table #133: started
+2023/10/04-21:47:02.509785 7f14567ef6c0 Level-0 table #193: started
-2023/08/26-22:16:27.903791 7f2b69bff6c0 Level-0 table #133: 0 bytes OK
+2023/10/04-21:47:02.509815 7f14567ef6c0 Level-0 table #193: 0 bytes OK
-2023/08/26-22:16:27.909699 7f2b69bff6c0 Delete type=0 #131
+2023/10/04-21:47:02.518200 7f14567ef6c0 Delete type=0 #191
-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/10/04-21:47:02.518694 7f14567ef6c0 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/10/04-21:47:02.518773 7f14567ef6c0 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-21:35:11.724122 7f2deb7fe6c0 Recovering log #124
+2023/10/04-21:35:01.768747 7f16d7fff6c0 Recovering log #184
-2023/08/26-21:35:11.735212 7f2deb7fe6c0 Delete type=3 #122
+2023/10/04-21:35:01.779863 7f16d7fff6c0 Delete type=3 #182
-2023/08/26-21:35:11.735277 7f2deb7fe6c0 Delete type=0 #124
+2023/10/04-21:35:01.779921 7f16d7fff6c0 Delete type=0 #184
-2023/08/26-21:46:54.246960 7f2b69bff6c0 Level-0 table #129: started
+2023/10/04-21:41:38.760705 7f14567ef6c0 Level-0 table #189: started
-2023/08/26-21:46:54.247029 7f2b69bff6c0 Level-0 table #129: 0 bytes OK
+2023/10/04-21:41:38.760752 7f14567ef6c0 Level-0 table #189: 0 bytes OK
-2023/08/26-21:46:54.253553 7f2b69bff6c0 Delete type=0 #127
+2023/10/04-21:41:38.767288 7f14567ef6c0 Delete type=0 #187
-2023/08/26-21:46:54.253849 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.774856 7f14567ef6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
-2023/08/26-21:46:54.266229 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.781126 7f14567ef6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000121
+MANIFEST-000182

packs/maneuvers/LOG

@@ -1,8 +1,8 @@
-2023/08/26-22:07:58.730640 7f2deb7fe6c0 Recovering log #119
+2023/10/04-21:41:44.152237 7f16d6ffd6c0 Recovering log #180
-2023/08/26-22:07:58.841210 7f2deb7fe6c0 Delete type=3 #117
+2023/10/04-21:41:44.162524 7f16d6ffd6c0 Delete type=3 #178
-2023/08/26-22:07:58.841288 7f2deb7fe6c0 Delete type=0 #119
+2023/10/04-21:41:44.162593 7f16d6ffd6c0 Delete type=0 #180
-2023/08/26-22:16:27.936844 7f2b69bff6c0 Level-0 table #124: started
+2023/10/04-21:47:02.538933 7f14567ef6c0 Level-0 table #185: started
-2023/08/26-22:16:27.936868 7f2b69bff6c0 Level-0 table #124: 0 bytes OK
+2023/10/04-21:47:02.538963 7f14567ef6c0 Level-0 table #185: 0 bytes OK
-2023/08/26-22:16:27.942975 7f2b69bff6c0 Delete type=0 #122
+2023/10/04-21:47:02.544945 7f14567ef6c0 Delete type=0 #183
-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/10/04-21:47:02.545085 7f14567ef6c0 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/10/04-21:47:02.545108 7f14567ef6c0 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-21:35:11.751865 7f2debfff6c0 Recovering log #114
+2023/10/04-21:35:01.823989 7f16d7fff6c0 Recovering log #176
-2023/08/26-21:35:11.761906 7f2debfff6c0 Delete type=3 #112
+2023/10/04-21:35:01.834386 7f16d7fff6c0 Delete type=3 #174
-2023/08/26-21:35:11.761967 7f2debfff6c0 Delete type=0 #114
+2023/10/04-21:35:01.834682 7f16d7fff6c0 Delete type=0 #176
-2023/08/26-21:46:54.287966 7f2b69bff6c0 Level-0 table #120: started
+2023/10/04-21:41:38.788643 7f14567ef6c0 Level-0 table #181: started
-2023/08/26-21:46:54.288007 7f2b69bff6c0 Level-0 table #120: 0 bytes OK
+2023/10/04-21:41:38.788676 7f14567ef6c0 Level-0 table #181: 0 bytes OK
-2023/08/26-21:46:54.294193 7f2b69bff6c0 Delete type=0 #118
+2023/10/04-21:41:38.794955 7f14567ef6c0 Delete type=0 #179
-2023/08/26-21:46:54.294471 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808465 7f14567ef6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/26-21:46:54.294512 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808513 7f14567ef6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000128
+MANIFEST-000188

packs/perks/LOG

@@ -1,8 +1,8 @@
-2023/08/26-22:07:58.751122 7f2dea7fc6c0 Recovering log #126
+2023/10/04-21:41:44.164948 7f16ecffa6c0 Recovering log #186
-2023/08/26-22:07:58.864497 7f2dea7fc6c0 Delete type=3 #124
+2023/10/04-21:41:44.175548 7f16ecffa6c0 Delete type=3 #184
-2023/08/26-22:07:58.864580 7f2dea7fc6c0 Delete type=0 #126
+2023/10/04-21:41:44.175604 7f16ecffa6c0 Delete type=0 #186
-2023/08/26-22:16:27.929655 7f2b69bff6c0 Level-0 table #131: started
+2023/10/04-21:47:02.552360 7f14567ef6c0 Level-0 table #191: started
-2023/08/26-22:16:27.929696 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/10/04-21:47:02.552386 7f14567ef6c0 Level-0 table #191: 0 bytes OK
-2023/08/26-22:16:27.936745 7f2b69bff6c0 Delete type=0 #129
+2023/10/04-21:47:02.560501 7f14567ef6c0 Delete type=0 #189
-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/10/04-21:47:02.560629 7f14567ef6c0 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/10/04-21:47:02.560655 7f14567ef6c0 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-21:35:11.751864 7f2deaffd6c0 Recovering log #122
+2023/10/04-21:35:01.836873 7f16ecffa6c0 Recovering log #182
-2023/08/26-21:35:11.761866 7f2deaffd6c0 Delete type=3 #120
+2023/10/04-21:35:01.847899 7f16ecffa6c0 Delete type=3 #180
-2023/08/26-21:35:11.761921 7f2deaffd6c0 Delete type=0 #122
+2023/10/04-21:35:01.847965 7f16ecffa6c0 Delete type=0 #182
-2023/08/26-21:46:54.294564 7f2b69bff6c0 Level-0 table #127: started
+2023/10/04-21:41:38.781263 7f14567ef6c0 Level-0 table #187: started
-2023/08/26-21:46:54.294620 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
+2023/10/04-21:41:38.781303 7f14567ef6c0 Level-0 table #187: 0 bytes OK
-2023/08/26-21:46:54.302478 7f2b69bff6c0 Delete type=0 #125
+2023/10/04-21:41:38.788512 7f14567ef6c0 Delete type=0 #185
-2023/08/26-21:46:54.309946 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808450 7f14567ef6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/26-21:46:54.310020 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808503 7f14567ef6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/powers/CURRENT

@@ -1 +1 @@
-MANIFEST-000129
+MANIFEST-000190

packs/powers/LOG

@@ -1,8 +1,8 @@
-2023/08/26-22:07:58.612145 7f2debfff6c0 Recovering log #127
+2023/10/04-21:41:44.127784 7f16d77fe6c0 Recovering log #188
-2023/08/26-22:07:58.728418 7f2debfff6c0 Delete type=3 #125
+2023/10/04-21:41:44.137990 7f16d77fe6c0 Delete type=3 #186
-2023/08/26-22:07:58.728498 7f2debfff6c0 Delete type=0 #127
+2023/10/04-21:41:44.138069 7f16d77fe6c0 Delete type=0 #188
-2023/08/26-22:16:27.916401 7f2b69bff6c0 Level-0 table #132: started
+2023/10/04-21:47:02.518821 7f14567ef6c0 Level-0 table #193: started
-2023/08/26-22:16:27.916423 7f2b69bff6c0 Level-0 table #132: 0 bytes OK
+2023/10/04-21:47:02.518901 7f14567ef6c0 Level-0 table #193: 0 bytes OK
-2023/08/26-22:16:27.923048 7f2b69bff6c0 Delete type=0 #130
+2023/10/04-21:47:02.525324 7f14567ef6c0 Delete type=0 #191
-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/10/04-21:47:02.545045 7f14567ef6c0 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/10/04-21:47:02.545077 7f14567ef6c0 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-21:35:11.738380 7f2deaffd6c0 Recovering log #123
+2023/10/04-21:35:01.795955 7f16d77fe6c0 Recovering log #184
-2023/08/26-21:35:11.748807 7f2deaffd6c0 Delete type=3 #121
+2023/10/04-21:35:01.806044 7f16d77fe6c0 Delete type=3 #182
-2023/08/26-21:35:11.748868 7f2deaffd6c0 Delete type=0 #123
+2023/10/04-21:35:01.806101 7f16d77fe6c0 Delete type=0 #184
-2023/08/26-21:46:54.273097 7f2b69bff6c0 Level-0 table #128: started
+2023/10/04-21:41:38.774865 7f14567ef6c0 Level-0 table #189: started
-2023/08/26-21:46:54.273141 7f2b69bff6c0 Level-0 table #128: 0 bytes OK
+2023/10/04-21:41:38.774887 7f14567ef6c0 Level-0 table #189: 0 bytes OK
-2023/08/26-21:46:54.279970 7f2b69bff6c0 Delete type=0 #126
+2023/10/04-21:41:38.780982 7f14567ef6c0 Delete type=0 #187
-2023/08/26-21:46:54.287948 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.781151 7f14567ef6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/26-21:46:54.294448 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.781172 7f14567ef6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000128
+MANIFEST-000190

packs/skills/LOG

@@ -1,8 +1,8 @@
-2023/08/26-22:07:58.521207 7f2dea7fc6c0 Recovering log #126
+2023/10/04-21:41:44.114622 7f16ecffa6c0 Recovering log #188
-2023/08/26-22:07:58.625202 7f2dea7fc6c0 Delete type=3 #124
+2023/10/04-21:41:44.125734 7f16ecffa6c0 Delete type=3 #186
-2023/08/26-22:07:58.625257 7f2dea7fc6c0 Delete type=0 #126
+2023/10/04-21:41:44.125812 7f16ecffa6c0 Delete type=0 #188
-2023/08/26-22:16:27.909865 7f2b69bff6c0 Level-0 table #131: started
+2023/10/04-21:47:02.525443 7f14567ef6c0 Level-0 table #193: started
-2023/08/26-22:16:27.909908 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/10/04-21:47:02.525470 7f14567ef6c0 Level-0 table #193: 0 bytes OK
-2023/08/26-22:16:27.916292 7f2b69bff6c0 Delete type=0 #129
+2023/10/04-21:47:02.531866 7f14567ef6c0 Delete type=0 #191
-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/10/04-21:47:02.545057 7f14567ef6c0 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/10/04-21:47:02.545100 7f14567ef6c0 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-21:35:11.724122 7f2debfff6c0 Recovering log #122
+2023/10/04-21:35:01.783254 7f16ecffa6c0 Recovering log #184
-2023/08/26-21:35:11.735216 7f2debfff6c0 Delete type=3 #120
+2023/10/04-21:35:01.792970 7f16ecffa6c0 Delete type=3 #182
-2023/08/26-21:35:11.735320 7f2debfff6c0 Delete type=0 #122
+2023/10/04-21:35:01.793080 7f16ecffa6c0 Delete type=0 #184
-2023/08/26-21:46:54.266256 7f2b69bff6c0 Level-0 table #127: started
+2023/10/04-21:41:38.767422 7f14567ef6c0 Level-0 table #189: started
-2023/08/26-21:46:54.266300 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
+2023/10/04-21:41:38.767446 7f14567ef6c0 Level-0 table #189: 0 bytes OK
-2023/08/26-21:46:54.272914 7f2b69bff6c0 Delete type=0 #125
+2023/10/04-21:41:38.774734 7f14567ef6c0 Delete type=0 #187
-2023/08/26-21:46:54.287925 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.781109 7f14567ef6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/26-21:46:54.294424 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.781182 7f14567ef6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/talents/CURRENT

@@ -1 +1 @@
-MANIFEST-000128
+MANIFEST-000188

packs/talents/LOG

@@ -1,8 +1,8 @@
-2023/08/26-22:07:58.844046 7f2debfff6c0 Recovering log #126
+2023/10/04-21:41:44.177511 7f16d77fe6c0 Recovering log #186
-2023/08/26-22:07:58.925665 7f2debfff6c0 Delete type=3 #124
+2023/10/04-21:41:44.187706 7f16d77fe6c0 Delete type=3 #184
-2023/08/26-22:07:58.926331 7f2debfff6c0 Delete type=0 #126
+2023/10/04-21:41:44.187791 7f16d77fe6c0 Delete type=0 #186
-2023/08/26-22:16:27.943060 7f2b69bff6c0 Level-0 table #131: started
+2023/10/04-21:47:02.545189 7f14567ef6c0 Level-0 table #191: started
-2023/08/26-22:16:27.943083 7f2b69bff6c0 Level-0 table #131: 0 bytes OK
+2023/10/04-21:47:02.545213 7f14567ef6c0 Level-0 table #191: 0 bytes OK
-2023/08/26-22:16:27.949677 7f2b69bff6c0 Delete type=0 #129
+2023/10/04-21:47:02.552254 7f14567ef6c0 Delete type=0 #189
-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/10/04-21:47:02.560616 7f14567ef6c0 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/10/04-21:47:02.560646 7f14567ef6c0 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-21:35:11.765241 7f2dea7fc6c0 Recovering log #122
+2023/10/04-21:35:01.850710 7f16d77fe6c0 Recovering log #182
-2023/08/26-21:35:11.781642 7f2dea7fc6c0 Delete type=3 #120
+2023/10/04-21:35:01.861789 7f16d77fe6c0 Delete type=3 #180
-2023/08/26-21:35:11.781702 7f2dea7fc6c0 Delete type=0 #122
+2023/10/04-21:35:01.861973 7f16d77fe6c0 Delete type=0 #182
-2023/08/26-21:46:54.302747 7f2b69bff6c0 Level-0 table #127: started
+2023/10/04-21:41:38.801785 7f14567ef6c0 Level-0 table #187: started
-2023/08/26-21:46:54.302821 7f2b69bff6c0 Level-0 table #127: 0 bytes OK
+2023/10/04-21:41:38.801808 7f14567ef6c0 Level-0 table #187: 0 bytes OK
-2023/08/26-21:46:54.309685 7f2b69bff6c0 Delete type=0 #125
+2023/10/04-21:41:38.808336 7f14567ef6c0 Delete type=0 #185
-2023/08/26-21:46:54.309987 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808493 7f14567ef6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/26-21:46:54.310051 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/10/04-21:41:38.808522 7f14567ef6c0 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": [
     {
@@ -85,20 +85,20 @@
       "flags": {}
     }
   ],
-  "primaryTokenAttribute": "secondary.hp",
+  "primaryTokenAttribute": "characteristics.body",
-  "secondaryTokenAttribute": "secondary.effort",
+  "secondaryTokenAttribute": "characteristics.end",
   "socket": true,
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.17",
+  "version": "11.0.23",
   "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.17.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.23.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

@@ -260,9 +260,9 @@
                 <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                   <span class="item-field-label-long">{{char.label}}</span>
                   <input type="text" class="item-field-label-short update-field"
-                    data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
+                    data-field-name="system.characteristics.{{key}}.max" value="{{char.max}}" data-dtype="Number" />
-                  <input type="text" class="item-field-label-short" name="system.characteristics.{{key}}.damage"
+                  <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value"
-                    value="{{char.damage}}" data-dtype="Number" />
+                    value="{{char.value}}" data-dtype="Number" />
                 </li>
                 {{/if}}
                 {{/each}}
@@ -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">
+          <span class="item-field-label-short">
-            <label class="item-field-label-medium">END</label>
+            <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/combat-tracker.hbs

@@ -32,8 +32,6 @@
             </a>
             {{/if}}
 
-            {{log combat.flags}}
-
             {{#if combatCount}}
             {{#if combat.round}}
             <!--<h3 class="encounter-title noborder">Turn {{combat.turnNumber}} Segment {{combat.segmentNumber}}</h3>-->

templates/apps/roll-dialog-generic.hbs

@@ -1,9 +1,11 @@
 <form class="skill-roll-dialog">
   <header class="roll-dialog-header">
+    <div class="flexrow">
       {{#if img}}
       <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
       {{/if}}
-    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
+      <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-long margin-item-list">OCV : </span>
-        <span class="item-field-label-medium margin-item-list">{{weaponRoll}}-</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-long margin-item-list">OMCV : </span>
-        <span class="item-field-label-medium margin-item-list">{{maneuverRoll}}-</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-long margin-item-list">{{upperFirst item.type}} OMCV : </span>
-        <span class="item-field-label-medium margin-item-list">{{powerRoll}}-</span>
+        <span class="item-field-label-medium margin-item-list">{{fixNum item.system.omcv}}</span>
       </div>
     {{/if}}
 

templates/chat/chat-damage-result.hbs

@@ -15,20 +15,25 @@
         <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 (or (eq item.system.damageeffect "killing") (eq item.system.damageeffect "normal"))}}      
+        {{#if (eq item.system.damageeffect "normal")}}      
-        <li><strong>1d3 result + STUNx : {{killingMultiplier}} + {{item.system.stunx}}</strong></li>
-        <li><strong>STUN : {{stunValue}}</strong></li>
         <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 : {{stunValue}}</strong></li>
+        <li><strong>BODY : {{bodyValue}}</strong></li>
         {{/if}}
 
       </ul>  

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,8 +66,16 @@
         {{/if}}
         
         {{#if (exists margin)}}
+          {{#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>  
     </div>

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>