Merge branch 'halfling_lucky' into 'master'

Fixes #909, Halfling Lucky not applied properly Closes #909 See merge request foundrynet/dnd5e!190
foundryvtt · Jan 1, 2021 · 5e7445a · 5e7445a
2 parents 45502ba + ccc5c6e
commit 5e7445a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/module/combat.js b/module/combat.js
@@ -13,7 +13,7 @@ export const _getInitiativeFormula = function(combatant) {
   let nd = 1;
   let mods = "";
 
-  if (actor.getFlag("dnd5e", "halflingLucky")) mods += "r=1";
+  if (actor.getFlag("dnd5e", "halflingLucky")) mods += "r1=1";
   if (actor.getFlag("dnd5e", "initiativeAdv")) {
     nd = 2;
     mods += "kh";

diff --git a/module/dice.js b/module/dice.js
@@ -53,7 +53,7 @@ export async function d20Roll({parts=[], data={}, event={}, rollMode=null, templ
 
     // Determine the d20 roll and modifiers
     let nd = 1;
-    let mods = halflingLucky ? "r=1" : "";
+    let mods = halflingLucky ? "r1=1" : "";
 
     // Handle advantage
     if (adv === 1) {