mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] script loading

Browse Source
This commit is contained in:
kwaroran
2023-07-16 01:37:53 +09:00
parent a14e8655ae
commit 8a4aaadfd6
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ts/process/scripts.ts
View File

@@ -130,12 +130,13 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc
} }
} }
else{ else{
let mOut = outScript.replace(dreg, "$&")
function skr(da:string){
return da.replace(/{{(.+?)}}/g, (v, p1:string) => {
if(p1 === 'previous_char_chat'){
if(chatID !== -1){ if(chatID !== -1){
const selchar = db.characters[get(selectedCharID)] const selchar = db.characters[get(selectedCharID)]
const chat = selchar.chats[selchar.chatPage] const chat = selchar.chats[selchar.chatPage]
mOut = mOut.replace(/{{(.+?)}}/g, (v, p1:string) => {
if(p1 === 'previous_char_chat'){
let pointer = chatID - 1 let pointer = chatID - 1
while(pointer >= 0){ while(pointer >= 0){
if(chat.message[pointer].role === 'char'){ if(chat.message[pointer].role === 'char'){
@@ -145,7 +146,12 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc
} }
return selchar.firstMsgIndex === -1 ? selchar.firstMessage : selchar.alternateGreetings[selchar.firstMsgIndex] return selchar.firstMsgIndex === -1 ? selchar.firstMessage : selchar.alternateGreetings[selchar.firstMsgIndex]
} }
return
}
if(p1 === 'previous_user_chat'){ if(p1 === 'previous_user_chat'){
if(chatID !== -1){
const selchar = db.characters[get(selectedCharID)]
const chat = selchar.chats[selchar.chatPage]
let pointer = chatID - 1 let pointer = chatID - 1
while(pointer >= 0){ while(pointer >= 0){
if(chat.message[pointer].role === 'user'){ if(chat.message[pointer].role === 'user'){
@@ -155,6 +161,7 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc
} }
return selchar.firstMsgIndex === -1 ? selchar.firstMessage : selchar.alternateGreetings[selchar.firstMsgIndex] return selchar.firstMsgIndex === -1 ? selchar.firstMessage : selchar.alternateGreetings[selchar.firstMsgIndex]
} }
}
if(p1.startsWith('calc')){ if(p1.startsWith('calc')){
const v = p1.split("::")[1] const v = p1.split("::")[1]
return calcString(v).toString() return calcString(v).toString()
@@ -162,11 +169,12 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc
return v return v
}) })
} }
let mOut = skr(outScript.replace(dreg, "$&"))
if(randomness.test(data)){ if(randomness.test(data)){
const list = data.split('|||') const list = data.split('|||')
data = list[Math.floor(Math.random()*list.length)]; data = list[Math.floor(Math.random()*list.length)];
} }
data = data.replace(reg, mOut) data = skr(data.replace(reg, mOut))
} }
} }
} }