diff --git a/repo/combat/万能战斗策略（萌新推荐）.txt b/repo/combat/万能战斗策略（萌新推荐）.txt
index 84785fb5b..503f24e64 100644
--- a/repo/combat/万能战斗策略（萌新推荐）.txt
+++ b/repo/combat/万能战斗策略（萌新推荐）.txt
@@ -35,86 +35,86 @@
 // ！！！请严格遵守BGI战斗配队逻辑！！！（以 盾【刚需】+主c【可以是后台输出角色】+副c【可以是后台输出角色】+万叶/琴【如需要捡掉落物的可以带，比如精英怪，小怪、副本可酌情不带换成，奶妈 or 后台输出角色】）
 
 // 盾（刚需）
-茜特菈莉 e,attack(0.2),keypress(q),wait(0.2),keypress(q),attack(0.2),keypress(q),attack(0.2),keypress(e)
-伊涅芙 e,attack(0.22),keypress(q),wait(0.1),keypress(q),attack(0.2),keypress(q),attack(0.2)
-钟离 s(0.2), e(hold), wait(0.2), w(0.2),keypress(q),wait(0.2),keypress(q),attack(0.1)
-莱依拉 e,wait(0.2), keypress(q),wait(0.2),keypress(q),attack(0.2),keypress(q),attack(0.2)
-绮良良 e,attack(0.2), keypress(q),attack(0.2),keypress(q),wait(0.2),keypress(q),attack(0.2)
-托马 e,attack(0.22),keypress(q),wait(0.1),keypress(q),attack(0.2),keypress(q),attack(0.2)
-蓝砚 e,wait(0.8),s(0.2),attack(0.33),dash(0.1),attack(0.55),keypress(q),attack(0.1)
+茜特菈莉 e, attack(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2), keypress(q), attack(0.2), keypress(e)
+伊涅芙 e, attack(0.22), keypress(q), wait(0.1), keypress(q), attack(0.2), keypress(q), attack(0.2)
+钟离 s(0.2), e(hold), wait(0.2), w(0.2), keypress(q), wait(0.2), keypress(q), attack(0.1)
+莱依拉 e, wait(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2), keypress(q), attack(0.2)
+绮良良 e, attack(0.2), keypress(q), attack(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2)
+托马 e, attack(0.22), keypress(q), wait(0.1), keypress(q), attack(0.2), keypress(q), attack(0.2)
+蓝砚 e, wait(0.8), s(0.2), attack(0.33), dash(0.1), attack(0.55), keypress(q), attack(0.1)
 
 // 后台、挂元素、副C、先手
-玛薇卡 attack(0.2),e,wait(0.2),keypress(q),attack(0.15)
+玛薇卡 attack(0.2), e, wait(0.2), keypress(q), attack(0.15)
 杜林 attack(0.1), keypress(q), attack(0.2), click(middle), e, wait(0.2), e, keypress(q), wait(0.2), keypress(q), attack(0.2), keypress(q), attack(0.2)
-迪希雅 e,attack(0.2),e
-香菱 e,wait(0.3),keypress(q),attack(0.2),keypress(q),wait(0.2),keypress(q),attack(0.2)
-仆人 attack,e
+迪希雅 e, attack(0.2), e
+香菱 e, wait(0.3), keypress(q), attack(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2)
+仆人 attack, e
 
 // 夜兰顺时针
-夜兰 attack(0.5),keydown(VK_W),wait(0.05),keydown(VK_E),wait(0.4),keyup(VK_E),wait(0.1),keydown(VK_D),keyup(VK_W),wait(0.4),keydown(VK_S),keyup(VK_D),wait(0.4),keydown(VK_A),keyup(VK_S),wait(0.4),keydown(VK_W),keyup(VK_A),wait(0.3),keydown(VK_S),keyup(VK_W),wait(0.15),keyup(VK_S),keypress(e), attack(0.2), keypress(Q), attack(0.2), keypress(Q), attack(0.2)
+夜兰 attack(0.5), keydown(VK_W), wait(0.05), keydown(VK_E), wait(0.4), keyup(VK_E), wait(0.1), keydown(VK_D), keyup(VK_W), wait(0.4), keydown(VK_S), keyup(VK_D), wait(0.4), keydown(VK_A), keyup(VK_S), wait(0.4), keydown(VK_W), keyup(VK_A), wait(0.3), keydown(VK_S), keyup(VK_W), wait(0.15), keyup(VK_S), keypress(e), attack(0.2), keypress(Q), attack(0.2), keypress(Q), attack(0.2)
 哥伦比娅 e, keypress(q), attack(0.2), keypress(q), attack, keypress(q), attack, keypress(E)
-那维莱特 attack(0.05),click(middle),e,wait(0.15),keydown(VK_LBUTTON),wait(0.27),keyup(VK_LBUTTON),wait(0.15),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),keydown(VK_LBUTTON),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),click(middle),j,click(middle),wait(0.05),keyup(VK_LBUTTON)
-纳西妲 e(hold),click(middle),keypress(q),wait(0.3),keypress(q),attack(0.3),keypress(q),attack(0.2)
-艾梅莉埃 e,attack(0.2), keypress(q),attack(0.2),keypress(q),wait(0.2),keypress(q),attack(0.2)
-丝柯克 attack(0.2),click(middle),keypress(q),wait(0.05),keypress(q),attack(0.05),click(middle),keydown(E),wait(0.22),attack(0.08),click(middle),keyup(E),keypress(q),wait(0.08),keypress(q)
-芙宁娜 e,attack(0.85), keypress(e), keypress(Q), attack(0.2), keydown(S), keypress(e), attack(0.2), keyup(S), keypress(Q), attack(0.2)
+那维莱特 attack(0.05), click(middle), e, wait(0.05), keydown(VK_LBUTTON), wait(0.27), keyup(VK_LBUTTON), wait(0.15), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), keydown(VK_LBUTTON), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), click(middle), j, click(middle), wait(0.05), keyup(VK_LBUTTON), wait(0.15)
+纳西妲 e(hold), click(middle), keypress(q), wait(0.3), keypress(q), attack(0.3), keypress(q), attack(0.2)
+艾梅莉埃 e, attack(0.2), keypress(q), attack(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2)
+丝柯克 attack(0.2), click(middle), keypress(q), wait(0.05), keypress(q), attack(0.05), click(middle), keydown(E), wait(0.22), attack(0.08), click(middle), keyup(E), keypress(q), wait(0.08), keypress(q)
+芙宁娜 e, attack(0.85), keypress(e), keypress(Q), attack(0.2), keydown(S), keypress(e), attack(0.2), keyup(S), keypress(Q), attack(0.2)
 爱诺 e, wait(0.3), keypress(q), attack(0.22), keypress(q), attack(0.21)
-夏洛蒂 e, click(middle), attack(0.3), keypress(q), attack(0.22), click(middle), dash(0.1),wait(0.3),keypress(q), attack(0.21)
-菈乌玛 attack(0.1),keypress(q),attack(0.15),keydown(E),wait(0.4),attack(0.3),keyup(E),attack(0.15),keypress(q),attack(0.15),keydown(E),wait(0.4),attack(0.3),keyup(E),attack(0.2),wait(0.1)
+夏洛蒂 e, click(middle), attack(0.3), keypress(q), attack(0.22), click(middle), dash(0.1), wait(0.3), keypress(q), attack(0.21)
+菈乌玛 attack(0.1), keypress(q), attack(0.15), keydown(E), wait(0.4), attack(0.3), keyup(E), attack(0.15), keypress(q), attack(0.15), keydown(E), wait(0.4), attack(0.3), keyup(E), attack(0.2), wait(0.1)
 
-// （有奈芙尔就去掉角色名之前的内容，→（//+一个空格 =// ） ←按照我注释的格式给上一行的菈乌玛长e策略注释掉，后面是短e策略，不消耗草露），菈乌玛 e,attack(0.2), keypress(q),attack(0.2),keypress(q),wait(0.2),keypress(q),attack(0.2)
+// （有奈芙尔就去掉角色名之前的内容，→（//+一个空格 =// ） ←按照我注释的格式给上一行的菈乌玛长e策略注释掉，后面是短e策略，不消耗草露），菈乌玛 e, attack(0.2), keypress(q), attack(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2)
 
-白术 e,attack(0.2)
+白术 e, attack(0.2)
 珊瑚宫心海 e
-芭芭拉 e,attack(0.2)
-希格雯 e(hold),wait(0.2),attack(0.21),keypress(q),wait(0.2),keypress(q)
-爱可菲 e,attack(0.2), keypress(q),attack(0.2),keypress(q),wait(0.2),keypress(q),attack(0.2)
+芭芭拉 e, attack(0.2)
+希格雯 e(hold), wait(0.2), attack(0.21), keypress(q), wait(0.2), keypress(q)
+爱可菲 e, attack(0.2), keypress(q), attack(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2)
 菲谢尔 e
-欧洛伦 e,attack(0.3), keypress(q),wait(0.2),attack(0.3),keypress(q),wait(0.2),attack(0.3),keypress(q),wait(0.3)
-雷电将军 e,attack(0.22),keypress(q),wait(0.1),keypress(q),attack(0.2),keypress(q),attack(0.2)
-久岐忍 e,wait(0.2),keypress(q),attack(0.15),keypress(q),e
-欧洛伦 e,attack(0.3), keypress(q),wait(0.2),attack(0.3),keypress(q),wait(0.2),dash(0.1),attack(0.3),keypress(q),wait(0.3)
-瓦雷莎 e, attack(1.25),wait(0.45), s(0.4), click(middle), e, attack(1.25), wait(0.3),keypress(q), wait(0.45)
+欧洛伦 e, attack(0.3), keypress(q), wait(0.2), attack(0.3), keypress(q), wait(0.2), attack(0.3), keypress(q), wait(0.3)
+雷电将军 e, attack(0.22), keypress(q), wait(0.1), keypress(q), attack(0.2), keypress(q), attack(0.2)
+久岐忍 e, wait(0.2), keypress(q), attack(0.15), keypress(q), e
+欧洛伦 e, attack(0.3), keypress(q), wait(0.2), attack(0.3), keypress(q), wait(0.2), dash(0.1), attack(0.3), keypress(q), wait(0.3)
+瓦雷莎 e, attack(1.25), wait(0.45), s(0.4), click(middle), e, attack(1.25), wait(0.3), keypress(q), wait(0.45)
 
 
 // 中置位
-夏沃蕾 attack(0.08),keypress(q),wait(0.2),keypress(q),wait(0.2),attack(0.21),keydown(e),wait(0.15), moveby(0,1300),wait(0.18),keyup(e),attack(0.15)
-白术 attack(0.2), keypress(q),attack(0.2),keypress(q),wait(0.2),keypress(q),attack(0.2)
-// 奈芙尔 attack(0.08), keydown(VK_LBUTTON), keydown(E), wait(0.015), keyup(E), wait(0.015), wait(0.95), wait(0.015), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), keyup(W), wait(0.85), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), wait(0.015), keyup(W), wait(0.85), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), keyup(W), wait(0.015), wait(0.015), wait(0.5), keyup(VK_LBUTTON),keypress(q),attack(0.2)
-雅珂达 attack(0.2),click(middle),attack(0.2), keydown(E), keydown(W), wait(0.4), keyup(W), keydown(S), wait(0.25), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keyup(E), attack(0.2), keypress(q),attack(0.2), keypress(q),attack(0.3)
+夏沃蕾 attack(0.08), keypress(q), wait(0.2), keypress(q), wait(0.2), attack(0.21), keydown(e), wait(0.15), moveby(0, 1300), wait(0.18), keyup(e), attack(0.15)
+白术 attack(0.2), keypress(q), attack(0.2), keypress(q), wait(0.2), keypress(q), attack(0.2)
+// 奈芙尔 attack(0.08), keydown(VK_LBUTTON), keydown(E), wait(0.015), keyup(E), wait(0.015), wait(0.95), wait(0.015), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), keyup(W), wait(0.85), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), wait(0.015), keyup(W), wait(0.85), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), keyup(W), wait(0.015), wait(0.015), wait(0.5), keyup(VK_LBUTTON), keypress(q), attack(0.2)
+雅珂达 attack(0.2), click(middle), attack(0.2), keydown(E), keydown(W), wait(0.4), keyup(W), keydown(S), wait(0.25), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keydown(W), wait(0.25), keyup(W), keydown(S), wait(0.25), keyup(S), keyup(E), attack(0.2), keypress(q), attack(0.2), keypress(q), attack(0.3)
 
 
 // 减抗
-希诺宁 s(0.2),e,w(0.2),attack(0.35),wait(0.1),attack(0.35),keypress(x), wait(0.2), keypress(q), wait(0.3), keypress(q),keypress(x), wait(0.08), keypress(x),attack(0.2)
-枫原万叶 attack(0.08),keypress(q),wait(0.3),keypress(q),wait(0.3),attack(0.2),keydown(E),wait(0.48),keyup(E),attack(0.3), wait(0.5),attack(0.1)
-砂糖 e,attack(0.2),keypress(q),attack(0.2),keypress(q),e,attack(0.2)
-琴 attack(0.21),keydown(e),wait(0.14), moveby(0,1300),wait(0.75),keyup(e),attack(0.12),keypress(q),attack(0.11),keypress(q),attack
+希诺宁 s(0.2), e, w(0.2), attack(0.35), wait(0.1), attack(0.35), keypress(x), wait(0.2), keypress(q), wait(0.3), keypress(q), keypress(x), wait(0.08), keypress(x), attack(0.2)
+枫原万叶 attack(0.08), keypress(q), wait(0.3), keypress(q), wait(0.3), attack(0.2), keydown(E), wait(0.48), keyup(E), attack(0.3), wait(0.5), attack(0.1)
+砂糖 e, attack(0.2), keypress(q), attack(0.2), keypress(q), e, attack(0.2)
+琴 attack(0.21), keydown(e), wait(0.14), moveby(0, 1300), wait(0.75), keyup(e), attack(0.12), keypress(q), attack(0.11), keypress(q), attack
 
 // 夜兰逆时针
-夜兰 attack(0.5),keydown(VK_W),wait(0.05),keydown(VK_E),wait(0.4),keyup(VK_E),wait(0.1),keydown(VK_A),keyup(VK_W),wait(0.4),keydown(VK_S),keyup(VK_A),wait(0.4),keydown(VK_D),keyup(VK_S),wait(0.4),keydown(VK_W),keyup(VK_D),wait(0.3),keydown(VK_S),keyup(VK_W),wait(0.15),keyup(VK_S),keypress(e), attack(0.2), keypress(Q), attack(0.2), keypress(Q), attack(0.2)
+夜兰 attack(0.5), keydown(VK_W), wait(0.05), keydown(VK_E), wait(0.4), keyup(VK_E), wait(0.1), keydown(VK_A), keyup(VK_W), wait(0.4), keydown(VK_S), keyup(VK_A), wait(0.4), keydown(VK_D), keyup(VK_S), wait(0.4), keydown(VK_W), keyup(VK_D), wait(0.3), keydown(VK_S), keyup(VK_W), wait(0.15), keyup(VK_S), keypress(e), attack(0.2), keypress(Q), attack(0.2), keypress(Q), attack(0.2)
 
 // 爆发
-玛薇卡 attack(0.08),keydown(E),wait(0.4),attack(0.2),wait(0.01),keyup(E),click(middle),attack(0.08),keypress(Q), wait(0.2), keypress(Q),charge(3.8), keydown(space), wait(0.1), keyup(space), attack(0.2),wait(0.2)
+玛薇卡 attack(0.08), keydown(E), wait(0.4), attack(0.2), wait(0.01), keyup(E), click(middle), attack(0.08), keypress(Q), wait(0.2), keypress(Q), charge(3.8), keydown(space), wait(0.1), keyup(space), attack(0.2), wait(0.2)
 
 
 // 收尾，长轴
-那维莱特 attack(0.05),keypress(q),wait(0.05),keypress(q),click(middle),e,wait(0.15),keydown(VK_LBUTTON),wait(0.27),keyup(VK_LBUTTON),wait(0.15),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),keydown(VK_LBUTTON),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),click(middle),j,click(middle),keyup(VK_LBUTTON),wait(0.5),attack(0.2), click(middle),wait(0.2),keydown(VK_LBUTTON),wait(0.35),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),keydown(VK_LBUTTON),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-2100),wait(0.05),moveby(1800,-1100),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1200),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,1300),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),moveby(1800,0),wait(0.05),click(middle),j,click(middle),wait(0.05),keyup(VK_LBUTTON)
+那维莱特 attack(0.05), keypress(q), wait(0.05), keypress(q), click(middle), e, wait(0.15), keydown(VK_LBUTTON), wait(0.27), keyup(VK_LBUTTON), wait(0.15), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), keydown(VK_LBUTTON), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), click(middle), j, click(middle), keyup(VK_LBUTTON), wait(0.5), attack(0.2), click(middle), wait(0.2), keydown(VK_LBUTTON), wait(0.35), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), keydown(VK_LBUTTON), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -2100), wait(0.05), moveby(1800, -1100), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1200), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 1300), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), moveby(1800, 0), wait(0.05), click(middle), j, click(middle), wait(0.05), keyup(VK_LBUTTON), wait(0.15)
 
-温迪 attack(0.1), keypress(Q), e, click(middle), attack(0.2), keypress(Q), attack(0.22), e, click(middle), dash(0.1), attack(1.2), e, attack(0.5), click(middle), attack(0.2),dash(0.1),attack(1.2)
+温迪 attack(0.1), keypress(Q), e, click(middle), attack(0.2), keypress(Q), attack(0.22), e, click(middle), dash(0.1), attack(1.2), e, attack(0.5), click(middle), attack(0.2), dash(0.1), attack(1.2)
 
-芭芭拉 e,attack(0.6),keypress(q),attack(2),charge(0.5),keypress(q),attack(0.2)
-丝柯克 attack(0.05),keypress(e),wait(0.05),keypress(e),wait(0.2),attack(2.27),keypress(Q),dash,attack(2.27),keydown(S),keypress(Q),dash,keyup(S),attack(2.27),wait(0.11),charge(0.3),attack(1)
-迪希雅 keypress(q),attack(0.1),dash(0.2),keypress(q),attack(0.3),keypress(q),attack(0.3),keypress(q),attack(0.3),keydown(S),attack(0.5),keyup(S),keydown(W),attack(0.5),keyup(W),keydown(S),attack(0.5),keyup(S),keydown(W),attack(0.5),keyup(W),keydown(S),attack(0.5),keyup(S),keydown(W),attack(0.5),keyup(W),keydown(S),attack(0.5),keyup(S)
-娜维娅 keypress(q),attack(0.1),keypress(q),attack(0.1),keypress(q),attack(0.1),keypress(q),keydown(E),wait(0.8),keyup(E),attack(1.6),keydown(E),wait(0.8),keyup(E),attack(0.1),keydown(S),attack(0.33),keyup(S),keydown(W),attack(0.3),keyup(W),keydown(S),attack(0.3),keyup(S),keydown(W),attack(0.3),keyup(W),keydown(S),attack(0.3),keyup(S),keydown(W),attack(0.3),keyup(W),attack(0.2)
+芭芭拉 e, attack(0.6), keypress(q), attack(2), charge(0.5), keypress(q), attack(0.2)
+丝柯克 attack(0.05), keypress(e), wait(0.05), keypress(e), wait(0.2), attack(2.27), keypress(Q), dash, attack(2.27), keydown(S), keypress(Q), dash, keyup(S), attack(2.27), wait(0.11), charge(0.3), attack(1)
+迪希雅 keypress(q), attack(0.1), dash(0.2), keypress(q), attack(0.3), keypress(q), attack(0.3), keypress(q), attack(0.3), keydown(S), attack(0.5), keyup(S), keydown(W), attack(0.5), keyup(W), keydown(S), attack(0.5), keyup(S), keydown(W), attack(0.5), keyup(W), keydown(S), attack(0.5), keyup(S), keydown(W), attack(0.5), keyup(W), keydown(S), attack(0.5), keyup(S)
+娜维娅 keypress(q), attack(0.1), keypress(q), attack(0.1), keypress(q), attack(0.1), keypress(q), keydown(E), wait(0.8), keyup(E), attack(1.6), keydown(E), wait(0.8), keyup(E), attack(0.1), keydown(S), attack(0.33), keyup(S), keydown(W), attack(0.3), keyup(W), keydown(S), attack(0.3), keyup(S), keydown(W), attack(0.3), keyup(W), keydown(S), attack(0.3), keyup(S), keydown(W), attack(0.3), keyup(W), attack(0.2)
 // （奈芙尔3zs）奈芙尔 attack(0.08), keydown(VK_LBUTTON), keydown(E), wait(0.015), keyup(E), wait(0.015), wait(0.95), wait(0.015), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), keyup(W), wait(0.85), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), wait(0.015), keyup(W), wait(0.85), keydown(VK_RBUTTON), wait(0.015), keyup(VK_RBUTTON), wait(0.015), keydown(S), wait(0.015), keyup(S), wait(0.25), keydown(W), wait(0.015), keyup(W), wait(0.015), wait(0.015), wait(0.5), keyup(VK_LBUTTON)
-// （满命6刀）芙宁娜 attack(0.01),e,attack(0.1),dash(0.1),jump,wait(0.2),keypress(q),keydown(W),attack(0.3),keypress(q),keyup(W),attack(0.3),keypress(q),attack(0.1),keydown(S),attack(0.33),keyup(S),keydown(W),attack(0.3),keyup(W),keydown(S),attack(0.3),keyup(S),keydown(W),attack(0.3),keyup(W),keydown(S),attack(0.3),keyup(S),keydown(W),attack(0.3),keyup(W)
-// （火神AZS）玛薇卡  q,attack(0.1),e,charge(0.6),dash(0.3),moveby(500,0),moveby(2300,0),attack(0.1),charge(0.7),dash(0.3),moveby(-500,0),moveby(-2300,-0),attack(0.1),charge(0.7),dash(0.3),moveby(500,0),moveby(2600,0),attack(0.1),charge(0.8),dash(0.3),moveby(-500,0),moveby(-2300,-0),attack(0.1),charge(0.8),dash(0.3),moveby(500,0),moveby(2300,0),attack(0.1),charge(0.8),dash(0.3),moveby(-500,0),moveby(-2300,-0)
-// （火神ZZS）玛薇卡 attack(0.08), keypress(q),attack(0.03),keypress(q),keydown(E),wait(0.35),keyup(E),attack(0.03),wait(0.25), keydown(VK_LBUTTON),wait(0.155),keydown(VK_RBUTTON),wait(0.18),keyup(VK_LBUTTON),wait(0.02),keyup(VK_RBUTTON),wait(0.02),keydown(VK_LBUTTON),wait(0.16),keydown(VK_RBUTTON),wait(0.18),keyup(VK_LBUTTON),wait(0.02),keyup(VK_RBUTTON),wait(0.1),keydown(VK_LBUTTON),wait(0.05),keyup(VK_LBUTTON),wait(0.05),keydown(VK_LBUTTON),wait(0.05),keyup(VK_LBUTTON),wait(1.25), keydown(VK_LBUTTON),wait(0.155),keydown(VK_RBUTTON),wait(0.18),keyup(VK_LBUTTON),wait(0.02),keyup(VK_RBUTTON),wait(0.02),keydown(VK_LBUTTON),wait(0.16),keydown(VK_RBUTTON),wait(0.18),keyup(VK_LBUTTON),wait(0.02),keyup(VK_RBUTTON),wait(0.1),keydown(VK_LBUTTON),wait(0.05),keyup(VK_LBUTTON),wait(0.05),keydown(VK_LBUTTON),wait(0.05),keyup(VK_LBUTTON),wait(0.83)
-// （回身 QE ZZS）玛薇卡 attack(0.03),keypress(q),keypress(q),keydown(E),wait(0.45),keyup(E),wait(0.2),keydown(VK_LBUTTON),wait(0.155),wait(0.359),keyup(VK_LBUTTON),wait(0.05),wait(0.05), keydown(VK_LBUTTON),wait(0.1),keyup(VK_LBUTTON),wait(0.05),keydown(VK_LBUTTON),wait(0.1),keyup(VK_LBUTTON),click(middle),wait(0.45),  moveby(5500,0),wait(0.05),keydown(VK_LBUTTON),wait(0.125),keydown(VK_RBUTTON),wait(0.15),s(0.1),wait(0.1),keyup(VK_LBUTTON),wait(0.01),keyup(VK_RBUTTON),wait(0.08),keydown(VK_LBUTTON),wait(0.125),keydown(VK_RBUTTON),wait(0.1),s(0.1),wait(0.1),keyup(VK_LBUTTON),wait(0.01),keyup(VK_RBUTTON),wait(0.1),keydown(VK_LBUTTON),wait(0.05),keyup(VK_LBUTTON),wait(0.05),keydown(VK_LBUTTON),wait(0.05),keyup(VK_LBUTTON),wait(0.3)
-瓦雷莎 e, attack(1.25),click(middle),wait(0.45), keydown(s), e, attack(1.25),keyup(s), wait(0.3),keypress(q), click(middle),wait(0.45)
-仆人 charge(0.35), j, keydown(s),attack(1.17),attack(0.45),keyup(s),keydown(w),attack(0.38),attack(0.6),keyup(w),wait(0.2),keydown(s),attack(1.17),attack(0.45),keyup(s),keydown(w),attack(0.38),attack(0.6),keyup(w),wait(0.2)
+// （满命6刀）芙宁娜 attack(0.01), e, attack(0.1), dash(0.1), jump, wait(0.2), keypress(q), keydown(W), attack(0.3), keypress(q), keyup(W), attack(0.3), keypress(q), attack(0.1), keydown(S), attack(0.33), keyup(S), keydown(W), attack(0.3), keyup(W), keydown(S), attack(0.3), keyup(S), keydown(W), attack(0.3), keyup(W), keydown(S), attack(0.3), keyup(S), keydown(W), attack(0.3), keyup(W)
+// （火神AZS）玛薇卡  q, attack(0.1), e, charge(0.6), dash(0.3), moveby(500, 0), moveby(2300, 0), attack(0.1), charge(0.7), dash(0.3), moveby(-500, 0), moveby(-2300, -0), attack(0.1), charge(0.7), dash(0.3), moveby(500, 0), moveby(2600, 0), attack(0.1), charge(0.8), dash(0.3), moveby(-500, 0), moveby(-2300, -0), attack(0.1), charge(0.8), dash(0.3), moveby(500, 0), moveby(2300, 0), attack(0.1), charge(0.8), dash(0.3), moveby(-500, 0), moveby(-2300, -0)
+// （火神ZZS）玛薇卡 attack(0.08), keypress(q), attack(0.03), keypress(q), keydown(E), wait(0.35), keyup(E), attack(0.03), wait(0.25), keydown(VK_LBUTTON), wait(0.155), keydown(VK_RBUTTON), wait(0.18), keyup(VK_LBUTTON), wait(0.02), keyup(VK_RBUTTON), wait(0.02), keydown(VK_LBUTTON), wait(0.16), keydown(VK_RBUTTON), wait(0.18), keyup(VK_LBUTTON), wait(0.02), keyup(VK_RBUTTON), wait(0.1), keydown(VK_LBUTTON), wait(0.05), keyup(VK_LBUTTON), wait(0.05), keydown(VK_LBUTTON), wait(0.05), keyup(VK_LBUTTON), wait(1.25), keydown(VK_LBUTTON), wait(0.155), keydown(VK_RBUTTON), wait(0.18), keyup(VK_LBUTTON), wait(0.02), keyup(VK_RBUTTON), wait(0.02), keydown(VK_LBUTTON), wait(0.16), keydown(VK_RBUTTON), wait(0.18), keyup(VK_LBUTTON), wait(0.02), keyup(VK_RBUTTON), wait(0.1), keydown(VK_LBUTTON), wait(0.05), keyup(VK_LBUTTON), wait(0.05), keydown(VK_LBUTTON), wait(0.05), keyup(VK_LBUTTON), wait(0.83)
+// （回身 QE ZZS）玛薇卡 attack(0.03), keypress(q), keypress(q), keydown(E), wait(0.45), keyup(E), wait(0.2), keydown(VK_LBUTTON), wait(0.155), wait(0.359), keyup(VK_LBUTTON), wait(0.05), wait(0.05), keydown(VK_LBUTTON), wait(0.1), keyup(VK_LBUTTON), wait(0.05), keydown(VK_LBUTTON), wait(0.1), keyup(VK_LBUTTON), click(middle), wait(0.45), moveby(5500, 0), wait(0.05), keydown(VK_LBUTTON), wait(0.125), keydown(VK_RBUTTON), wait(0.15), s(0.1), wait(0.1), keyup(VK_LBUTTON), wait(0.01), keyup(VK_RBUTTON), wait(0.08), keydown(VK_LBUTTON), wait(0.125), keydown(VK_RBUTTON), wait(0.1), s(0.1), wait(0.1), keyup(VK_LBUTTON), wait(0.01), keyup(VK_RBUTTON), wait(0.1), keydown(VK_LBUTTON), wait(0.05), keyup(VK_LBUTTON), wait(0.05), keydown(VK_LBUTTON), wait(0.05), keyup(VK_LBUTTON), wait(0.3)
+瓦雷莎 e, attack(1.25), click(middle), wait(0.45), keydown(s), e, attack(1.25), keyup(s), wait(0.3), keypress(q), click(middle), wait(0.45)
+仆人 charge(0.35), j, keydown(s), attack(1.17), attack(0.45), keyup(s), keydown(w), attack(0.38), attack(0.6), keyup(w), wait(0.2), keydown(s), attack(1.17), attack(0.45), keyup(s), keydown(w), attack(0.38), attack(0.6), keyup(w), wait(0.2)
 
-// （满命转圈喷5.5秒）希格雯 e(hold),keypress(q),wait(0.2),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1),moveby(300,0),wait(0.1)
+// （满命转圈喷5.5秒）希格雯 e(hold), keypress(q), wait(0.2), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1), moveby(300, 0), wait(0.1)
 
-菲林斯 attack(0.2), click(middle), ready, keydown(w), e, attack(0.3), keyup(w), ready, keydown(s), e, keypress(q), attack(0.3), keyup(s), ready, keydown(w), attack(0.33), keyup(w), ready, e, keypress(q), attack(0.33), keydown(s),  e, attack(0.33), keyup(s), ready, keypress(q), attack(0.2), keydown(w), attack(0.2), keyup(w), ready, keydown(s),  e, attack(0.2), keyup(s), ready, keypress(e), attack(0.25), e, keypress(q), ready, keydown(w), e, attack(0.3), keyup(w), ready, keydown(s), e, keypress(q), attack(0.3), keyup(s), ready, keydown(w), attack(0.33), keyup(w), ready, e, keypress(q), attack(0.33), keydown(s), e, attack(0.33), keyup(s), ready, attack(0.2), keypress(q), ready
+菲林斯 attack(0.2), click(middle), ready, keydown(w), e, attack(0.3), keyup(w), ready, keydown(s), e, keypress(q), attack(0.3), keyup(s), ready, keydown(w), attack(0.33), keyup(w), ready, e, keypress(q), attack(0.33), keydown(s), e, attack(0.33), keyup(s), ready, keypress(q), attack(0.2), keydown(w), attack(0.2), keyup(w), ready, keydown(s), e, attack(0.2), keyup(s), ready, keypress(e), attack(0.25), e, keypress(q), ready, keydown(w), e, attack(0.3), keyup(w), ready, keydown(s), e, keypress(q), attack(0.3), keyup(s), ready, keydown(w), attack(0.33), keyup(w), ready, e, keypress(q), attack(0.33), keydown(s), e, attack(0.33), keyup(s), ready, attack(0.2), keypress(q), ready
 
diff --git a/repo/js/AutoFriendshipFight/assets/AutoPath/盗宝团-战斗点.json b/repo/js/AutoFriendshipFight/assets/AutoPath/盗宝团-战斗点.json
index 544346517..8174da3b2 100644
--- a/repo/js/AutoFriendshipFight/assets/AutoPath/盗宝团-战斗点.json
+++ b/repo/js/AutoFriendshipFight/assets/AutoPath/盗宝团-战斗点.json
@@ -1,31 +1,40 @@
-{
+{
   "info": {
-    "name": "盗宝团-战斗点",
-    "type": "collect",
-    "author": "HZYgrandma",
-    "version": "1.0",
+    "authors": [
+      {
+        "links": "",
+        "name": "HZYgrandma"
+      }
+    ],
+    "bgi_version": "0.45.0",
     "description": "",
+    "enable_monster_loot_split": false,
+    "last_modified_time": 1769367052659,
+    "map_match_method": "",
     "map_name": "Teyvat",
-    "bgi_version": "0.45.0"
+    "name": "盗宝团-战斗点",
+    "tags": [],
+    "type": "collect",
+    "version": "1.0"
   },
   "positions": [
     {
-      "id": 1,
-      "x": -2741.25,
-      "y": -3441.00,
       "action": "",
-      "move_mode": "dash",
       "action_params": "",
-      "type": "path"
+      "id": 1,
+      "move_mode": "dash",
+      "type": "path",
+      "x": -2741.25,
+      "y": -3441
     },
     {
-      "id": 2,
-      "x": -2757.28,
-      "y": -3468.43,
       "action": "",
-      "move_mode": "dash",
       "action_params": "",
-      "type": "path"
+      "id": 2,
+      "move_mode": "dash",
+      "type": "path",
+      "x": -2753.04,
+      "y": -3459.3025
     }
   ]
 }
\ No newline at end of file
diff --git a/repo/js/AutoFriendshipFight/assets/exp.png b/repo/js/AutoFriendshipFight/assets/exp.png
new file mode 100644
index 000000000..21b94bf99
Binary files /dev/null and b/repo/js/AutoFriendshipFight/assets/exp.png differ
diff --git a/repo/js/AutoFriendshipFight/assets/mora.png b/repo/js/AutoFriendshipFight/assets/mora.png
new file mode 100644
index 000000000..1cf521063
Binary files /dev/null and b/repo/js/AutoFriendshipFight/assets/mora.png differ
diff --git a/repo/js/AutoFriendshipFight/main.js b/repo/js/AutoFriendshipFight/main.js
index 74a0aebb6..03c927586 100644
--- a/repo/js/AutoFriendshipFight/main.js
+++ b/repo/js/AutoFriendshipFight/main.js
@@ -5,6 +5,20 @@ const BENCHMARK_HOUR = "T04:00:00";
 const DEFAULT_OCR_TIMEOUT_SECONDS = 10;
 const DEFAULT_FIGHT_TIMEOUT_SECONDS = 120;
 
+let detectedExpOrMora = true;
+let NoExpOrMoraCount = 0;
+let running = true;
+
+const expRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/exp.png"), 74, 341, 207 - 74, 803 - 341);
+expRo.Threshold = 0.85;
+expRo.Use3Channels = true;
+expRo.InitTemplate();
+
+const moraRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/exp.png"), 74, 341, 207 - 74, 803 - 341);
+moraRo.Threshold = 0.85;
+moraRo.Use3Channels = true;
+moraRo.InitTemplate();
+
 (async function () {
     const startTime = Date.now();
     // 启用自动拾取的实时任务
@@ -173,50 +187,47 @@ async function executeBattleTasks(fightTimeout, enemyType, cts) {
     let battleTask;
     let battleResult = null;
     let fightResult = null;
-
+    let battleDetectTask = null;
+    let results = null;
     try {
-        battleTask = dispatcher.RunTask(new SoloTask("AutoFight"), cts);
-        const battleDetectTask = waitForBattleResult(fightTimeout * 1000, enemyType, cts);
+        if (settings.disableAsyncFight) {
+            battleTask = await dispatcher.RunTask(new SoloTask("AutoFight"));
+            return { success: true };
+        } else {
+            battleTask = dispatcher.RunTask(new SoloTask("AutoFight"), cts);
+            battleDetectTask = waitForBattleResult(fightTimeout * 1000, enemyType, cts);
+            // 使用 Promise.allSettled 而不是 Promise.all，这样可以处理部分成功的情况
+            results = await Promise.allSettled([
+                battleTask.catch(error => {
+                    // 如果是取消错误（成功检测后的正常取消），不算真正的错误
+                    if (error.message && error.message.includes("取消自动任务")) {
+                        log.info("战斗任务已被成功取消");
+                        return { cancelled: true };
+                    }
+                    throw error; // 其他错误继续抛出
+                }),
+                battleDetectTask
+            ]);
 
-        // 使用 Promise.allSettled 而不是 Promise.all，这样可以处理部分成功的情况
-        const results = await Promise.allSettled([
-            battleTask.catch(error => {
-                // 如果是取消错误（成功检测后的正常取消），不算真正的错误
-                if (error.message && error.message.includes("取消自动任务")) {
-                    log.info("战斗任务已被成功取消");
-                    return { cancelled: true };
-                }
-                throw error; // 其他错误继续抛出
-            }),
-            battleDetectTask
-        ]);
+            battleResult = results[0];
+            fightResult = results[1];
 
-        battleResult = results[0];
-        fightResult = results[1];
-
-        // 检查检测任务是否成功
-        if (fightResult.status === 'fulfilled') {
-            log.info("战斗检测任务完成");
-            return { success: true, battleResult: battleResult.value, fightResult: fightResult.value };
-        } else if (fightResult.status === 'rejected') {
-            throw fightResult.reason;
+            // 检查检测任务是否成功
+            if (fightResult.status === 'fulfilled') {
+                log.info("战斗检测任务完成");
+                return { success: true, battleResult: battleResult.value, fightResult: fightResult.value };
+            } else if (fightResult.status === 'rejected') {
+                throw fightResult.reason;
+            }
         }
-
     } catch (error) {
-        if (error.message && error.message.includes("战斗超时")) {
-            log.error(`战斗超时，终止整个任务: ${error.message}`);
-            await genshin.tpToStatueOfTheSeven();
-            throw error;
-        }
-
         // 过滤掉正常的取消错误
         if (error.message && error.message.includes("取消自动任务")) {
             log.info("战斗任务正常取消（战斗检测成功）");
             return { success: true, cancelled: true };
         }
-
         log.error(`战斗执行过程中出错: ${error.message}`);
-        throw error;
+        await genshin.tpToStatueOfTheSeven();
     } finally {
         // 确保战斗任务被等待完成（即使被取消）
         if (battleTask) {
@@ -244,11 +255,21 @@ async function executeSingleFriendshipRound(roundIndex, ocrTimeout, fightTimeout
     if (roundIndex === 0) {
         initialDetected = await detectTaskTrigger(3, enemyType);
     }
+    if (!detectedExpOrMora && settings.loopTillNoExpOrMora) {
+        NoExpOrMoraCount++;
+        log.warn("上次运行未检测到经验或摩拉");
+        if (NoExpOrMoraCount >= 2) {
+            log.warn("连续两次循环没有经验或摩拉掉落，提前终止");
+            return false;
+        }
+    } else {
+        NoExpOrMoraCount = 0;
+        detectedExpOrMora = false;
+    }
     if (!initialDetected || roundIndex > 0) {
         await genshin.relogin();
     }
-
-
+    
     // 启动路径导航任务（异步）
     let pathTask = AutoPath(`${enemyType}-战斗点`);
     const ocrStatus = await detectTaskTrigger(ocrTimeout, enemyType);
@@ -298,7 +319,12 @@ function logProgress(startTime, currentRound, totalRounds) {
 // 执行 N 次好感任务并输出日志 - 重构后的主函数
 async function AutoFriendshipDev(times, ocrTimeout, fightTimeout, enemyType = "盗宝团") {
     const startFirstTime = Date.now();
+    let detectExpOrMoraTask;
+    if (settings.loopTillNoExpOrMora) {
+        detectExpOrMoraTask = detectExpOrMora();
+    }
     for (let i = 0; i < times; i++) {
+        try { await sleep(1); } catch (e) { break; }
         try {
             const success = await executeSingleFriendshipRound(i, ocrTimeout, fightTimeout, enemyType);
             if (!success)
@@ -306,18 +332,53 @@ async function AutoFriendshipDev(times, ocrTimeout, fightTimeout, enemyType = "
             logProgress(startFirstTime, i, times);
         } catch (error) {
             log.error(`第 ${i + 1} 轮好感任务失败: ${error.message}`);
-
             // 如果是战斗超时错误，直接终止整个任务
+            /*
             if (error.message && error.message.includes("战斗超时")) {
                 throw error;
             }
+            */
             continue;
         }
     }
-
+    running = false;
+    if (settings.loopTillNoExpOrMora) {
+        await detectExpOrMoraTask;
+    }
     log.info(`${enemyType}好感已完成`);
 }
 
+async function detectExpOrMora() {
+    while (running) {
+        try { await sleep(1); } catch (e) { break; }
+        let gameRegion;
+        if (!detectedExpOrMora) {
+            try {
+                gameRegion = captureGameRegion();
+                const res1 = gameRegion.find(expRo);
+                if (res1.isExist()) {
+                    log.info("识别到经验");
+                    detectedExpOrMora = true;
+                    continue;
+                }
+                const res2 = gameRegion.find(moraRo);
+                if (res2.isExist()) {
+                    log.info("识别到经验");
+                    detectedExpOrMora = true;
+                    continue;
+                }
+            } catch (e) {
+                log.error(`检测经验和摩拉掉落过程中出现错误 ${e.message}`);
+            } finally {
+                gameRegion?.dispose();
+            }
+        } else {
+            //无需检测时额外等待200
+            await sleep(200);
+        }
+        await sleep(200);
+    }
+}
 
 async function calulateRunTimes() {
     log.info(`'请确保队伍满员，并为队伍配置相应的战斗策略'`);
@@ -396,7 +457,7 @@ function getTargetCoordinates(enemyType) {
         return { x: 4840.55, y: -3078.01 };
     } else if (enemyType === "盗宝团") {
         // 盗宝团战斗点坐标
-        return { x: -2757.28, y: -3468.43 };
+        return { x: -2753.04, y: -3459.3025 };
     } else if (enemyType === "鳄鱼") {
         // 鳄鱼战斗点坐标
         return { x: 3578.08, y: -500.75 };
diff --git a/repo/js/AutoFriendshipFight/manifest.json b/repo/js/AutoFriendshipFight/manifest.json
index ea0ff89a2..4c1e8d174 100644
--- a/repo/js/AutoFriendshipFight/manifest.json
+++ b/repo/js/AutoFriendshipFight/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "战斗好感：自动好感度&卡时间",
-  "version": "1.4.4",
+  "version": "1.5.0",
   "bgi_version": "0.45.1",
   "tags": [
     "好感",
diff --git a/repo/js/AutoFriendshipFight/settings.json b/repo/js/AutoFriendshipFight/settings.json
index 2c00d9f5b..551c33c5c 100644
--- a/repo/js/AutoFriendshipFight/settings.json
+++ b/repo/js/AutoFriendshipFight/settings.json
@@ -23,6 +23,16 @@
     "type": "checkbox",
     "label": "是否清理丘丘人\n【默认否，仅对盗宝团有效，选是会清理丘丘人之后再开始任务】"
   },
+  {
+    "name": "disableAsyncFight",
+    "type": "checkbox",
+    "label": "禁用容易导致问题的异步战斗，改为正常的战斗结束逻辑，勾选后需要在配置组中正常配置战斗结束检测"
+  },
+  {
+    "name": "loopTillNoExpOrMora",
+    "type": "checkbox",
+    "label": "连续两次循环全程没有检测到获取经验值或摩拉图标时提前终止"
+  },
   {
     "name": "partyName",
     "type": "input-text",
diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js
index d2d00f859..dc57c9e0d 100644
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -1364,8 +1364,8 @@ async function dumper(pathFilePath, map_name) {
         const pathingContent = await file.readText(pathFilePath);
         const parsedContent = JSON.parse(pathingContent);
         const positions = parsedContent.positions;
-        // 初始化 hasT 为 false
-        let hasT = false;
+        // 初始化 disableDumper 为 false
+        let disableDumper = false;
 
         // 初始化 fightPositions 数组
         let fightPositions = [];
@@ -1374,7 +1374,7 @@ async function dumper(pathFilePath, map_name) {
         for (const pos of positions) {
             // 检查 action_params 是否包含 keypress(T)
             if (pos.action_params && pos.action_params.includes('keypress(T)')) {
-                hasT = true;
+                disableDumper = true;
             }
 
             // 如果 action 是 "fight"，则添加到 fightPositions
@@ -1386,7 +1386,14 @@ async function dumper(pathFilePath, map_name) {
                 });
             }
         }
-        if (!hasT) {
+
+        //6.3强制使用sift的地图不开启泥头车
+        const info = parsedContent.info;
+        if (info.map_match_method && info.map_match_method === "SIFT") {
+            disableDumper = true;
+        }
+
+        if (!disableDumper) {
             while (state.running) {
                 //log.info("调试-泥头车循环");
                 await sleep(501);
diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json
index e347de1eb..ee9e9c54d 100644
--- a/repo/js/AutoHoeingOneDragon/manifest.json
+++ b/repo/js/AutoHoeingOneDragon/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "锄地一条龙",
-  "version": "2.2.3",
+  "version": "2.2.6",
   "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用",
   "authors": [
     {
diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-传奇/006挪德卡莱苔骨荒原西格德 传奇.json b/repo/js/AutoHoeingOneDragon/pathing/0-传奇/006挪德卡莱苔骨荒原西格德 传奇.json
index 0956f112a..2f01f7029 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/0-传奇/006挪德卡莱苔骨荒原西格德 传奇.json	
+++ b/repo/js/AutoHoeingOneDragon/pathing/0-传奇/006挪德卡莱苔骨荒原西格德 传奇.json	
@@ -1,4 +1,4 @@
-{
+{
   "info": {
     "authors": [
       {
@@ -7,10 +7,10 @@
       }
     ],
     "bgi_version": "0.45.0",
-    "description": "  路线信息：该路线预计用时139.76秒，包含以下怪物：3只精英传奇倍率二。",
+    "description": "  路线信息：该路线预计用时139.76秒，预计收入600摩拉，包含以下怪物：3只精英传奇倍率二。",
     "enable_monster_loot_split": false,
-    "last_modified_time": 1769415660410,
-    "map_match_method": "",
+    "last_modified_time": 1768043958884,
+    "map_match_method": "TemplateMatch",
     "map_name": "Teyvat",
     "name": "006挪德卡莱苔骨荒原西格德 传奇",
     "tags": [],
@@ -33,60 +33,33 @@
       "id": 2,
       "move_mode": "dash",
       "type": "path",
-      "x": 9178.999796243319,
-      "y": 1919.8147133079328
+      "x": 9175.597393783086,
+      "y": 1930.4038689445097
     },
     {
       "action": "stop_flying",
-      "action_params": "1300",
+      "action_params": "1000",
       "id": 3,
       "move_mode": "fly",
       "type": "path",
-      "x": 9129.124874611272,
-      "y": 1943.3760845208872
+      "x": 9080.405748201347,
+      "y": 1950.8751155765822
     },
     {
-      "action": "",
-      "action_params": "",
+      "action": "combat_script",
+      "action_params": ";茜特菈莉 e;伊涅芙 e;莱依拉 e;keypress(f)",
       "id": 4,
-      "move_mode": "dash",
-      "type": "path",
-      "x": 9089.830078125,
-      "y": 1962.0771484375
-    },
-    {
-      "action": "combat_script",
-      "action_params": "keypress(f),wait(0.1),keypress(f)",
-      "id": 5,
       "move_mode": "walk",
+      "type": "path",
+      "x": 9080.437011763472,
+      "y": 1951.1251386918993
+    },
+    {
+      "action": "fight",
+      "action_params": "",
+      "id": 5,
+      "move_mode": "dash",
       "type": "target",
-      "x": 9080.4384765625,
-      "y": 1950.4921875
-    },
-    {
-      "action": "fight",
-      "action_params": "",
-      "id": 6,
-      "move_mode": "dash",
-      "type": "path",
-      "x": 9079.688910461078,
-      "y": 1957.747457315174
-    },
-    {
-      "action": "fight",
-      "action_params": "",
-      "id": 7,
-      "move_mode": "dash",
-      "type": "path",
-      "x": 9079.688910461078,
-      "y": 1957.747457315174
-    },
-    {
-      "action": "combat_script",
-      "action_params": "wait(0.1)",
-      "id": 8,
-      "move_mode": "dash",
-      "type": "orientation",
       "x": 9079.688910461078,
       "y": 1957.747457315174
     }
diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-传奇/007枫丹利亚姆 传奇 高危.json b/repo/js/AutoHoeingOneDragon/pathing/0-传奇/007枫丹利亚姆 传奇 高危.json
new file mode 100644
index 000000000..492447598
--- /dev/null
+++ b/repo/js/AutoHoeingOneDragon/pathing/0-传奇/007枫丹利亚姆 传奇 高危.json	
@@ -0,0 +1,76 @@
+{
+  "info": {
+    "authors": [
+      {
+        "links": "",
+        "name": "思"
+      }
+    ],
+    "bgi_version": "0.45.0",
+    "description": "  路线信息：该路线预计用时139.76秒，预计收入3000摩拉，包含以下怪物：3只精英传奇倍率五。",
+    "enable_monster_loot_split": false,
+    "last_modified_time": 1768131656960,
+    "map_match_method": "",
+    "map_name": "Teyvat",
+    "name": "007枫丹利亚姆 传奇 高危",
+    "tags": [],
+    "type": "collect",
+    "version": "1.0"
+  },
+  "positions": [
+    {
+      "action": "",
+      "action_params": "",
+      "id": 1,
+      "move_mode": "dash",
+      "type": "teleport",
+      "x": 3035.6297000135746,
+      "y": 3727.409085358373
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 2,
+      "move_mode": "dash",
+      "type": "path",
+      "x": 3010.000976473055,
+      "y": 3737.7504623063323
+    },
+    {
+      "action": "stop_flying",
+      "action_params": "100",
+      "id": 3,
+      "move_mode": "fly",
+      "type": "path",
+      "x": 2982.74728757485,
+      "y": 3750.5017567640625
+    },
+    {
+      "action": "",
+      "action_params": "",
+      "id": 4,
+      "move_mode": "dash",
+      "type": "path",
+      "x": 2945.2156915976648,
+      "y": 3767.9241756984793
+    },
+    {
+      "action": "stop_flying",
+      "action_params": "100",
+      "id": 5,
+      "move_mode": "fly",
+      "type": "path",
+      "x": 2898.4965280958077,
+      "y": 3770.9940824789483
+    },
+    {
+      "action": "fight",
+      "action_params": "",
+      "id": 6,
+      "move_mode": "dash",
+      "type": "path",
+      "x": 2896.25,
+      "y": 3779.0001849225337
+    }
+  ]
+}
\ No newline at end of file
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A001蒙德奔狼领.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A001蒙德奔狼领.json
index 97982f989..4ec9a2a9a 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A001蒙德奔狼领.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A001蒙德奔狼领.json
@@ -35,7 +35,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(0.99),wait(0.49),j,w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;帝君 w(0.99),wait(0.49),j,w(1);爱可菲 e;",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
@@ -89,7 +89,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1.01),j,wait(5),j,w(1);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;帝君 w(1.01),j,wait(5),j,w(1);爱可菲 e;",
       "id": 8,
       "move_mode": "dash",
       "type": "path",
@@ -179,7 +179,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(6.5),w(1.01);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(6.5),w(1.01);爱可菲 e;",
       "id": 18,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A002蒙德塞西莉亚苗圃.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A002蒙德塞西莉亚苗圃.json
index cebaec92d..e85096ee0 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A002蒙德塞西莉亚苗圃.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A002蒙德塞西莉亚苗圃.json
@@ -251,7 +251,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(3),j,wait(8),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;天动万象 w(3),j,wait(8),w(1);爱可菲 e;",
       "id": 26,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A003蒙德望风山地.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A003蒙德望风山地.json
index 04352df62..ea10ac1f0 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A003蒙德望风山地.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A003蒙德望风山地.json
@@ -233,7 +233,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;摩拉克斯 j,wait(5),w(2);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;天动万象 j,wait(5),w(2);爱可菲 e;",
       "id": 24,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A005蒙德望风角.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A005蒙德望风角.json
index 898d9daf7..5acd687fb 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A005蒙德望风角.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A005蒙德望风角.json
@@ -107,7 +107,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(8),j,w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;拒收病婿 w(1),j,wait(8),j,w(1);爱可菲 e;",
       "id": 10,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A006蒙德千风西.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A006蒙德千风西.json
index b9aa22310..6820382cf 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A006蒙德千风西.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/A006蒙德千风西.json
@@ -53,7 +53,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1.6),j,wait(5.3),w(1.1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;岩王帝君 w(1.6),j,wait(5.3),w(1.1);爱可菲 e;",
       "id": 4,
       "move_mode": "dash",
       "type": "path",
@@ -179,7 +179,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1.9),j,wait(3),w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;岩王爷 w(1.9),j,wait(3),w(1);爱可菲 e;",
       "id": 18,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B002璃月遁玉陵.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B002璃月遁玉陵.json
index 259725712..01e0502d3 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B002璃月遁玉陵.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B002璃月遁玉陵.json
@@ -125,7 +125,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.2),w(1.3);爱可菲 e;万叶 q;",
+      "action_params": "keypress(f);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;岩神 w(1),j,wait(5.2),w(1.3);爱可菲 e;万叶 q;",
       "id": 12,
       "move_mode": "dash",
       "type": "path",
@@ -152,7 +152,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(0.8),j,wait(6),w(1);爱可菲 e;",
+      "action_params": "keypress(f);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;摩拉克斯 w(0.8),j,wait(6),w(1);爱可菲 e;",
       "id": 15,
       "move_mode": "dash",
       "type": "path",
@@ -179,7 +179,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.2),j,wait(6),w(0.8);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1.2),j,wait(6),w(0.8);爱可菲 e;",
       "id": 18,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B006璃月港东北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B006璃月港东北.json
index f2769d7d0..5c15429b2 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B006璃月港东北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B006璃月港东北.json
@@ -35,7 +35,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(0.99),j,wait(3.5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;岩王帝君 w(0.99),j,wait(3.5),w(1);爱可菲 e;",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
@@ -98,7 +98,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.4),j,wait(4.8),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟师傅 w(1.4),j,wait(4.8),w(1);爱可菲 e;",
       "id": 9,
       "move_mode": "dash",
       "type": "path",
@@ -125,7 +125,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.1),j,w(1.9);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;岩王帝君 w(1),j,wait(5.1),j,w(1.9);爱可菲 e;",
       "id": 12,
       "move_mode": "dash",
       "type": "path",
@@ -170,7 +170,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;Zhongli w(1),j,wait(5),w(1);爱可菲 e;",
       "id": 17,
       "move_mode": "dash",
       "type": "path",
@@ -224,7 +224,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.1),j,wait(5.2),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1.1),j,wait(5.2),w(1);爱可菲 e;",
       "id": 23,
       "move_mode": "dash",
       "type": "path",
@@ -305,7 +305,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.1),j,wait(.1),j,j,w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;未来可期 w(1.1),j,wait(.1),j,j,w(1);爱可菲 e;",
       "id": 32,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B007璃月云来海孤云阁.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B007璃月云来海孤云阁.json
index 1858cdafa..b67398a74 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B007璃月云来海孤云阁.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B007璃月云来海孤云阁.json
@@ -39,7 +39,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.2),w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;天动万象 w(1),j,wait(5.2),w(1);爱可菲 e;",
       "id": 3,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B008璃月琼玑野瑶光滩西北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B008璃月琼玑野瑶光滩西北.json
index 38dbccd3f..c889e6811 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B008璃月琼玑野瑶光滩西北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B008璃月琼玑野瑶光滩西北.json
@@ -60,7 +60,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1.1),j,wait(5.6),w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟师傅 w(1.1),j,wait(5.6),w(1);爱可菲 e;",
       "id": 5,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B009璃月瑶光滩西北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B009璃月瑶光滩西北.json
index eb0869e2a..c1b006516 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B009璃月瑶光滩西北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B009璃月瑶光滩西北.json
@@ -132,7 +132,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.1),j,wait(5.2),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;Zhongli w(1.1),j,wait(5.2),w(1);爱可菲 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B010璃月明蕴镇西北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B010璃月明蕴镇西北.json
index 962ac556b..72736bb45 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B010璃月明蕴镇西北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B010璃月明蕴镇西北.json
@@ -40,7 +40,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1.2),j,wait(5.3),w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;岩王帝君 w(1.2),j,wait(5.3),w(1);爱可菲 e;",
       "id": 3,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B012璃月无妄坡西南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B012璃月无妄坡西南.json
index 305c61201..dc3d5dfc2 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B012璃月无妄坡西南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/B012璃月无妄坡西南.json
@@ -187,7 +187,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),j,w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;帝君 w(1),j,wait(5),j,w(1);爱可菲 e;",
       "id": 19,
       "move_mode": "dash",
       "type": "path",
@@ -223,7 +223,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),j,w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;岩王帝君 w(1),j,wait(5),j,w(1);爱可菲 e;",
       "id": 23,
       "move_mode": "dash",
       "type": "path",
@@ -250,7 +250,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5),j,w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;拒收病婿 w(1),j,wait(5),j,w(1);爱可菲 e;",
       "id": 26,
       "move_mode": "dash",
       "type": "path",
@@ -331,7 +331,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1.2),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;岩王帝君 w(1.2),j,wait(5),w(1);爱可菲 e;",
       "id": 35,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C004稻妻绀田村.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C004稻妻绀田村.json
index 72a0c9211..1d0668eb0 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C004稻妻绀田村.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C004稻妻绀田村.json
@@ -62,7 +62,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.4),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟师傅 w(1.4),j,wait(5),w(1);爱可菲 e;",
       "id": 5,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C008高危稻妻踏鞴反应炉东三骗骗花.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C008高危稻妻踏鞴反应炉东三骗骗花.json
index c22689637..85cbc42cb 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C008高危稻妻踏鞴反应炉东三骗骗花.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C008高危稻妻踏鞴反应炉东三骗骗花.json
@@ -44,7 +44,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.5);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.3),w(1);爱可菲 e;",
+      "action_params": "attack(0.5);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5.3),w(1);爱可菲 e;",
       "id": 3,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C011稻妻借景之馆.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C011稻妻借景之馆.json
index ab9f8237d..e8b3f7ea1 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C011稻妻借景之馆.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C011稻妻借景之馆.json
@@ -35,7 +35,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1.2);爱可菲 e;wait(2)",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;未来可期 w(1),j,wait(5),w(1.2);爱可菲 e;wait(2)",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C013稻妻公义飞萤.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C013稻妻公义飞萤.json
index 5112b4d09..c4192e394 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C013稻妻公义飞萤.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C013稻妻公义飞萤.json
@@ -53,7 +53,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.1),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;未来可期 w(1.1),j,wait(5),w(1);爱可菲 e;",
       "id": 4,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C015稻妻名椎滩西.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C015稻妻名椎滩西.json
index 33a60ed3f..7e4553da6 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C015稻妻名椎滩西.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C015稻妻名椎滩西.json
@@ -35,7 +35,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1.2);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;岩王帝君 w(1),j,wait(5),w(1.2);爱可菲 e;",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C016稻妻绯木村神像.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C016稻妻绯木村神像.json
index 9dd75dd1a..78897b5f4 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C016稻妻绯木村神像.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C016稻妻绯木村神像.json
@@ -161,7 +161,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.5),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;拒收病婿 w(1.5),j,wait(5),w(1);爱可菲 e;",
       "id": 16,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C017稻妻藤兜砦西.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C017稻妻藤兜砦西.json
index 10a0c609a..5b7c6cabe 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C017稻妻藤兜砦西.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C017稻妻藤兜砦西.json
@@ -125,7 +125,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.7),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;岩神 w(1.7),j,wait(5),w(1);爱可菲 e;",
       "id": 12,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C019稻妻剑鬼东.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C019稻妻剑鬼东.json
index 6e5e81698..0548fad11 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C019稻妻剑鬼东.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C019稻妻剑鬼东.json
@@ -62,7 +62,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1.6);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;未来可期 w(1),j,wait(5),w(1.6);爱可菲 e;",
       "id": 5,
       "move_mode": "dash",
       "type": "path",
@@ -215,7 +215,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.3),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;帝君 w(1),j,wait(5.3),w(1);爱可菲 e;",
       "id": 22,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C023稻妻海祇岛东南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C023稻妻海祇岛东南.json
index d8dee5735..a43aae6da 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C023稻妻海祇岛东南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C023稻妻海祇岛东南.json
@@ -71,7 +71,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1.2);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;Zhongli w(1),j,wait(5),w(1.2);爱可菲 e;",
       "id": 6,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C024稻妻海祇岛南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C024稻妻海祇岛南.json
index 0dabdf00b..181e4ae59 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C024稻妻海祇岛南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C024稻妻海祇岛南.json
@@ -143,7 +143,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": ";茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,j,wait(5),w(1);爱可菲 e",
+      "action_params": ";茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;未来可期 w(1),j,j,wait(5),w(1);爱可菲 e",
       "id": 14,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C028稻妻神里屋敷.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C028稻妻神里屋敷.json
index b7009f5b1..5995a95e4 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C028稻妻神里屋敷.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C028稻妻神里屋敷.json
@@ -116,7 +116,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1),keypress(o);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;Zhongli w(1),j,wait(5),w(1),keypress(o);爱可菲 e;",
       "id": 11,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C031稻妻越石村.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C031稻妻越石村.json
index 2622b04a5..14c3530d7 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C031稻妻越石村.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C031稻妻越石村.json
@@ -89,7 +89,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.3),w(1);爱可菲 e;wait(1)",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;未来可期 w(1),j,wait(5.3),w(1);爱可菲 e;wait(1)",
       "id": 8,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C032稻妻平海砦南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C032稻妻平海砦南.json
index 8117e6f08..2467ab4dd 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C032稻妻平海砦南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C032稻妻平海砦南.json
@@ -134,7 +134,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),j,w(1);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;天动万象 w(1),j,wait(5),j,w(1);爱可菲 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C036稻妻天云峠东北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C036稻妻天云峠东北.json
index 7d42927f1..7cbbfb079 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C036稻妻天云峠东北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C036稻妻天云峠东北.json
@@ -133,7 +133,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.2),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;帝君 w(1),j,wait(5.2),w(1);爱可菲 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
@@ -142,7 +142,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1),keydown(l);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;天动万象 w(1),j,wait(5),w(1),keydown(l);爱可菲 e;",
       "id": 14,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C037稻妻天云峠东.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C037稻妻天云峠东.json
index 5a29894cf..6f8174c06 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C037稻妻天云峠东.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C037稻妻天云峠东.json
@@ -124,7 +124,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.3),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1.3),j,wait(5),w(1);爱可菲 e;",
       "id": 12,
       "move_mode": "dash",
       "type": "path",
@@ -169,7 +169,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),keypress(c),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;岩神 w(1),j,wait(5),keypress(c),w(1);爱可菲 e;",
       "id": 17,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C038稻妻天云峠南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C038稻妻天云峠南.json
index cd8d2e92a..6d2435b4c 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C038稻妻天云峠南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C038稻妻天云峠南.json
@@ -88,7 +88,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.2),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;岩神 w(1),j,wait(5.2),w(1);爱可菲 e;",
       "id": 8,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C039稻妻天云峠西.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C039稻妻天云峠西.json
index a9117c38b..c66f6afda 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C039稻妻天云峠西.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/C039稻妻天云峠西.json
@@ -268,7 +268,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.1),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;Zhongli w(1.1),j,wait(5),w(1);爱可菲 e;",
       "id": 28,
       "move_mode": "dash",
       "type": "path",
@@ -295,7 +295,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1.3);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;Zhongli w(1),j,wait(5),w(1.3);爱可菲 e;",
       "id": 31,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/D001高危须弥二净甸.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/D001高危须弥二净甸.json
index f3f30eb23..1fe149b08 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/D001高危须弥二净甸.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/D001高危须弥二净甸.json
@@ -260,7 +260,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5.2),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;未来可期 w(1),j,wait(5.2),w(1);爱可菲 e;",
       "id": 27,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E002枫丹廷北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E002枫丹廷北.json
index edaadfa79..d43134683 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E002枫丹廷北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E002枫丹廷北.json
@@ -71,7 +71,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.1),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟师傅 w(1),j,wait(5.1),w(1);爱可菲 e;",
       "id": 6,
       "move_mode": "dash",
       "type": "path",
@@ -80,7 +80,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.2),j,wait(5.3),w(1);爱可菲 e;wait(6)",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟师傅 w(1.2),j,wait(5.3),w(1);爱可菲 e;wait(6)",
       "id": 7,
       "move_mode": "dash",
       "type": "path",
@@ -125,7 +125,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.5);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),keypress(c),w(1);爱可菲 e;",
+      "action_params": "attack(0.5);伊涅芙 e;芙宁娜 e;钟师傅 w(1),j,wait(5),keypress(c),w(1);爱可菲 e;",
       "id": 12,
       "move_mode": "dash",
       "type": "path",
@@ -134,7 +134,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.5);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),w(1.1);爱可菲 e;",
+      "action_params": "attack(0.5);伊涅芙 e;芙宁娜 e;岩神 w(1),j,wait(5),w(1.1);爱可菲 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E003枫丹场力北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E003枫丹场力北.json
index f70006cbc..d30b3fee5 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E003枫丹场力北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E003枫丹场力北.json
@@ -125,7 +125,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),j,w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;岩王帝君 w(1),j,wait(5),j,w(1);爱可菲 e;",
       "id": 12,
       "move_mode": "dash",
       "type": "path",
@@ -179,7 +179,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.3),w(1);爱可菲 e;wait(5)",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5.3),w(1);爱可菲 e;wait(5)",
       "id": 18,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E004枫丹新科学院.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E004枫丹新科学院.json
index 74f228f12..5421970da 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E004枫丹新科学院.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E004枫丹新科学院.json
@@ -53,7 +53,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.1),w(1);爱可菲 e;",
+      "action_params": "伊涅芙 e;芙宁娜 e;岩神 w(1),j,wait(5.1),w(1);爱可菲 e;",
       "id": 4,
       "move_mode": "dash",
       "type": "path",
@@ -80,7 +80,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),keypress(c),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5),keypress(c),w(1);爱可菲 e;",
       "id": 7,
       "move_mode": "dash",
       "type": "path",
@@ -188,7 +188,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,keypress(l),wait(5),w(1);爱可菲 e;wait(1.2),keypress(1),wait(0.2),e,q,wait(1.2),keypress(2),wait(0.2),e,q,wait(1.2),keypress(3),wait(0.2),e,q,wait(1.2),keypress(4),wait(0.2),e,q,",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;拒收病婿 w(1),j,keypress(l),wait(5),w(1);爱可菲 e;wait(1.2),keypress(1),wait(0.2),e,q,wait(1.2),keypress(2),wait(0.2),e,q,wait(1.2),keypress(3),wait(0.2),e,q,wait(1.2),keypress(4),wait(0.2),e,q,",
       "id": 19,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E009枫丹垂柳西北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E009枫丹垂柳西北.json
index f6a0c8da4..f0bc65e30 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E009枫丹垂柳西北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E009枫丹垂柳西北.json
@@ -44,7 +44,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.1),j,w(1);爱可菲 e;wait(3)",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5.1),j,w(1);爱可菲 e;wait(3)",
       "id": 3,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E011枫丹垂柳东南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E011枫丹垂柳东南.json
index 2376aae0f..6edca959e 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E011枫丹垂柳东南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E011枫丹垂柳东南.json
@@ -89,7 +89,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1.5),j,keypress(c),wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟师傅 w(1.5),j,keypress(c),wait(5),w(1);爱可菲 e;",
       "id": 8,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E013枫丹柔灯港北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E013枫丹柔灯港北.json
index edda96d7b..cabdbafb1 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E013枫丹柔灯港北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E013枫丹柔灯港北.json
@@ -134,7 +134,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5),j,w(1.3);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;Zhongli w(1),j,wait(5),j,w(1.3);爱可菲 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E019枫丹卡布堡北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E019枫丹卡布堡北.json
index badcfd45d..fd0147a98 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E019枫丹卡布堡北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E019枫丹卡布堡北.json
@@ -107,7 +107,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.2),w(1);爱可菲 e;wait(6)",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;天动万象 w(1),j,wait(5.2),w(1);爱可菲 e;wait(6)",
       "id": 10,
       "move_mode": "dash",
       "type": "path",
@@ -143,7 +143,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1.4),j,wait(5.9),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;天动万象 w(1.4),j,wait(5.9),w(1);爱可菲 e;",
       "id": 14,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E020枫丹卡布堡南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E020枫丹卡布堡南.json
index 401459d50..83b58c7d4 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E020枫丹卡布堡南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E020枫丹卡布堡南.json
@@ -98,7 +98,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.8),w(1.8);爱可菲 e;",
+      "action_params": "attack(0.3);茜特菈莉 e;莱依拉 e;伊涅芙 e;芙宁娜 e;Zhongli w(1),j,wait(5.8),w(1.8);爱可菲 e;",
       "id": 9,
       "move_mode": "walk",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E024枫丹螃蟹西.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E024枫丹螃蟹西.json
index b8ef6848b..0a4fa532f 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E024枫丹螃蟹西.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E024枫丹螃蟹西.json
@@ -134,7 +134,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.08),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;拒收病婿 w(1),j,wait(5.08),w(1);爱可菲 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E028枫丹场力东南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E028枫丹场力东南.json
index d2c80463b..ab6f8dd7f 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E028枫丹场力东南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E028枫丹场力东南.json
@@ -134,7 +134,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,,j,jwait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;拒收病婿 w(1),j,,j,jwait(5),w(1);爱可菲 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E029枫丹中央遗址北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E029枫丹中央遗址北.json
index c2ebac5cf..79f29c6ed 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E029枫丹中央遗址北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E029枫丹中央遗址北.json
@@ -35,7 +35,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.0),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;拒收病婿 w(1),j,wait(5.0),w(1);爱可菲 e;",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E031高危枫丹千年骏麟.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E031高危枫丹千年骏麟.json
index 3ab8711cb..36a5bfbd8 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E031高危枫丹千年骏麟.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/E031高危枫丹千年骏麟.json
@@ -98,7 +98,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1.34),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;天动万象 w(1.34),j,wait(5),w(1);爱可菲 e;",
       "id": 9,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F010纳塔坚岩隘谷隆崛坡.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F010纳塔坚岩隘谷隆崛坡.json
index e683b2e6c..eb24356d7 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F010纳塔坚岩隘谷隆崛坡.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F010纳塔坚岩隘谷隆崛坡.json
@@ -47,7 +47,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.2);芙宁娜 e;摩拉克斯 w(1),j,wait(5.10),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "attack(0.2);芙宁娜 e;钟离 w(1),j,wait(5.10),w(1);爱可菲 e;伊涅芙 e;",
       "id": 3,
       "move_mode": "dash",
       "type": "path",
@@ -92,7 +92,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "wait(1);芙宁娜 e;钟离 w(1),j,wait(5),w(1.10);爱可菲 e;伊涅芙 e;",
+      "action_params": "wait(1);芙宁娜 e;岩王帝君 w(1),j,wait(5),w(1.10);爱可菲 e;伊涅芙 e;",
       "id": 8,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F017纳塔坚岩隘谷硫晶支脉.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F017纳塔坚岩隘谷硫晶支脉.json
index e8ce36bca..66bf4db91 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F017纳塔坚岩隘谷硫晶支脉.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F017纳塔坚岩隘谷硫晶支脉.json
@@ -127,7 +127,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.2);芙宁娜 e;钟离 w(1.8),j,wait(5),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "attack(0.2);芙宁娜 e;岩王帝君 w(1.8),j,wait(5),w(1);爱可菲 e;伊涅芙 e;",
       "id": 12,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F025纳塔镜璧山中部.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F025纳塔镜璧山中部.json
index 28f266ae9..bd6589e28 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F025纳塔镜璧山中部.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F025纳塔镜璧山中部.json
@@ -38,7 +38,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);芙宁娜 e;钟离 w(1),j,wait(5),keydown(l),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "keypress(f);芙宁娜 e;钟师傅 w(1),j,wait(5),keydown(l),w(1);爱可菲 e;伊涅芙 e;",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F027纳塔翘枝崖神像.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F027纳塔翘枝崖神像.json
index b55af3bcd..7b9a79a28 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F027纳塔翘枝崖神像.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F027纳塔翘枝崖神像.json
@@ -37,7 +37,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.2);伊涅芙 e;芙宁娜 e;钟离 w(1.8),j,wait(5),w(1);爱可菲 e;",
+      "action_params": "attack(0.2);伊涅芙 e;芙宁娜 e;拒收病婿 w(1.8),j,wait(5),w(1);爱可菲 e;",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
@@ -145,7 +145,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.00),w(1);爱可菲 e;",
+      "action_params": "keypress(f);伊涅芙 e;芙宁娜 e;岩王爷 w(1),j,wait(5.00),w(1);爱可菲 e;",
       "id": 14,
       "move_mode": "jump",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F031纳塔奥奇西北海岸.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F031纳塔奥奇西北海岸.json
index f7f833b4e..144dd36c0 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F031纳塔奥奇西北海岸.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F031纳塔奥奇西北海岸.json
@@ -38,7 +38,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);芙宁娜 e;钟离 w(1),j,wait(5.2),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "keypress(f);芙宁娜 e;摩拉克斯 w(1),j,wait(5.2),w(1);爱可菲 e;伊涅芙 e;",
       "id": 2,
       "move_mode": "fly",
       "type": "orientation",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F032纳塔奥奇东北岛屿.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F032纳塔奥奇东北岛屿.json
index b9fa7057b..0a6c20061 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F032纳塔奥奇东北岛屿.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F032纳塔奥奇东北岛屿.json
@@ -135,7 +135,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(x);茜特菈莉 e,wait(0.5),attack,wait(0.5),e;伊涅芙 e;芙宁娜 e;钟离 w(1.3),j,wait(5),w(1);爱可菲 e;wait(1)",
+      "action_params": "keypress(x);茜特菈莉 e,wait(0.5),attack,wait(0.5),e;伊涅芙 e;芙宁娜 e;未来可期 w(1.3),j,wait(5),w(1);爱可菲 e;wait(1)",
       "id": 13,
       "move_mode": "walk",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F050纳塔安饶之野镜壁山东南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F050纳塔安饶之野镜壁山东南.json
index 08c4f5412..d9ef2b738 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F050纳塔安饶之野镜壁山东南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F050纳塔安饶之野镜壁山东南.json
@@ -44,7 +44,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);芙宁娜 e;钟离 w(1),j,wait(5),w(1.02);爱可菲 e;伊涅芙 e;",
+      "action_params": "attack(0.3);芙宁娜 e;岩王爷 w(1),j,wait(5),w(1.02);爱可菲 e;伊涅芙 e;",
       "id": 3,
       "move_mode": "dash",
       "type": "path",
@@ -269,7 +269,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);芙宁娜 e;钟离 w(1),j,wait(5.05),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "attack(0.3);芙宁娜 e;天动万象 w(1),j,wait(5.05),w(1);爱可菲 e;伊涅芙 e;",
       "id": 28,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F054纳塔镜璧山西海岸.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F054纳塔镜璧山西海岸.json
index 4577c92cc..deed02d2a 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F054纳塔镜璧山西海岸.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F054纳塔镜璧山西海岸.json
@@ -110,7 +110,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "wait(2);芙宁娜 e;钟离 w(1),j,wait(5),w(1.11);爱可菲 e;伊涅芙 e;",
+      "action_params": "wait(2);芙宁娜 e;天动万象 w(1),j,wait(5),w(1.11);爱可菲 e;伊涅芙 e;",
       "id": 10,
       "move_mode": "walk",
       "type": "path",
@@ -146,7 +146,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);芙宁娜 e;钟离 w(1),j,wait(5),j,j,j,w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "keypress(f);芙宁娜 e;摩拉克斯 w(1),j,wait(5),j,j,j,w(1);爱可菲 e;伊涅芙 e;",
       "id": 14,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F055纳塔浮羽之湾北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F055纳塔浮羽之湾北.json
index cc9bc87c0..773a869d6 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F055纳塔浮羽之湾北.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F055纳塔浮羽之湾北.json
@@ -30,7 +30,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);芙宁娜 e;钟离 w(1),j,j,wait(5),j,w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "keypress(f);芙宁娜 e;岩王爷 w(1),j,j,wait(5),j,w(1);爱可菲 e;伊涅芙 e;",
       "id": 2,
       "move_mode": "walk",
       "type": "orientation",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F056纳塔浮羽之湾南.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F056纳塔浮羽之湾南.json
index e7e61db0f..e80e397af 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F056纳塔浮羽之湾南.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F056纳塔浮羽之湾南.json
@@ -30,7 +30,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);芙宁娜 e;钟离 w(1),j,wait(5.08),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "keypress(f);芙宁娜 e;未来可期 w(1),j,wait(5.08),w(1);爱可菲 e;伊涅芙 e;",
       "id": 2,
       "move_mode": "dash",
       "type": "path",
@@ -93,7 +93,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);芙宁娜 e;钟离 w(1),j,wait(5.09),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "keypress(f);芙宁娜 e;摩拉克斯 w(1),j,wait(5.09),w(1);爱可菲 e;伊涅芙 e;",
       "id": 9,
       "move_mode": "walk",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F061纳塔安饶之野东北海岸.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F061纳塔安饶之野东北海岸.json
index d72f22388..2a3d8cdd7 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F061纳塔安饶之野东北海岸.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F061纳塔安饶之野东北海岸.json
@@ -152,7 +152,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);芙宁娜 e;钟离 w(1),j,j,wait(5.2),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "attack(0.3);芙宁娜 e;Zhongli w(1),j,j,wait(5.2),w(1);爱可菲 e;伊涅芙 e;",
       "id": 15,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F072纳塔涌流地东侧小岛.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F072纳塔涌流地东侧小岛.json
index a097c33f2..512bb24fb 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F072纳塔涌流地东侧小岛.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F072纳塔涌流地东侧小岛.json
@@ -182,7 +182,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "keypress(f);芙宁娜 e;钟离 w(1.09),j,wait(5.06),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "keypress(f);芙宁娜 e;钟师傅 w(1.09),j,wait(5.06),w(1);爱可菲 e;伊涅芙 e;",
       "id": 18,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F074纳塔踞石山彩石顶.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F074纳塔踞石山彩石顶.json
index d2271e4a6..aca8227fc 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F074纳塔踞石山彩石顶.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/F074纳塔踞石山彩石顶.json
@@ -83,7 +83,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);芙宁娜 e;钟离 w(1.19),j,wait(5),w(1);爱可菲 e;伊涅芙 e;",
+      "action_params": "attack(0.3);芙宁娜 e;岩神 w(1.19),j,wait(5),w(1);爱可菲 e;伊涅芙 e;",
       "id": 7,
       "move_mode": "jump",
       "type": "path",
@@ -137,7 +137,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);芙宁娜 e;钟离 w(1),j,wait(5),w(1.3);爱可菲 e;伊涅芙 e;",
+      "action_params": "attack(0.3);芙宁娜 e;岩王爷 w(1),j,wait(5),w(1.3);爱可菲 e;伊涅芙 e;",
       "id": 13,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB002层岩地下主矿道东.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB002层岩地下主矿道东.json
index f1fb420da..ed6e551df 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB002层岩地下主矿道东.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB002层岩地下主矿道东.json
@@ -44,7 +44,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "wait(0.5);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5。6),w(1);爱可菲 e;",
+      "action_params": "wait(0.5);伊涅芙 e;芙宁娜 e;拒收病婿 w(1),j,wait(5。6),w(1);爱可菲 e;",
       "id": 3,
       "move_mode": "dash",
       "type": "path",
@@ -98,7 +98,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5.8),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟师傅 w(1),j,wait(5.8),w(1);爱可菲 e;",
       "id": 9,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB005璃月临时主矿道西.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB005璃月临时主矿道西.json
index 80438c86f..4430ac70a 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB005璃月临时主矿道西.json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB005璃月临时主矿道西.json
@@ -71,7 +71,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;摩拉克斯 w(1),j,wait(5。8),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;Zhongli w(1),j,wait(5。8),w(1);爱可菲 e;",
       "id": 6,
       "move_mode": "dash",
       "type": "path",
diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB007璃月巨渊主矿区(高危).json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB007璃月巨渊主矿区(高危).json
index 5743f4eea..e5e53aff8 100644
--- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB007璃月巨渊主矿区(高危).json
+++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/ZB007璃月巨渊主矿区(高危).json
@@ -71,7 +71,7 @@
     },
     {
       "action": "combat_script",
-      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟离 w(1),j,wait(5.6),w(1);爱可菲 e;",
+      "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;钟师傅 w(1),j,wait(5.6),w(1);爱可菲 e;",
       "id": 6,
       "move_mode": "walk",
       "type": "path",
diff --git a/repo/js/采集cd管理/main.js b/repo/js/采集cd管理/main.js
index 07ba8d867..cde409476 100644
--- a/repo/js/采集cd管理/main.js
+++ b/repo/js/采集cd管理/main.js
@@ -559,8 +559,13 @@ let checkInterval = +settings.checkInterval || 50;
                 "微光角菌": "46小时刷新",
                 "云岩裂叶": "46小时刷新",
                 "琉鳞石": "46小时刷新",
-                "奇异的「牙齿」": "46小时刷新",
                 "冬凌草": "46小时刷新",
+                "松珀香": "46小时刷新",
+                "月落银": "46小时刷新",
+                "便携轴承": "46小时刷新",
+                "霜盏花": "46小时刷新",
+                "冰雾花花朵": "46小时刷新",
+                "奇异的「牙齿」": "46小时刷新",
 
                 // 12h 素材
                 "兽肉": "12小时刷新",
@@ -619,23 +624,28 @@ let checkInterval = +settings.checkInterval || 50;
                 "汐藻": "1次0点刷新",
                 "茉洁草": "1次0点刷新",
                 "久雨莲": "1次0点刷新",
-                "沉玉仙茗": "24小时刷新",
                 "颗粒果": "1次0点刷新",
                 "烛伞蘑菇": "1次0点刷新",
                 "澄晶实": "1次0点刷新",
                 "红果果菇": "1次0点刷新",
+                "白灵果": "1次0点刷新",
+                "夏槲果": "1次0点刷新",
+                "宿影花": "1次0点刷新",
                 "马尾": "1次0点刷新",
+                "苦种": "1次0点刷新",
+                "烬芯花": "1次0点刷新",
                 "烈焰花花蕊": "1次0点刷新",
                 "铁块": "1次0点刷新",
                 "白铁块": "2次0点刷新",
                 "星银矿石": "2次0点刷新",
+                "电气水晶": "2次0点刷新",
                 "水晶块": "3次0点刷新",
                 "紫晶块": "3次0点刷新",
                 "萃凝晶": "3次0点刷新",
                 "虹滴晶": "3次0点刷新",
-                "苦种": "1次0点刷新",
-                "烬芯花": "1次0点刷新"
+                "沉玉仙茗": "24小时刷新"
             };
+
             const runOnce = [];
             /* ---------- 3. 主循环 ---------- */
             while (priorityList.length > 0) {
@@ -1448,7 +1458,7 @@ async function checkItemFullAndOCR() {
         blacklistSet.add(n);
         blacklist.push(n);
     }
-    await loadBlacklist(false);
+    await loadBlacklist(true);
 }
 
 // 加载拾取物图片
diff --git a/repo/js/采集cd管理/manifest.json b/repo/js/采集cd管理/manifest.json
index 3e71fbe1c..d25d1cc88 100644
--- a/repo/js/采集cd管理/manifest.json
+++ b/repo/js/采集cd管理/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "采集cd管理",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "bgi_version": "0.44.8",
   "description": "仅面对会操作文件和读readme的用户，基于文件夹操作自动管理采集路线的cd，会按照路径组的顺序依次运行，直到指定的时间，并会按照给定的cd类型，自动跳过未刷新的路线",
   "saved_files": [
diff --git a/repo/js/采集cd管理/采集物cd类型（感谢群u整理）.xlsx b/repo/js/采集cd管理/采集物cd类型（感谢群u整理）.xlsx
index 46ba424a0..cdea284d8 100644
Binary files a/repo/js/采集cd管理/采集物cd类型（感谢群u整理）.xlsx and b/repo/js/采集cd管理/采集物cd类型（感谢群u整理）.xlsx differ