From df15a00430edf9f7285dbc8bea8978414bfb02c3 Mon Sep 17 00:00:00 2001
From: RossAscends <124905043+RossAscends@users.noreply.github.com>
Date: Sun, 26 Nov 2023 06:27:13 +0900
Subject: [PATCH] resolve roll&random before parsing macro var commands

---
 public/script.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/script.js b/public/script.js
index 731c6e70d..718cc0e0a 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2009,7 +2009,8 @@ function substituteParams(content, _name1, _name2, _original, _group, _replaceCh
     if (typeof _original === 'string') {
         content = content.replace(/{{original}}/i, _original);
     }
-
+    content = diceRollReplace(content);
+    content = randomReplace(content);
     content = replaceVariableMacros(content);
     content = content.replace(/{{newline}}/gi, "\n");
     content = content.replace(/{{input}}/gi, String($('#send_textarea').val()));
@@ -2055,8 +2056,6 @@ function substituteParams(content, _name1, _name2, _original, _group, _replaceCh
         const utcTime = moment().utc().utcOffset(utcOffset).format('LT');
         return utcTime;
     });
-    content = diceRollReplace(content);
-    content = randomReplace(content);
     content = bannedWordsReplace(content);
     return content;
 }