Fix generating FVTT/R20 formulas with reroll and min

This can happen with Reliable Talent and Luck features together Fixes kakaroto#532
rispig · Oct 4, 2020 · a0b8dcb · a0b8dcb
1 parent 6924b68
commit a0b8dcb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/dist/fvtt_script.js b/dist/fvtt_script.js
@@ -2729,7 +2729,7 @@ class FVTTDisplayer {
 class FVTTRoll extends Beyond20BaseRoll {
     constructor(formula, data = {}) {
         formula = formula.replace(/ro(=|<|<=|>|>=)([0-9]+)/g, "r$1$2");
-        formula = formula.replace(/(^|\s)+([^\s]+)min([0-9]+)/g, "$1{$2, $3}kh1");
+        formula = formula.replace(/(^|\s)+([^\s]+)min([0-9]+)([^\s]*)/g, "$1{$2$4, $3}kh1");
         super(formula, data);
         this._roll = new Roll(formula, data)
     }

diff --git a/dist/roll20.js b/dist/roll20.js
@@ -2696,7 +2696,7 @@ function escapeRoll20Macro(text) {
 
 function genRoll(dice, modifiers = {}) {
     dice = dice.replace(/ro<=([0-9]+)/, "ro<$1");
-    dice = dice.replace(/(^|\s)+([^\s]+)min([0-9]+)/g, "$1{$2, 0d0 + $3}kh1");
+    dice = dice.replace(/(^|\s)+([^\s]+)min([0-9]+)([^\s]*)/g, "$1{$2$4, 0d0 + $3}kh1");
     let roll = "[[" + dice;
     for (let m in modifiers) {
         let mod = modifiers[m];

diff --git a/src/fvtt/page-script.js b/src/fvtt/page-script.js
@@ -129,7 +129,7 @@ class FVTTDisplayer {
 class FVTTRoll extends Beyond20BaseRoll {
     constructor(formula, data = {}) {
         formula = formula.replace(/ro(=|<|<=|>|>=)([0-9]+)/g, "r$1$2");
-        formula = formula.replace(/(^|\s)+([^\s]+)min([0-9]+)/g, "$1{$2, $3}kh1");
+        formula = formula.replace(/(^|\s)+([^\s]+)min([0-9]+)([^\s]*)/g, "$1{$2$4, $3}kh1");
         super(formula, data);
         this._roll = new Roll(formula, data)
     }

diff --git a/src/roll20/content-script.js b/src/roll20/content-script.js
@@ -47,7 +47,7 @@ function escapeRoll20Macro(text) {
 
 function genRoll(dice, modifiers = {}) {
     dice = dice.replace(/ro<=([0-9]+)/, "ro<$1");
-    dice = dice.replace(/(^|\s)+([^\s]+)min([0-9]+)/g, "$1{$2, 0d0 + $3}kh1");
+    dice = dice.replace(/(^|\s)+([^\s]+)min([0-9]+)([^\s]*)/g, "$1{$2$4, 0d0 + $3}kh1");
     let roll = "[[" + dice;
     for (let m in modifiers) {
         let mod = modifiers[m];