From 67fa9c9595d09aac72c1625cd3df8be31e6d079d Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Sat, 25 Nov 2023 20:11:47 +0200 Subject: [PATCH] Allow dice rolls in {{random}} --- public/script.js | 4 ++-- public/scripts/templates/macros.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/script.js b/public/script.js index 787b7e11f..731c6e70d 100644 --- a/public/script.js +++ b/public/script.js @@ -2055,8 +2055,8 @@ function substituteParams(content, _name1, _name2, _original, _group, _replaceCh const utcTime = moment().utc().utcOffset(utcOffset).format('LT'); return utcTime; }); - content = randomReplace(content); content = diceRollReplace(content); + content = randomReplace(content); content = bannedWordsReplace(content); return content; } @@ -8575,7 +8575,7 @@ jQuery(async function () { if (this_chid !== undefined || selected_group) { // Previously system messages we're allowed to be edited /*const message = $(this).closest(".mes"); - + if (message.data("isSystem")) { return; }*/ diff --git a/public/scripts/templates/macros.html b/public/scripts/templates/macros.html index fac3d145c..751607af8 100644 --- a/public/scripts/templates/macros.html +++ b/public/scripts/templates/macros.html @@ -27,8 +27,8 @@
  • {{time_UTC±#}} – the current time in the specified UTC time zone offset, e.g. UTC-4 or UTC+2
  • {{idle_duration}} – the time since the last user message was sent
  • {{bias "text here"}} – sets a behavioral bias for the AI until the next user input. Quotes around the text are important.
    • +
  • {{roll:(formula)}} – rolls a dice. (ex: {{roll:1d6}} will roll a 6-sided dice and return a number between 1 and 6)
  • {{random:(args)}} – returns a random item from the list. (ex: {{random:1,2,3,4}} will return 1 of the 4 numbers at random. Works with text lists too.
    • -
  • {{roll:(formula)}} – rolls a dice. (ex: {{roll:1d6}} will roll a 6- sided dice and return a number between 1 and 6)
  • {{banned "text here"}} – dynamically add text in the quotes to banned words sequences, if Text Generation WebUI backend used. Do nothing for others backends. Can be used anywhere (Character description, WI, AN, etc.) Quotes around the text are important.