rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve roll&random before parsing macro var commands

This commit is contained in:
RossAscends 2023-11-26 06:27:13 +09:00
parent 3ec692e76c
commit df15a00430
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@ -2009,7 +2009,8 @@ function substituteParams(content, _name1, _name2, _original, _group, _replaceCh
if (typeof _original === 'string') { if (typeof _original === 'string') {
content = content.replace(/{{original}}/i, _original); content = content.replace(/{{original}}/i, _original);
} }
content = diceRollReplace(content);
content = randomReplace(content);
content = replaceVariableMacros(content); content = replaceVariableMacros(content);
content = content.replace(/{{newline}}/gi, "\n"); content = content.replace(/{{newline}}/gi, "\n");
content = content.replace(/{{input}}/gi, String($('#send_textarea').val())); 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'); const utcTime = moment().utc().utcOffset(utcOffset).format('LT');
return utcTime; return utcTime;
}); });
content = diceRollReplace(content);
content = randomReplace(content);
content = bannedWordsReplace(content); content = bannedWordsReplace(content);
return content; return content;
} }