From 68cac8a3b4a62e18da68627bd7a9bee5652dcbbe Mon Sep 17 00:00:00 2001
From: Mark <mlenser@gmail.com>
Date: Fri, 8 Apr 2016 20:21:46 +0200
Subject: [PATCH] add sign to ability check chat macro

---
 .../precompiled/components/sheetWorkers.js           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/D&D_5e_Reshaped/precompiled/components/sheetWorkers.js b/D&D_5e_Reshaped/precompiled/components/sheetWorkers.js
index a0c20e9eab..d6cbbf2ccd 100644
--- a/D&D_5e_Reshaped/precompiled/components/sheetWorkers.js
+++ b/D&D_5e_Reshaped/precompiled/components/sheetWorkers.js
@@ -476,6 +476,7 @@ const updateAbilityModifier = (ability) => {
     finalSetAttrs[`${ability}_mod`] = abilityMod;
     finalSetAttrs[`${ability}_mod_with_sign`] = showSign(abilityMod);
     finalSetAttrs[`${ability}_check_mod`] = abilityCheck;
+    finalSetAttrs[`${ability}_check_mod_with_sign`] = showSign(abilityCheck);
     finalSetAttrs[`${ability}_check_mod_formula`] = abilityCheckFormula;
 
     if (ability === 'strength') {
@@ -3381,11 +3382,9 @@ const updateAbilityChecksMacro = () => {
   finalSetAttrs.skills_macro_var = '';
 
   for (const ability of ABILITIES) {
-    finalSetAttrs.ability_checks_query_var += `|${capitalize(ability)},{{title=${capitalize(ability)}&#125;&#125; {{roll1=[[@{preroll}d20@{postroll}@{d20_mod} + @{${ability}_check_mod}]]&#125;&#125; @{roll_setting}@{d20_mod} + @{${ability}_check_mod}]]&#125;&#125;`;
-    finalSetAttrs.ability_checks_macro_var += `[${capitalize(ability)}](~${ability}_check)`;
-    finalSetAttrs.ability_checks_macro_var += ', ';
+    collectionArray.push(`${ability}_check_mod`);
+    collectionArray.push(`${ability}_check_mod_with_sign`);
   }
-
   getSectionIDs(repeatingItem, (ids) => {
     for (const id of ids) {
       const repeatingString = `${repeatingItem}_${id}_`;
@@ -3395,6 +3394,11 @@ const updateAbilityChecksMacro = () => {
     }
 
     getAttrs(collectionArray, (v) => {
+      for (const ability of ABILITIES) {
+        finalSetAttrs.ability_checks_query_var += `|${capitalize(ability)},{{title=${capitalize(ability)}&#125;&#125; {{roll1=[[@{preroll}d20@{postroll}@{d20_mod} + ${v[`${ability}_check_mod`]}]]&#125;&#125; @{roll_setting}@{d20_mod} + ${v[`${ability}_check_mod`]}]]&#125;&#125;`;
+        finalSetAttrs.ability_checks_macro_var += `[${capitalize(ability)} ${v[`${ability}_check_mod_with_sign`]}](~${ability}_check)`;
+        finalSetAttrs.ability_checks_macro_var += ', ';
+      }
       for (const id of ids) {
         const repeatingString = `${repeatingItem}_${id}_`;
         finalSetAttrs.ability_checks_query_var += `|${v[`${repeatingString}name`]}, {{title=${v[`${repeatingString}name`]} (${capitalize(getAbilityShortName(v[`${repeatingString}ability`]))})&#125;&#125; {{roll1=[[@{preroll}d20@{postroll}@{d20_mod} + @{${repeatingString}formula}]]&#125;&#125; @{roll_setting}@{d20_mod} + @{${repeatingString}formula}]]&#125;&#125;`;