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

{{random}} split on :: to allow empty items & commas in items

This commit is contained in:
RossAscends 2023-11-26 01:28:33 +09:00
parent 389c2b5435
commit 2bed9fde70
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/script.js
View File

@ -2124,8 +2124,8 @@ function randomReplace(input, emptyListPlaceholder = '') {
const randomPattern = /{{random[ : ]([^}]+)}}/gi; const randomPattern = /{{random[ : ]([^}]+)}}/gi;
return input.replace(randomPattern, (match, listString) => { return input.replace(randomPattern, (match, listString) => {
const list = listString.split(',').map(item => item.trim()).filter(item => item.length > 0); //split on double colons instead of commas to allow for commas inside random items
const list = listString.split('::').filter(item => item.length > 0);
if (list.length === 0) { if (list.length === 0) {
return emptyListPlaceholder; return emptyListPlaceholder;
} }
@ -2134,7 +2134,8 @@ function randomReplace(input, emptyListPlaceholder = '') {
const randomIndex = Math.floor(rng() * list.length); const randomIndex = Math.floor(rng() * list.length);
//const randomIndex = Math.floor(Math.random() * list.length); //const randomIndex = Math.floor(Math.random() * list.length);
return list[randomIndex]; //trim() at the end to allow for empty random values
return list[randomIndex].trim();
}); });
} }