Enhance march

modules/hero6-utility.js

@@ -46,7 +46,7 @@ export class Hero6Utility {
       return __locationNames[key]      
     })
     Handlebars.registerHelper('isSkillCustom', function (key) {
-      if (key == "custom" || key == "background"  ) {
+      if (key == "custom" ) {
         return true;
       }
       return false
@@ -304,7 +304,7 @@ export class Hero6Utility {
       target = rollData.charac.roll
     }
     if (rollData.item) {
-      target = rollData.item.system.roll
+      target = rollData.item.roll || rollData.item.system.roll
     }
 
     // Performs roll
@@ -328,9 +328,7 @@ export class Hero6Utility {
     if ( myRoll.terms[0].total == 18) { // Always a failure
       rollData.isSuccess = false
     }
-    if (rollData.isSuccess ) {
-      rollData.margin = target - rollData.result
-    }
+    rollData.margin = target - rollData.result
 
     let msg = await this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-generic-result.hbs`, rollData)