From 6caf5bd904a83ae030eaf7dc682810695fea7f72 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Mon, 25 Mar 2024 03:06:38 +0900
Subject: [PATCH] update scriptstate variable access

---
 pnpm-lock.yaml   | 7 +++++++
 src/ts/parser.ts | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 042d807f..b78b2226 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,6 +53,9 @@ dependencies:
   buffer:
     specifier: ^6.0.3
     version: 6.0.3
+  codemirror:
+    specifier: ^5.65.16
+    version: 5.65.16
   core-js:
     specifier: ^3.35.0
     version: 3.35.0
@@ -2214,6 +2217,10 @@ packages:
       estree-walker: 3.0.3
       periscopic: 3.1.0
 
+  /codemirror@5.65.16:
+    resolution: {integrity: sha512-br21LjYmSlVL0vFCPWPfhzUCT34FM/pAdK7rRIZwa0rrtrIdotvP4Oh4GUHsu2E3IrQMCfRkL/fN3ytMNxVQvg==}
+    dev: false
+
   /color-convert@1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
diff --git a/src/ts/parser.ts b/src/ts/parser.ts
index 39345a91..e9086a2f 100644
--- a/src/ts/parser.ts
+++ b/src/ts/parser.ts
@@ -652,7 +652,7 @@ const matcher = (p1:string,matcherArg:matcherArg) => {
                 const selectedChar = get(selectedCharID)
                 const char = db.characters[selectedChar]
                 const chat = char.chats[char.chatPage]
-                return (chat.scriptstate ?? {})[v] ?? 'null'
+                return (chat.scriptstate ?? {})['$' + v] ?? 'null'
             }
             case 'calc':{
                 return calcString(v).toString()
@@ -669,10 +669,10 @@ const matcher = (p1:string,matcherArg:matcherArg) => {
                     const chat = char.chats[char.chatPage]
                     chat.scriptstate = chat.scriptstate ?? {}
                     if(arra[0] === 'addvar'){
-                        chat.scriptstate[v] = Number(chat.scriptstate[v]) + Number(arra[2])
+                        chat.scriptstate['$' + v] = Number(chat.scriptstate['$' + v]) + Number(arra[2])
                     }
                     else{
-                        chat.scriptstate[v] = arra[2]
+                        chat.scriptstate['$' + v] = arra[2]
                     }
 
                     char.chats[char.chatPage] = chat