diff --git a/src/lang/en.ts b/src/lang/en.ts index 0d1cc831..247607ca 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -55,6 +55,7 @@ export const languageEnglish = { + "- **Modify Input** modifys user's input" + "- **Modify Output** modifys character's output" + "- **Modify Request Data** modifys current chat data when sent.\n\nIN must be a regex without flags and *\\*.\n\nOUT is a normal string." + + "\n\n If OUT has {{data}} in string, it replaces to matched string." + "\n\n If OUT starts with **@@**, it doesn't replaces the string, but instead does a special effect if matching string founds." + "\n\n- @@emo (emotion name)\n\n if character is Emotion Images mode, sets (emotion name) as emotion and prevents default.", experimental: "This is a experimental setting. it might be unstable.", diff --git a/src/lang/ko.ts b/src/lang/ko.ts index 605cef70..fceca19f 100644 --- a/src/lang/ko.ts +++ b/src/lang/ko.ts @@ -184,6 +184,7 @@ export const languageKorean = { + "- **입력문 수정** 유저의 입력문을 수정합니다" + "- **출력문 수정** 캐릭터의 출력문을 수정합니다" + "- **리퀘스트 데이터 수정** 리퀘스트를 보낼 때 채팅 데이터를 수정합니다.\n\nIN은 flag와 *\\* 가 없는 Regex여야 합니다.\n\nOUT은 일반 문자열입니다." + + "\n\n 만약 OUT 문자열에 {{data}}가 있으면, 매칭된 문자열로 바뀝니다." + "\n\n 만약 OUT이 @@로 시작된다면, 특수한 효과를 냅니다" + "\n\n- @@emo (emotion name)\n\n 감정 이미지 모드일 시 (emotion name)을 감정으로 정하고 감정 처리를 하지 않습니다.", }, diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte index 469d216a..93aca49a 100644 --- a/src/lib/SideBars/CharConfig.svelte +++ b/src/lib/SideBars/CharConfig.svelte @@ -13,8 +13,8 @@ import { onDestroy } from "svelte"; import {isEqual, cloneDeep} from 'lodash' import Help from "../Others/Help.svelte"; - import RegexData from "./RegexData.svelte"; - import { exportChar } from "src/ts/characterCards"; + import RegexData from "./RegexData.svelte"; + import { exportChar } from "src/ts/characterCards"; let subMenu = 0 let subberMenu = 0 diff --git a/src/lib/SideBars/Settings.svelte b/src/lib/SideBars/Settings.svelte index e790c266..b5dea194 100644 --- a/src/lib/SideBars/Settings.svelte +++ b/src/lib/SideBars/Settings.svelte @@ -11,7 +11,7 @@ import Check from "../Others/Check.svelte"; import { getRequestLog, isTauri } from "../../ts/globalApi"; import { checkDriver } from "../../ts/drive/drive"; - import Help from "../Others/Help.svelte"; + import Help from "../Others/Help.svelte"; let subMenu = -1 let subSubMenu = 0 export let openPresetList =false diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts index 6581da8b..24f9c4b7 100644 --- a/src/ts/process/scripts.ts +++ b/src/ts/process/scripts.ts @@ -16,7 +16,8 @@ export function processScriptFull(char:character, data:string, mode:ScriptMode){ if(script.type === mode){ const reg = new RegExp(script.in,'g') data = data.replace(reg, (v) => { - if(script.out.startsWith('@@emo ')){ + const outScript = script.out.replace(dreg, v) + if(outScript.startsWith('@@emo ')){ if(char.viewScreen !== 'emotion'){ return v } @@ -44,7 +45,7 @@ export function processScriptFull(char:character, data:string, mode:ScriptMode){ } return v } - return script.out.replace(dreg, v) + return outScript }) } }