From ab4dbb6cacb1ddb94922151f9e8c8c9e8293980a Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 21 Jul 2023 01:15:11 +0900
Subject: [PATCH] [feat] themedesc for classic

---
 src/lang/en.ts                    | 1 +
 src/lib/Others/WelcomeRisu.svelte | 2 +-
 src/ts/process/scripts.ts         | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 93402978..c73ef11b 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -103,6 +103,7 @@ export const languageEnglish = {
         theme: "Select your theme",
         themeDescWifulike: "Not suitable for mobile",
         themeDescWifuCut: "Suitable for mobile",
+        themeDescClassic: "Suitable for All devices",
         texttheme: "Select your text color",
         inputName: "Lastly, Input your Nickname."
     },
diff --git a/src/lib/Others/WelcomeRisu.svelte b/src/lib/Others/WelcomeRisu.svelte
index 062a4ec2..18d3ef22 100644
--- a/src/lib/Others/WelcomeRisu.svelte
+++ b/src/lib/Others/WelcomeRisu.svelte
@@ -103,7 +103,7 @@
                 <button class="hover:text-green-500 transition-colors flex flex-col items-start" on:click={() => {
                     $DataBase.theme = ''
                     step += 1
-                }}><span>• Standard Risu</span>
+                }}><span>• Standard Risu ({language.setup.themeDescClassic})</span>
                 <img class="w-3/4 mt-2" src="/ss2.webp" alt="example"></button>
                 <button class="hover:text-green-500 transition-colors flex flex-col items-start" on:click={() => {
                     $DataBase.theme = 'waifu'
diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts
index bdd8b4bd..6c429b49 100644
--- a/src/ts/process/scripts.ts
+++ b/src/ts/process/scripts.ts
@@ -61,7 +61,9 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc
     for (const script of scripts){
         if(script.type === mode){
             const reg = new RegExp(script.in, script.ableFlag ? script.flag : 'g')
-            let outScript = script.out.replaceAll("$n", "\n")
+            let outScript2 = script.out.replaceAll("$n", "\n")
+            let outScript = risuChatParser(outScript2.replace(dreg, "$&"), {chatID: chatID, db:db})
+
             if(outScript.startsWith('@@')){
                 if(reg.test(data)){
                     if(outScript.startsWith('@@emo ')){
@@ -131,12 +133,11 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc
                 }
             }
             else{
-                let mOut = risuChatParser(outScript.replace(dreg, "$&"), {chatID: chatID, db:db})
                 if(randomness.test(data)){
                     const list = data.split('|||')
                     data = list[Math.floor(Math.random()*list.length)];
                 }
-                data = risuChatParser(data.replace(reg, mOut), {chatID: chatID, db:db})
+                data = risuChatParser(data.replace(reg, outScript), {chatID: chatID, db:db})
             }
         }
     }