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

Fix flag assignment and script processing

Browse Source
This commit is contained in:
kwaroran
2024-01-15 14:13:53 +09:00
parent 3745adf9f7
commit f2e6cfb26d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
let outScript2 = script.out.replaceAll("$n", "\n") let outScript2 = script.out.replaceAll("$n", "\n")
let outScript = risuChatParser(outScript2.replace(dreg, "$&"), {chatID: chatID, db:db}) let outScript = risuChatParser(outScript2.replace(dreg, "$&"), {chatID: chatID, db:db})
let flag = script.ableFlag ? script.flag : 'g' let flag = (script.ableFlag ? script.flag : 'g') || ''
if(outScript.startsWith('@@move_top') || outScript.startsWith('@@move_bottom')){ if(outScript.startsWith('@@move_top') || outScript.startsWith('@@move_bottom')){
flag = flag.replace('g', '') //temperary fix flag = flag.replace('g', '') //temperary fix
} }
@@ -130,7 +130,7 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
console.log(matched) console.log(matched)
if(matched){ if(matched){
const inData = matched[0] const inData = matched[0]
let out = outScript.split(' ', 2)[1] let out = outScript.replace('@@move_top ', '').replace('@@move_bottom ', '')
.replace(/(?<!\$)\$[0-9]+/g, (v)=>{ .replace(/(?<!\$)\$[0-9]+/g, (v)=>{
const index = parseInt(v.substring(1)) const index = parseInt(v.substring(1))
if(index < matched.length){ if(index < matched.length){
@@ -146,11 +146,12 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
} }
return v return v
}) })
console.log(out)
if(outScript.startsWith('@@move_top')){ if(outScript.startsWith('@@move_top')){
data = out + data data = out + '\n' +data
} }
else{ else{
data = data + out data = data + '\n' + out
} }
} }
} }