Merge pull request #327 from Khaali-dev/master

Backstab master implemented
pwatson100 · Sep 26, 2021 · eb279a0 · eb279a0
2 parents f740b7f + caf91bd
commit eb279a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/script/common/item.js b/script/common/item.js
@@ -1402,9 +1402,13 @@ export async function attackRoll(weapon, actor){
             let backstabAbil = actor.items.filter(item => item.data.data?.reference === "backstab");
             if(backstabAbil.length != 0){
                 functionStuff.askBackstab = true;
+                functionStuff.backstabDmg = " + 1d4["+game.i18n.localize("ABILITY_LABEL.BACKSTAB")+"]";
                 if(backstabAbil[0].data.data.adept.isActive){
                     functionStuff.dmgData.backstabBleed = true
                 }
+                if(backstabAbil[0].data.data.master.isActive){
+                    functionStuff.backstabDmg =  " + 1d8["+game.i18n.localize("ABILITY_LABEL.BACKSTAB")+"]";
+                }
             }
         }
         let ironFist = actor.items.filter(item => item.data.data?.reference === "ironfist");

diff --git a/script/common/roll.js b/script/common/roll.js
@@ -376,14 +376,15 @@ export async function damageRollWithDiceParams(functionStuff, critSuccess, attac
     }
 
   if(dmgData.hasAdvantage){
+    damageModFormula += " + 1d4"+game.i18n.localize("COMBAT.CHAT_DMG_PARAMS_ADVANTAGE");
+    damageAutoParams += game.i18n.localize('COMBAT.CHAT_DMG_PARAMS_ADVANTAGE');
     if(dmgData.useBackstab && !attackNumber){
-      damageModFormula += " + 2d4["+game.i18n.localize("ABILITY_LABEL.BACKSTAB")+"]";
+      damageModFormula += functionStuff.backstabDmg;
       damageAutoParams += game.i18n.localize('COMBAT.CHAT_DMG_PARAMS_BACKSTAB');
     }
     else
     {
-      damageModFormula += " + 1d4"+game.i18n.localize("COMBAT.CHAT_DMG_PARAMS_ADVANTAGE");
-      damageAutoParams += game.i18n.localize('COMBAT.CHAT_DMG_PARAMS_ADVANTAGE');
+
     }
   }
   if(functionStuff.beastLoreData.useBeastlore){