From 1f69bff9ba961bd5bd38cfb37501881b6810dbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=81=AB=E5=B1=B1?= <939048569@qq.com>
Date: Sat, 10 May 2025 00:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E5=B1=82=E5=B2=A9=E5=B7=A8?=
 =?UTF-8?q?=E6=B8=8A=E7=9A=84=E6=B0=B4=E6=99=B6=E7=9F=BF=E7=82=B9=20(#752)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../诺艾尔/01-地下水泽-南-6.json              | 299 ++++++++++--------
 ...地下水泽-东(有战斗)-7.json => 02-地下水泽-东-7.json} | 136 ++++----
 .../诺艾尔/03-地下水泽-西南(有战斗)-5.json    | 140 ++++----
 .../层岩巨渊-水晶矿/诺艾尔/04-巨蛇岩洞-9.json | 157 ++++-----
 .../诺艾尔/05-巨渊主矿区-6.json               |  94 +++---
 .../诺艾尔/07-巨渊主矿区-东-6.json            | 159 ----------
 ...巨渊主矿区-西北-3.json => 07-巨渊主矿区-西北-3.json} |  94 +++---
 ...{09-临时主矿道-东-2.json => 08-临时主矿道-东-2.json} |  24 +-
 ...东北(有战斗)-3.json => 09-临时主矿道-东北(有战斗)-3.json} |   0
 .../诺艾尔/10-临时主矿道-南-2.json            | 194 ++++++++++++
 .../诺艾尔/11-临时主矿道-南-2.json            |  67 ----
 ...2-临时主矿道-南2-4.json => 11-临时主矿道-南2-4.json} |   0
 ...�主矿道-西(有战斗)-2.json => 12-临时主矿道-西)-2.json} |  77 +++--
 ...��-南2(有战斗)-2.json => 13-崎岖石厅-南2(有战斗)-2.json} |   0
 .../{15-崎岖石厅-南-2.json => 14-崎岖石厅-南-2.json} |  30 +-
 .../{16-崎岖石厅-南3-2.json => 15-崎岖石厅-南3-2.json} |   0
 .../{17-无名遗迹-北-4.json => 16-无名遗迹-北-4.json} |  16 +-
 ...无名遗迹-南-3.json => 17-无名遗迹-南(有战斗)-3.json} | 102 +++---
 .../{19-荧光狭道-9.json => 18-荧光狭道-9.json} | 121 ++++---
 .../{20-荧光狭道-西-4.json => 19-荧光狭道-西-4.json} |  32 +-
 ...��选)东2-3.json => 20-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json} |  87 ++++-
 21 files changed, 1020 insertions(+), 809 deletions(-)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{02-地下水泽-东(有战斗)-7.json => 02-地下水泽-东-7.json} (74%)
 delete mode 100644 repo/pathing/层岩巨渊-水晶矿/诺艾尔/07-巨渊主矿区-东-6.json
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{08-巨渊主矿区-西北-3.json => 07-巨渊主矿区-西北-3.json} (66%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{09-临时主矿道-东-2.json => 08-临时主矿道-东-2.json} (82%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{10-临时主矿道-东北(有战斗)-3.json => 09-临时主矿道-东北(有战斗)-3.json} (100%)
 create mode 100644 repo/pathing/层岩巨渊-水晶矿/诺艾尔/10-临时主矿道-南-2.json
 delete mode 100644 repo/pathing/层岩巨渊-水晶矿/诺艾尔/11-临时主矿道-南-2.json
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{12-临时主矿道-南2-4.json => 11-临时主矿道-南2-4.json} (100%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{13-临时主矿道-西(有战斗)-2.json => 12-临时主矿道-西)-2.json} (75%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{14-崎岖石厅-南2(有战斗)-2.json => 13-崎岖石厅-南2(有战斗)-2.json} (100%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{15-崎岖石厅-南-2.json => 14-崎岖石厅-南-2.json} (80%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{16-崎岖石厅-南3-2.json => 15-崎岖石厅-南3-2.json} (100%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{17-无名遗迹-北-4.json => 16-无名遗迹-北-4.json} (89%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{18-无名遗迹-南-3.json => 17-无名遗迹-南(有战斗)-3.json} (77%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{19-荧光狭道-9.json => 18-荧光狭道-9.json} (74%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{20-荧光狭道-西-4.json => 19-荧光狭道-西-4.json} (90%)
 rename repo/pathing/层岩巨渊-水晶矿/诺艾尔/{21-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json => 20-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json} (59%)

diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/01-地下水泽-南-6.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/01-地下水泽-南-6.json
index 9ed0c7ca..ffdcacb0 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/01-地下水泽-南-6.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/01-地下水泽-南-6.json
@@ -11,201 +11,240 @@
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 551.081787109375,
       "y": 950.883056640625,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 570.292236328125,
       "y": 930.6453857421875,
-      "type": "path",
-      "move_mode": "fly",
       "action": "stop_flying",
-      "action_params": "3000"
+      "move_mode": "fly",
+      "action_params": "3000",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 565.2506103515625,
       "y": 915.0145263671875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 558.716796875,
       "y": 890.945556640625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 558.5594482421875,
       "y": 870.1630859375,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 6,
       "x": 583.123291015625,
       "y": 851.1376953125,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 7,
-      "x": 586.36474609375,
-      "y": 803.1129150390625,
+      "x": 585.5401611328125,
+      "y": 849.5316162109375,
       "type": "path",
-      "move_mode": "dash",
+      "move_mode": "walk",
       "action": "",
       "action_params": ""
     },
     {
       "id": 8,
-      "x": 599.14404296875,
-      "y": 774.7320556640625,
-      "type": "path",
-      "move_mode": "dash",
+      "x": 586.36474609375,
+      "y": 803.1129150390625,
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 9,
-      "x": 624,
-      "y": 750.75,
-      "type": "path",
-      "move_mode": "dash",
+      "x": 599.14404296875,
+      "y": 774.7320556640625,
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
-      "x": 613.25,
-      "y": 736.75,
-      "type": "path",
-      "move_mode": "run",
+      "x": 624,
+      "y": 750.75,
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 11,
+      "x": 613.25,
+      "y": 736.75,
+      "action": "",
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 12,
       "x": 597.81982421875,
       "y": 726.1796875,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 13,
+      "x": 593.878173828125,
+      "y": 725.7977294921875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 14,
+      "x": 593.75,
+      "y": 723.5,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 15,
+      "x": 589.906494140625,
+      "y": 722.939697265625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 16,
+      "x": 590.166259765625,
+      "y": 719.1737060546875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 17,
+      "x": 587.3043212890625,
+      "y": 718.840576171875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 18,
+      "x": 586.18701171875,
+      "y": 716.7081298828125,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 19,
+      "x": 591.069580078125,
+      "y": 711.51513671875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 20,
+      "x": 600.5076904296875,
+      "y": 713.2886962890625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 21,
+      "x": 604.461181640625,
+      "y": 712.9984130859375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 22,
+      "x": 602.958251953125,
+      "y": 716.0755615234375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path"
+    },
+    {
+      "id": 23,
+      "x": 603.27685546875,
+      "y": 715.966064453125,
       "type": "path",
       "move_mode": "walk",
       "action": "",
       "action_params": ""
     },
     {
-      "id": 12,
-      "x": 593.878173828125,
-      "y": 725.7977294921875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 13,
-      "x": 593.494140625,
-      "y": 723.56005859375,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 s(0.3),attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 14,
-      "x": 589.906494140625,
-      "y": 722.939697265625,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 15,
-      "x": 590.166259765625,
-      "y": 719.1737060546875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 16,
-      "x": 587.3043212890625,
-      "y": 718.840576171875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 17,
-      "x": 586.18701171875,
-      "y": 716.7081298828125,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 18,
-      "x": 591.069580078125,
-      "y": 711.51513671875,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 19,
-      "x": 600.5076904296875,
-      "y": 713.2886962890625,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 20,
-      "x": 604.461181640625,
-      "y": 712.9984130859375,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 21,
-      "x": 602.958251953125,
-      "y": 716.0755615234375,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 22,
+      "id": 24,
       "x": 603.670166015625,
       "y": 713.773193359375,
-      "type": "path",
+      "action": "",
       "move_mode": "walk",
+      "action_params": "",
+      "type": "path",
+      "locked": false
+    },
+    {
+      "id": 25,
+      "x": 603.670166015625,
+      "y": 713.773193359375,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "path",
+      "locked": false
+    },
+    {
+      "id": 26,
+      "x": 603.670166015625,
+      "y": 713.773193359375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1)",
+      "type": "path",
+      "locked": false
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/02-地下水泽-东(有战斗)-7.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/02-地下水泽-东-7.json
similarity index 74%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/02-地下水泽-东(有战斗)-7.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/02-地下水泽-东-7.json
index d0c4bf4c..99a3bc3e 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/02-地下水泽-东(有战斗)-7.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/02-地下水泽-东-7.json
@@ -11,183 +11,193 @@
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 278.46435546875,
       "y": 767.306640625,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 329.8353271484375,
       "y": 764.86962890625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 366.2186279296875,
       "y": 718.373779296875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 389.783935546875,
       "y": 720.2431640625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 429.708251953125,
       "y": 745.4071044921875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 6,
       "x": 444.2547607421875,
       "y": 759.0467529296875,
-      "type": "path",
-      "move_mode": "fly",
       "action": "combat_script",
-      "action_params": "keypress(VK_SPACE),wait(2),keypress(VK_SPACE)"
+      "move_mode": "fly",
+      "action_params": "keypress(VK_SPACE),wait(2),keypress(VK_SPACE)",
+      "type": "path"
     },
     {
       "id": 7,
       "x": 426.8262939453125,
       "y": 750.2633056640625,
-      "type": "path",
-      "move_mode": "fly",
       "action": "stop_flying",
-      "action_params": "500"
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 8,
       "x": 408.4971923828125,
       "y": 734.116455078125,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 9,
       "x": 380.59912109375,
       "y": 702.277587890625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "fight",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
       "x": 360.255859375,
       "y": 693.1456298828125,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 11,
       "x": 363.8828125,
       "y": 693.031005859375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 12,
       "x": 379.1131591796875,
       "y": 699.195556640625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 13,
       "x": 420.1041259765625,
       "y": 747.4132080078125,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 14,
-      "x": 447.41259765625,
-      "y": 740.2340087890625,
-      "type": "path",
-      "move_mode": "walk",
+      "x": 447.46875,
+      "y": 740.84375,
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 15,
       "x": 488.2861328125,
       "y": 761.8082275390625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "fight",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 16,
       "x": 502.8555908203125,
       "y": 764.5521240234375,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 17,
       "x": 503.5628662109375,
       "y": 780.099609375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 18,
       "x": 507.451171875,
       "y": 781.3502197265625,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 19,
       "x": 508.2421875,
       "y": 784.16162109375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 20,
       "x": 507.025390625,
       "y": 786.919677734375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 21,
+      "x": 507.025390625,
+      "y": 786.919677734375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/03-地下水泽-西南(有战斗)-5.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/03-地下水泽-西南(有战斗)-5.json
index a695a86a..b397888a 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/03-地下水泽-西南(有战斗)-5.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/03-地下水泽-西南(有战斗)-5.json
@@ -11,168 +11,186 @@
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 663.7847900390625,
       "y": 710.3050537109375,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 678.9921810699589,
       "y": 668.75,
-      "type": "path",
-      "move_mode": "fly",
       "action": "",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 681.93310546875,
       "y": 666.352783203125,
-      "type": "path",
-      "move_mode": "climb",
       "action": "",
-      "action_params": ""
+      "move_mode": "climb",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 668.2269287109375,
       "y": 638.1168212890625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 669.7730712890625,
       "y": 624.418701171875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 6,
       "x": 665.6649169921875,
       "y": 615.3763427734375,
-      "type": "path",
-      "move_mode": "dash",
       "action": "fight",
+      "move_mode": "dash",
       "action_params": "",
-      "locked": false
+      "type": "path"
     },
     {
       "id": 7,
       "x": 666.4992283950617,
       "y": 614.75,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
+      "move_mode": "walk",
       "action_params": "",
-      "locked": false
+      "type": "path"
     },
     {
       "id": 8,
       "x": 665.6649169921875,
       "y": 615.3763427734375,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
+      "move_mode": "walk",
       "action_params": "",
-      "locked": false
+      "type": "path"
     },
     {
       "id": 9,
       "x": 656.4813232421875,
       "y": 602.655517578125,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 10,
       "x": 658.7716064453125,
       "y": 598.6805419921875,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 11,
       "x": 663.7584228515625,
       "y": 600.968994140625,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 12,
       "x": 659.966796875,
       "y": 609.928955078125,
-      "type": "path",
-      "move_mode": "run",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 13,
       "x": 676.5927734375,
       "y": 622.3553466796875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 14,
-      "x": 687.3607177734375,
-      "y": 611.9718017578125,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 688.53125,
+      "y": 612.5625,
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "target"
     },
     {
       "id": 15,
       "x": 727.9757080078125,
       "y": 588.515380859375,
-      "type": "path",
-      "move_mode": "fly",
       "action": "",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path",
+      "locked": false
     },
     {
       "id": 16,
       "x": 718.52001953125,
       "y": 557.6982421875,
-      "type": "path",
-      "move_mode": "swim",
       "action": "",
-      "action_params": ""
+      "move_mode": "swim",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 17,
-      "x": 737.769287109375,
-      "y": 509.43017578125,
-      "type": "target",
+      "x": 739.78125,
+      "y": 518.78125,
+      "action": "",
       "move_mode": "fly",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "action_params": "",
+      "type": "target"
     },
     {
       "id": 18,
-      "x": 738.0057373046875,
-      "y": 501.6171875,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 737.78125,
+      "y": 509.65625,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "dash",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 19,
+      "x": 737.65625,
+      "y": 502.375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 20,
+      "x": 737.65625,
+      "y": 502.375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/04-巨蛇岩洞-9.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/04-巨蛇岩洞-9.json
index b86a72af..9738afda 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/04-巨蛇岩洞-9.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/04-巨蛇岩洞-9.json
@@ -11,165 +11,174 @@
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 887.6220703125,
       "y": 762.6287841796875,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 971.0828857421875,
       "y": 703.1646728515625,
-      "type": "path",
-      "move_mode": "fly",
       "action": "",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 1041.13818359375,
       "y": 699.906005859375,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 1045.46826171875,
       "y": 698.0748291015625,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 5,
       "x": 1047.280029296875,
       "y": 702.00390625,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 6,
       "x": 1056.7867431640625,
       "y": 699.55419921875,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "jump",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 7,
       "x": 1055.20849609375,
       "y": 696.7991943359375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 8,
       "x": 887.6368408203125,
       "y": 762.6640625,
-      "type": "teleport",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 9,
       "x": 959.60107421875,
       "y": 779.506591796875,
-      "type": "path",
-      "move_mode": "fly",
       "action": "",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
-      "x": 1015.4764404296875,
-      "y": 783.7435302734375,
-      "type": "target",
+      "x": 988.1875,
+      "y": 782.125,
+      "type": "path",
       "move_mode": "fly",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "action": "stop_flying",
+      "action_params": ""
     },
     {
       "id": 11,
-      "x": 1018.770751953125,
-      "y": 783.69580078125,
-      "type": "path",
-      "move_mode": "dash",
+      "x": 1015.4764404296875,
+      "y": 783.7435302734375,
       "action": "combat_script",
-      "action_params": "s(0.2),dash"
+      "move_mode": "dash",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 12,
-      "x": 1014.8978271484375,
-      "y": 784.80908203125,
+      "x": 1021.6258544921875,
+      "y": 783.7047119140625,
       "type": "path",
       "move_mode": "dash",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 13,
-      "x": 1021.38232421875,
-      "y": 787.3436279296875,
-      "type": "path",
-      "move_mode": "walk",
       "action": "combat_script",
       "action_params": "s(0.2),dash"
     },
     {
-      "id": 14,
-      "x": 1016.083740234375,
-      "y": 784.2821044921875,
-      "type": "path",
-      "move_mode": "dash",
+      "id": 13,
+      "x": 1014.8978271484375,
+      "y": 784.80908203125,
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 14,
+      "x": 1023.21875,
+      "y": 787.96875,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "s(0.2),dash,wait(0.2),dash"
     },
     {
       "id": 15,
-      "x": 1029.8841552734375,
-      "y": 783.927734375,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "x": 1016.083740234375,
+      "y": 784.2821044921875,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 16,
-      "x": 1025.6905517578125,
-      "y": 786.046142578125,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 1029.34375,
+      "y": 784.0625,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 17,
-      "x": 1022.3040771484375,
-      "y": 790.5615234375,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 1025.6905517578125,
+      "y": 786.046142578125,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 18,
+      "x": 1022.3040771484375,
+      "y": 790.5615234375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
+    },
+    {
+      "id": 19,
       "x": 1017.218994140625,
       "y": 787.588623046875,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/05-巨渊主矿区-6.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/05-巨渊主矿区-6.json
index 22ec2333..e64a0481 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/05-巨渊主矿区-6.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/05-巨渊主矿区-6.json
@@ -11,129 +11,129 @@
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 338.72509765625,
       "y": 975.0701904296875,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 324.5543212890625,
       "y": 954.128662109375,
-      "type": "path",
-      "move_mode": "fly",
       "action": "",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 337.5150146484375,
       "y": 947.956787109375,
-      "type": "path",
-      "move_mode": "fly",
       "action": "",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 337.2462158203125,
       "y": 929.751708984375,
-      "type": "path",
-      "move_mode": "fly",
       "action": "stop_flying",
-      "action_params": "2000"
+      "move_mode": "fly",
+      "action_params": "2000",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 338.5504150390625,
       "y": 926.00146484375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 6,
       "x": 329.30029296875,
       "y": 921.351806640625,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 7,
       "x": 327.179931640625,
       "y": 933.8004150390625,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 8,
-      "x": 336.5184326171875,
-      "y": 930.4193115234375,
-      "type": "path",
-      "move_mode": "dash",
+      "x": 337.1875,
+      "y": 930.1875,
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 9,
       "x": 327.9866943359375,
       "y": 852.5421142578125,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
       "x": 286.587646484375,
       "y": 873.9178466796875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 11,
       "x": 286.5517578125,
       "y": 883.8646240234375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 12,
       "x": 277.2459716796875,
       "y": 891.7413330078125,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 13,
       "x": 276.013427734375,
       "y": 896.428466796875,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 14,
-      "x": 277.7127685546875,
-      "y": 892.5078125,
-      "type": "path",
-      "move_mode": "walk",
+      "x": 278.0625,
+      "y": 891.8125,
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/07-巨渊主矿区-东-6.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/07-巨渊主矿区-东-6.json
deleted file mode 100644
index ca24ebb7..00000000
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/07-巨渊主矿区-东-6.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  "info": {
-    "name": "巨渊主矿区-东-6",
-    "type": "collect",
-    "author": "火山",
-    "version": "1.0",
-    "description": "",
-    "map_name": "TheChasm",
-    "bgi_version": "0.45.0"
-  },
-  "positions": [
-    {
-      "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
-      "x": 278.4849853515625,
-      "y": 767.3035888671875,
-      "action_params": ""
-    },
-    {
-      "id": 2,
-      "x": 274.5660400390625,
-      "y": 768.6920166015625,
-      "type": "path",
-      "move_mode": "walk",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 3,
-      "x": 183.49951171875,
-      "y": 794.9732666015625,
-      "type": "path",
-      "move_mode": "fly",
-      "action": "stop_flying",
-      "action_params": "500"
-    },
-    {
-      "id": 4,
-      "x": 178.3387451171875,
-      "y": 799.81787109375,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 5,
-      "x": 177.6036376953125,
-      "y": 793.8570556640625,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
-      "locked": false
-    },
-    {
-      "id": 6,
-      "x": 178.62582304526745,
-      "y": 793,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
-      "locked": false
-    },
-    {
-      "id": 7,
-      "x": 278.4403076171875,
-      "y": 767.2628173828125,
-      "type": "teleport",
-      "move_mode": "walk",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 8,
-      "x": 263.1380615234375,
-      "y": 779.5130615234375,
-      "type": "path",
-      "move_mode": "fly",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 9,
-      "x": 183.8238525390625,
-      "y": 877.76611328125,
-      "type": "path",
-      "move_mode": "fly",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 10,
-      "x": 184.7474365234375,
-      "y": 887.651123046875,
-      "type": "path",
-      "move_mode": "fly",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 11,
-      "x": 166.724853515625,
-      "y": 908.8131103515625,
-      "type": "path",
-      "move_mode": "dash",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 12,
-      "x": 162.267578125,
-      "y": 909.800048828125,
-      "type": "path",
-      "move_mode": "jump",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 13,
-      "x": 162.60546875,
-      "y": 917.4652099609375,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 14,
-      "x": 161.266845703125,
-      "y": 915.4884033203125,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    },
-    {
-      "id": 15,
-      "x": 157.97705078125,
-      "y": 911.529541015625,
-      "type": "path",
-      "move_mode": "dash",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 16,
-      "x": 155.447021484375,
-      "y": 918.379638671875,
-      "type": "target",
-      "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/08-巨渊主矿区-西北-3.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/07-巨渊主矿区-西北-3.json
similarity index 66%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/08-巨渊主矿区-西北-3.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/07-巨渊主矿区-西北-3.json
index 79426fed..69a196e9 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/08-巨渊主矿区-西北-3.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/07-巨渊主矿区-西北-3.json
@@ -11,102 +11,112 @@
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 338.7540283203125,
       "y": 975.020263671875,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 341.7359619140625,
       "y": 982.7069091796875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 357.6270751953125,
       "y": 984.592041015625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 379.9227294921875,
       "y": 1007.063232421875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 373.9776611328125,
       "y": 1010.2679443359375,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 6,
       "x": 375.944580078125,
       "y": 1015.533935546875,
-      "type": "path",
-      "move_mode": "fly",
       "action": "",
-      "action_params": ""
+      "move_mode": "fly",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 7,
-      "x": 374.9786376953125,
-      "y": 1014.2183837890625,
-      "type": "path",
-      "move_mode": "fly",
+      "x": 374.5,
+      "y": 1013.71875,
       "action": "stop_flying",
-      "action_params": "1500"
+      "move_mode": "fly",
+      "action_params": "1500",
+      "type": "path"
     },
     {
       "id": 8,
       "x": 371.536376953125,
       "y": 1022.184814453125,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 9,
-      "x": 370.0201416015625,
-      "y": 1028.6331787109375,
-      "type": "path",
-      "move_mode": "walk",
+      "x": 369.84375,
+      "y": 1029.28125,
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
-      "x": 372.8668212890625,
-      "y": 1029.2774658203125,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 372.9375,
+      "y": 1029.34375,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 11,
-      "x": 374.885986328125,
-      "y": 1025.626220703125,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 374.8125,
+      "y": 1025.65625,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 12,
+      "x": 374.8125,
+      "y": 1025.65625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/09-临时主矿道-东-2.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/08-临时主矿道-东-2.json
similarity index 82%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/09-临时主矿道-东-2.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/08-临时主矿道-东-2.json
index f24843c1..c83d45d0 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/09-临时主矿道-东-2.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/08-临时主矿道-东-2.json
@@ -56,8 +56,8 @@
     },
     {
       "id": 6,
-      "x": 466.6234130859375,
-      "y": 1004.4256591796875,
+      "x": 466.4375,
+      "y": 1004.78125,
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
@@ -65,12 +65,22 @@
     },
     {
       "id": 7,
-      "x": 470.124755859375,
-      "y": 1007.201416015625,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 470.03125,
+      "y": 1007.1875,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 8,
+      "x": 470.03125,
+      "y": 1007.1875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/10-临时主矿道-东北(有战斗)-3.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/09-临时主矿道-东北(有战斗)-3.json
similarity index 100%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/10-临时主矿道-东北(有战斗)-3.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/09-临时主矿道-东北(有战斗)-3.json
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/10-临时主矿道-南-2.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/10-临时主矿道-南-2.json
new file mode 100644
index 00000000..26d8b0b1
--- /dev/null
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/10-临时主矿道-南-2.json
@@ -0,0 +1,194 @@
+{
+  "info": {
+    "name": "临时主矿道-南2-4",
+    "type": "collect",
+    "author": "火山",
+    "version": "1.0",
+    "description": "",
+    "map_name": "TheChasm",
+    "bgi_version": "0.45.0"
+  },
+  "positions": [
+    {
+      "id": 1,
+      "x": 551.0963134765625,
+      "y": 950.8411865234375,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
+    },
+    {
+      "id": 2,
+      "x": 542.567138671875,
+      "y": 955.135986328125,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 3,
+      "x": 534.7332763671875,
+      "y": 973.47998046875,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 4,
+      "x": 523.7494001356215,
+      "y": 970.5,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 5,
+      "x": 539.7022705078125,
+      "y": 935.744873046875,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 6,
+      "x": 542.0313720703125,
+      "y": 935.0921630859375,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 7,
+      "x": 547.143798828125,
+      "y": 925.8857421875,
+      "action": "",
+      "move_mode": "jump",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 8,
+      "x": 554.9193115234375,
+      "y": 921.1156005859375,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 9,
+      "x": 637.75,
+      "y": 926.625,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 10,
+      "x": 655.3125,
+      "y": 926.875,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 11,
+      "x": 653.926025390625,
+      "y": 920.21630859375,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 12,
+      "x": 687.624755859375,
+      "y": 899.958251953125,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 13,
+      "x": 708.7144775390625,
+      "y": 891.8040771484375,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 14,
+      "x": 716.549560546875,
+      "y": 885.34130859375,
+      "action": "",
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
+    },
+    {
+      "id": 15,
+      "x": 726.919189453125,
+      "y": 863.5360107421875,
+      "action": "stop_flying",
+      "move_mode": "fly",
+      "action_params": "1000",
+      "type": "path"
+    },
+    {
+      "id": 16,
+      "x": 736.7713623046875,
+      "y": 857.0379638671875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
+    },
+    {
+      "id": 17,
+      "x": 745.3641357421875,
+      "y": 860.71728515625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
+    },
+    {
+      "id": 18,
+      "x": 737.1695556640625,
+      "y": 864.150146484375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
+    },
+    {
+      "id": 19,
+      "x": 738.3194580078125,
+      "y": 858.676513671875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 20,
+      "x": 738.3194580078125,
+      "y": 858.676513671875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(1)",
+      "type": "target"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/11-临时主矿道-南-2.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/11-临时主矿道-南-2.json
deleted file mode 100644
index c8b70a29..00000000
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/11-临时主矿道-南-2.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "info": {
-    "name": "临时主矿道-南",
-    "type": "collect",
-    "author": "火山",
-    "version": "1.0",
-    "description": "",
-    "map_name": "TheChasm",
-    "bgi_version": "0.45.0"
-  },
-  "positions": [
-    {
-      "id": 1,
-      "x": 663.8173828125,
-      "y": 1058.861572265625,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "teleport"
-    },
-    {
-      "id": 2,
-      "x": 662.4761962890625,
-      "y": 1053.673583984375,
-      "action": "",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 3,
-      "x": 671.03125,
-      "y": 979.40625,
-      "action": "stop_flying",
-      "move_mode": "fly",
-      "action_params": "2500",
-      "type": "path"
-    },
-    {
-      "id": 4,
-      "x": 667.83984375,
-      "y": 985.0836181640625,
-      "action": "combat_script",
-      "move_mode": "dash",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
-      "type": "target"
-    },
-    {
-      "id": 5,
-      "x": 677.830810546875,
-      "y": 959.0125732421875,
-      "action": "",
-      "move_mode": "dash",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 6,
-      "x": 664.841064453125,
-      "y": 954.9117431640625,
-      "action": "combat_script",
-      "move_mode": "walk",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
-      "type": "target"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/12-临时主矿道-南2-4.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/11-临时主矿道-南2-4.json
similarity index 100%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/12-临时主矿道-南2-4.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/11-临时主矿道-南2-4.json
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/13-临时主矿道-西(有战斗)-2.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/12-临时主矿道-西)-2.json
similarity index 75%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/13-临时主矿道-西(有战斗)-2.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/12-临时主矿道-西)-2.json
index c91e9ccf..aada77c2 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/13-临时主矿道-西(有战斗)-2.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/12-临时主矿道-西)-2.json
@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "临时主矿道-西(有战斗)-2",
+    "name": "临时主矿道-西-2",
     "type": "collect",
     "author": "火山",
     "version": "1.0",
@@ -11,103 +11,102 @@
   "positions": [
     {
       "id": 1,
-      "action": "",
-      "move_mode": "walk",
-      "type": "teleport",
       "x": 895.555908203125,
       "y": 1020.9307861328125,
-      "action_params": ""
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "teleport"
     },
     {
       "id": 2,
       "x": 906.0738525390625,
       "y": 1018.5352783203125,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 3,
       "x": 939.649658203125,
       "y": 1002.847412109375,
-      "type": "path",
-      "move_mode": "fly",
       "action": "stop_flying",
-      "action_params": "2000"
+      "move_mode": "fly",
+      "action_params": "2000",
+      "type": "path"
     },
     {
       "id": 4,
       "x": 951.9869384765625,
       "y": 1016.8321533203125,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 5,
       "x": 956.89013671875,
       "y": 1030.463623046875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 6,
       "x": 948.4720458984375,
       "y": 1052.234130859375,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 7,
-      "x": 930.565185546875,
-      "y": 1056.95458984375,
-      "type": "path",
+      "x": 941.4669189453125,
+      "y": 1056.030517578125,
+      "action": "",
       "move_mode": "dash",
-      "action": "fight",
       "action_params": "",
-      "locked": false
+      "type": "path"
     },
     {
       "id": 8,
-      "x": 941.4669189453125,
-      "y": 1056.030517578125,
-      "type": "path",
-      "move_mode": "dash",
+      "x": 930.565185546875,
+      "y": 1056.95458984375,
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 9,
       "x": 930.565185546875,
       "y": 1056.95458984375,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
       "x": 926.7509765625,
       "y": 1063.4080810546875,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 11,
       "x": 922.6490478515625,
       "y": 1066.882080078125,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/14-崎岖石厅-南2(有战斗)-2.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/13-崎岖石厅-南2(有战斗)-2.json
similarity index 100%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/14-崎岖石厅-南2(有战斗)-2.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/13-崎岖石厅-南2(有战斗)-2.json
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/15-崎岖石厅-南-2.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/14-崎岖石厅-南-2.json
similarity index 80%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/15-崎岖石厅-南-2.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/14-崎岖石厅-南-2.json
index 5beb23a6..a0fd93f0 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/15-崎岖石厅-南-2.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/14-崎岖石厅-南-2.json
@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "崎岖石厅-南-",
+    "name": "崎岖石厅-南-2",
     "type": "collect",
     "author": "火山",
     "version": "1.0",
@@ -40,10 +40,10 @@
       "id": 4,
       "x": 360.3709716796875,
       "y": 193.9537353515625,
-      "type": "path",
-      "move_mode": "fly",
       "action": "stop_flying",
-      "action_params": "2000"
+      "move_mode": "fly",
+      "action_params": "2000",
+      "type": "path"
     },
     {
       "id": 5,
@@ -58,19 +58,29 @@
       "id": 6,
       "x": 349.578369140625,
       "y": 187.8953857421875,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 7,
       "x": 350.27294921875,
       "y": 184.93603515625,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 8,
+      "x": 350.27294921875,
+      "y": 184.93603515625,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(2)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/16-崎岖石厅-南3-2.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/15-崎岖石厅-南3-2.json
similarity index 100%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/16-崎岖石厅-南3-2.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/15-崎岖石厅-南3-2.json
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/17-无名遗迹-北-4.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/16-无名遗迹-北-4.json
similarity index 89%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/17-无名遗迹-北-4.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/16-无名遗迹-北-4.json
index 267ccbf8..b28e4881 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/17-无名遗迹-北-4.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/16-无名遗迹-北-4.json
@@ -31,10 +31,10 @@
       "id": 3,
       "x": 509.3673095703125,
       "y": 532.3369140625,
-      "type": "path",
-      "move_mode": "fly",
       "action": "combat_script",
-      "action_params": "wait(1),keypress(VK_SPACE),wait(2.5),keypress(VK_SPACE)"
+      "move_mode": "fly",
+      "action_params": "wait(1),keypress(VK_SPACE),wait(2.5),keypress(VK_SPACE)",
+      "type": "path"
     },
     {
       "id": 4,
@@ -88,6 +88,16 @@
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 10,
+      "x": 518.5322265625,
+      "y": 562.776123046875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(2)",
       "type": "target"
     }
   ]
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/18-无名遗迹-南-3.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/17-无名遗迹-南(有战斗)-3.json
similarity index 77%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/18-无名遗迹-南-3.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/17-无名遗迹-南(有战斗)-3.json
index 79394570..47571620 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/18-无名遗迹-南-3.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/17-无名遗迹-南(有战斗)-3.json
@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "无名遗迹-南-3",
+    "name": "无名遗迹-南(有战斗)-3",
     "type": "collect",
     "author": "火山",
     "version": "1.0",
@@ -67,82 +67,100 @@
       "id": 7,
       "x": 583.190673828125,
       "y": 356.52685546875,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "run",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 8,
-      "x": 653.6697998046875,
-      "y": 391.1484375,
-      "type": "path",
+      "x": 644.25634765625,
+      "y": 381.5135498046875,
+      "action": "fight",
       "move_mode": "dash",
-      "action": "",
-      "action_params": ""
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 9,
-      "x": 649.325927734375,
-      "y": 401.109375,
-      "type": "path",
-      "move_mode": "walk",
+      "x": 653.6697998046875,
+      "y": 391.1484375,
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 10,
-      "x": 655.0245361328125,
-      "y": 421.3682861328125,
-      "type": "path",
-      "move_mode": "walk",
+      "x": 649.325927734375,
+      "y": 401.109375,
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 11,
-      "x": 670.232177734375,
-      "y": 424.7803955078125,
-      "type": "path",
-      "move_mode": "walk",
+      "x": 655.0245361328125,
+      "y": 421.3682861328125,
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 12,
-      "x": 669.838134765625,
-      "y": 440.58984375,
-      "type": "path",
-      "move_mode": "walk",
+      "x": 670.232177734375,
+      "y": 424.7803955078125,
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 13,
-      "x": 666.57763671875,
-      "y": 441.5029296875,
-      "type": "target",
+      "x": 669.838134765625,
+      "y": 440.58984375,
+      "action": "",
       "move_mode": "walk",
-      "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 14,
-      "x": 666.9632568359375,
-      "y": 441.868896484375,
-      "type": "target",
-      "move_mode": "walk",
+      "x": 666.57763671875,
+      "y": 441.5029296875,
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
     },
     {
       "id": 15,
+      "x": 666.9632568359375,
+      "y": 441.868896484375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
+    },
+    {
+      "id": 16,
       "x": 666.5986328125,
       "y": 436.9613037109375,
-      "type": "target",
-      "move_mode": "walk",
       "action": "combat_script",
-      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)"
+      "move_mode": "walk",
+      "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target"
+    },
+    {
+      "id": 17,
+      "x": 666.7986328125,
+      "y": 436.9613037109375,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(2)",
+      "type": "target"
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/19-荧光狭道-9.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/18-荧光狭道-9.json
similarity index 74%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/19-荧光狭道-9.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/18-荧光狭道-9.json
index db57cce5..82f5e958 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/19-荧光狭道-9.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/18-荧光狭道-9.json
@@ -20,8 +20,8 @@
     },
     {
       "id": 2,
-      "x": 819.068603515625,
-      "y": 381.30419921875,
+      "x": 819.8125,
+      "y": 378.5625,
       "action": "",
       "move_mode": "fly",
       "action_params": "",
@@ -47,15 +47,25 @@
     },
     {
       "id": 5,
-      "x": 815.440185546875,
-      "y": 399.7283935546875,
-      "action": "combat_script",
+      "x": 814.655517578125,
+      "y": 399.3074951171875,
+      "type": "target",
       "move_mode": "walk",
+      "action": "combat_script",
       "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
-      "type": "target"
+      "locked": false
     },
     {
       "id": 6,
+      "x": 814.655517578125,
+      "y": 399.3074951171875,
+      "type": "target",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "wait(2.2)"
+    },
+    {
+      "id": 7,
       "x": 812.6278076171875,
       "y": 339.508056640625,
       "action": "",
@@ -64,7 +74,7 @@
       "type": "teleport"
     },
     {
-      "id": 7,
+      "id": 8,
       "x": 800.412353515625,
       "y": 312.8563232421875,
       "action": "",
@@ -73,7 +83,7 @@
       "type": "path"
     },
     {
-      "id": 8,
+      "id": 9,
       "x": 782.8751220703125,
       "y": 250.8365478515625,
       "action": "",
@@ -82,25 +92,25 @@
       "type": "path"
     },
     {
-      "id": 9,
+      "id": 10,
       "x": 785.101806640625,
       "y": 233.717041015625,
       "action": "",
-      "move_mode": "fly",
+      "move_mode": "jump",
       "action_params": "",
       "type": "path"
     },
     {
-      "id": 10,
-      "x": 779.3818359375,
-      "y": 229.3817138671875,
+      "id": 11,
+      "x": 779.875,
+      "y": 229.34375,
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
       "type": "target"
     },
     {
-      "id": 11,
+      "id": 12,
       "x": 782.4173583984375,
       "y": 227.0634765625,
       "action": "combat_script",
@@ -109,7 +119,7 @@
       "type": "target"
     },
     {
-      "id": 12,
+      "id": 13,
       "x": 797.1905517578125,
       "y": 236.6109619140625,
       "action": "combat_script",
@@ -118,7 +128,7 @@
       "type": "target"
     },
     {
-      "id": 13,
+      "id": 14,
       "x": 793.566162109375,
       "y": 240.4027099609375,
       "action": "combat_script",
@@ -127,7 +137,7 @@
       "type": "target"
     },
     {
-      "id": 14,
+      "id": 15,
       "x": 790.380126953125,
       "y": 230.510986328125,
       "action": "",
@@ -136,7 +146,7 @@
       "type": "path"
     },
     {
-      "id": 15,
+      "id": 16,
       "x": 783.19775390625,
       "y": 203.5968017578125,
       "action": "",
@@ -145,18 +155,9 @@
       "type": "path"
     },
     {
-      "id": 16,
+      "id": 17,
       "x": 759.5430908203125,
       "y": 184.4844970703125,
-      "type": "path",
-      "move_mode": "dash",
-      "action": "",
-      "action_params": ""
-    },
-    {
-      "id": 17,
-      "x": 709.5230712890625,
-      "y": 159.2803955078125,
       "action": "",
       "move_mode": "dash",
       "action_params": "",
@@ -164,6 +165,15 @@
     },
     {
       "id": 18,
+      "x": 709.5230712890625,
+      "y": 159.2803955078125,
+      "action": "combat_script",
+      "move_mode": "dash",
+      "action_params": "dash,wait(0.3),dash,wait(0.3),dash",
+      "type": "path"
+    },
+    {
+      "id": 19,
       "x": 696.6732177734375,
       "y": 151.18212890625,
       "action": "",
@@ -172,25 +182,62 @@
       "type": "path"
     },
     {
-      "id": 19,
-      "x": 674.8642578125,
-      "y": 74.8460693359375,
-      "action": "",
+      "id": 20,
+      "x": 697.239013671875,
+      "y": 89.7943115234375,
+      "type": "path",
       "move_mode": "dash",
-      "action_params": "",
-      "type": "path"
+      "action": "",
+      "action_params": ""
     },
     {
-      "id": 20,
+      "id": 21,
+      "x": 684.53125,
+      "y": 86.25,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "keydown(W),wait(0.3),keypress(VK_SPACE),wait(0.2),keypress(VK_SPACE),wait(0.2),keypress(VK_SPACE),wait(0.2),keypress(VK_SPACE),keyup(W)",
+      "locked": false
+    },
+    {
+      "id": 22,
+      "x": 684.53125,
+      "y": 87,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 23,
+      "x": 675.3712158203125,
+      "y": 74.745849609375,
+      "type": "path",
+      "move_mode": "jump",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 24,
+      "x": 680.4122314453125,
+      "y": 67.3402099609375,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": ""
+    },
+    {
+      "id": 25,
       "x": 680.564208984375,
       "y": 67.362060546875,
       "action": "combat_script",
-      "move_mode": "dash",
+      "move_mode": "walk",
       "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
       "type": "target"
     },
     {
-      "id": 21,
+      "id": 26,
       "x": 684.326171875,
       "y": 71.5645751953125,
       "action": "combat_script",
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/20-荧光狭道-西-4.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/19-荧光狭道-西-4.json
similarity index 90%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/20-荧光狭道-西-4.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/19-荧光狭道-西-4.json
index 0aa385a3..c93fcb83 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/20-荧光狭道-西-4.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/19-荧光狭道-西-4.json
@@ -101,8 +101,8 @@
     },
     {
       "id": 11,
-      "x": 1044.3477783203125,
-      "y": 368.6080322265625,
+      "x": 1043.84375,
+      "y": 369.09375,
       "action": "stop_flying",
       "move_mode": "fly",
       "action_params": "1000",
@@ -139,28 +139,28 @@
       "id": 15,
       "x": 1040.5384521484375,
       "y": 364.623291015625,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 16,
       "x": 1039.82763671875,
       "y": 370.656982421875,
-      "type": "path",
-      "move_mode": "dash",
       "action": "",
-      "action_params": ""
+      "move_mode": "dash",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 17,
       "x": 1042.052734375,
       "y": 380.61865234375,
-      "type": "path",
-      "move_mode": "walk",
       "action": "",
-      "action_params": ""
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "path"
     },
     {
       "id": 18,
@@ -187,6 +187,16 @@
       "action": "combat_script",
       "move_mode": "walk",
       "action_params": "诺艾尔 attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
+      "type": "target",
+      "locked": false
+    },
+    {
+      "id": 21,
+      "x": 1112.189453125,
+      "y": 374.2186279296875,
+      "action": "combat_script",
+      "move_mode": "walk",
+      "action_params": "wait(2.2)",
       "type": "target"
     }
   ]
diff --git a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/21-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/20-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json
similarity index 59%
rename from repo/pathing/层岩巨渊-水晶矿/诺艾尔/21-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json
rename to repo/pathing/层岩巨渊-水晶矿/诺艾尔/20-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json
index 98e5e660..df812db8 100644
--- a/repo/pathing/层岩巨渊-水晶矿/诺艾尔/21-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json
+++ b/repo/pathing/层岩巨渊-水晶矿/诺艾尔/20-巨渊主矿区-(地图边缘会很慢,慎选)东2-3.json
@@ -1,6 +1,6 @@
 {
   "info": {
-    "name": "巨渊主矿区-(地图边缘会很慢)东2-3",
+    "name": "21-巨渊主矿区-(地图边缘会很慢,慎选)东2-3",
     "type": "collect",
     "author": "火山",
     "version": "1.0",
@@ -52,8 +52,7 @@
       "action": "",
       "move_mode": "dash",
       "action_params": "",
-      "type": "path",
-      "locked": false
+      "type": "path"
     },
     {
       "id": 6,
@@ -62,8 +61,7 @@
       "action": "",
       "move_mode": "dash",
       "action_params": "",
-      "type": "path",
-      "locked": false
+      "type": "path"
     },
     {
       "id": 7,
@@ -72,8 +70,7 @@
       "action": "",
       "move_mode": "dash",
       "action_params": "",
-      "type": "path",
-      "locked": false
+      "type": "path"
     },
     {
       "id": 8,
@@ -88,22 +85,50 @@
       "id": 9,
       "x": 162.60546875,
       "y": 917.4652099609375,
-      "action": "combat_script",
+      "action": "",
       "move_mode": "walk",
-      "action_params": "诺艾尔 e,attack(0.2), attack(0.2),wait(0.3),attack(0.2),",
-      "type": "target"
+      "action_params": "",
+      "type": "orientation"
     },
     {
       "id": 10,
-      "x": 161.266845703125,
-      "y": 915.4884033203125,
+      "x": 162.60546875,
+      "y": 917.4652099609375,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "诺艾尔 e,attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
-      "type": "target"
+      "action_params": "keypress(4),wait(0.15),attack(0.2),attack(0.2),wait(0.3),attack(0.2),wait(2)",
+      "type": "path"
     },
     {
       "id": 11,
+      "x": 163.35400390625,
+      "y": 918.0858154296875,
+      "type": "orientation",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": "",
+      "locked": false
+    },
+    {
+      "id": 12,
+      "x": 163.35400390625,
+      "y": 918.0858154296875,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "wait(1)"
+    },
+    {
+      "id": 13,
+      "x": 161.266845703125,
+      "y": 915.4884033203125,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "orientation"
+    },
+    {
+      "id": 14,
       "x": 157.97705078125,
       "y": 911.529541015625,
       "action": "",
@@ -112,13 +137,41 @@
       "type": "path"
     },
     {
-      "id": 12,
+      "id": 15,
+      "x": 155.447021484375,
+      "y": 918.379638671875,
+      "action": "",
+      "move_mode": "walk",
+      "action_params": "",
+      "type": "orientation"
+    },
+    {
+      "id": 16,
       "x": 155.447021484375,
       "y": 918.379638671875,
       "action": "combat_script",
       "move_mode": "walk",
-      "action_params": "诺艾尔 e,attack(0.2), attack(0.2),wait(0.3),attack(0.2)",
-      "type": "target"
+      "action_params": "keypress(4),wait(0.15),attack(0.2),attack(0.2),wait(0.3),attack(0.2),wait(1.5)",
+      "type": "path"
+    },
+    {
+      "id": 17,
+      "x": 156.041748046875,
+      "y": 918.768310546875,
+      "type": "orientation",
+      "move_mode": "walk",
+      "action": "",
+      "action_params": "",
+      "locked": false
+    },
+    {
+      "id": 18,
+      "x": 156.041748046875,
+      "y": 918.768310546875,
+      "type": "path",
+      "move_mode": "walk",
+      "action": "combat_script",
+      "action_params": "wait(1.5)"
     }
   ]
 }
\ No newline at end of file