Merge pull request #1 from alec-deng/patch-1

Patch 1
2025-01-05 22:43:10 -05:00
parent 7785d51fda fa8c414d7f
commit 1bade50169
20 changed files with 141 additions and 56 deletions
--- a/repo.json
+++ b/repo.json
@@ -1,5 +1,5 @@
 {
-  "time": "20250105180105",
+  "time": "20250106110502",
  "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip",
  "file": "repo.json",
  "indexes": [
@@ -6825,8 +6825,8 @@
                {
                  "name": "【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json",
                  "type": "file",
-                  "hash": "3c5e68447daa7a267e18232e667e4c39b71e89cd",
-                  "version": "3c5e684",
+                  "hash": "2618de6095cf77f593fd0d96a309d7ea27327f7f",
+                  "version": "2618de6",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -7629,8 +7629,8 @@
                {
                  "name": "【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json",
                  "type": "file",
-                  "hash": "17c572758f4116fb57d768bf629e3f8af3739dab",
-                  "version": "17c5727",
+                  "hash": "2f94dafc2c74d4bd925bc89a3790301332d559f3",
+                  "version": "2f94daf",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -7879,8 +7879,8 @@
                {
                  "name": "狗粮-枫丹-研究院区-西北-6个／7个.json",
                  "type": "file",
-                  "hash": "3b21601f0b0dea2daa25ddff4c583766cc6711e9",
-                  "version": "3b21601",
+                  "hash": "793d81f4ef9aa401b84fd08868a6176e39373325",
+                  "version": "793d81f",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -7912,8 +7912,8 @@
                {
                  "name": "狗粮-枫丹-黎翡区-七天神像-3个／5个.json",
                  "type": "file",
-                  "hash": "e7916e34b83047c52b86f0586fdc01fa63b67260",
-                  "version": "e7916e3",
+                  "hash": "cc992d6efc45fe45235050fc4ed94e29a850d133",
+                  "version": "cc992d6",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -7956,8 +7956,8 @@
                {
                  "name": "狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json",
                  "type": "file",
-                  "hash": "361e6634476be4003584a8a6bcf65928ce0965e1",
-                  "version": "361e663",
+                  "hash": "9bc1ae9905db477271d6657c437473127065be97",
+                  "version": "9bc1ae9",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -7989,8 +7989,8 @@
                {
                  "name": "狗粮-稻妻-清籁岛-越石村-8个-f.json",
                  "type": "file",
-                  "hash": "5b2bd9063c603132deee6b31b66e49861a76c7a8",
-                  "version": "5b2bd90",
+                  "hash": "3736dd449387b1d2482ecbeb5ebb435021464312",
+                  "version": "3736dd4",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -8011,8 +8011,8 @@
                {
                  "name": "狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json",
                  "type": "file",
-                  "hash": "5214f69d527cfade535dd6541c8866de4214e795",
-                  "version": "5214f69",
+                  "hash": "7a86318b304f99a32df5340c7b91bc2a911d4b3e",
+                  "version": "7a86318",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -8127,8 +8127,8 @@
                {
                  "name": "【额外】狗粮-纳塔-鸡屁股+7个-f.json",
                  "type": "file",
-                  "hash": "76be817fef7161f9bb420add2261dc22f5354a63",
-                  "version": "76be817",
+                  "hash": "d329e8e768cce7236f5eb237f6775e31a1563c2c",
+                  "version": "d329e8e",
                  "author": "Yang-z",
                  "description": "",
                  "tags": [
@@ -12658,8 +12658,8 @@
        {
          "name": "AutoArtifacts_A_B_Extra",
          "type": "directory",
-          "hash": "67f86b14578b2537c0cc2870686e1d131df2585e",
-          "version": "2.0.3",
+          "hash": "9169bce6e2a1b43ff74c435a6f0cc4d7457937b1",
+          "version": "2.0.4",
          "author": "Yang-z",
          "description": "狗粮ABE路线，自动拾取分解~|~圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。",
          "tags": []
@@ -13880,6 +13880,20 @@
            "琴"
          ]
        },
+        {
+          "name": "钟玛芙闲.txt",
+          "type": "file",
+          "hash": "da6022c75250f25c65c2094ef3092bbb5b16c0d8",
+          "version": "da6022c",
+          "author": "",
+          "description": "",
+          "tags": [
+            "钟离",
+            "玛薇卡",
+            "芙宁娜",
+            "闲云"
+          ]
+        },
        {
          "name": "钟离八重万叶白术.txt",
          "type": "file",
--- a/repo/combat/火神蒸发.txt
+++ b/repo/combat/火神蒸发.txt
@@ -0,0 +1,15 @@
+// 作者：夜雨轩烛
+// 描述：全自动妥协火神蒸发配队，携带钟离确保流程稳定性，生存位可选闲云/琴/白术/夏洛蒂为全队回血，白术可能会影响火神蒸发，不建议携带。
+
+钟离 s(0.1),e(hold)
+玛薇卡 e
+琴 e,attack
+芙宁娜 e,attack(1),q
+
+琴 e,attack,q
+闲云 e,e,e,attack,q
+夏洛蒂 e,q
+白术 e,q
+
+玛薇卡 q,charge(7)
+钟离 attack
--- a/repo/combat/钟玛芙闲.txt
+++ b/repo/combat/钟玛芙闲.txt
@@ -1,8 +0,0 @@
-// 作者：夜雨轩烛
-// 描述：全自动妥协配队，携带钟离确保流程稳定性，闲云可以给水神提供群奶，并且在火神q前3e追怪确保命中
-
-钟离 s(0.1),e(hold)
-玛薇卡 e
-芙宁娜 e,attack(1),q
-闲云 e,e,e,attack,q
-玛薇卡 q,charge(6)
--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json
@@ -90,7 +90,9 @@
            "y": -3724.44921875,
            "type": "target",
            "move_mode": "walk",
-            "action": "",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
+            "//": "stop_climbing",
            "#": "15"
        },
        
@@ -152,7 +154,9 @@
            "y": -3704.8525390625,
            "type": "target",
            "move_mode": "walk",
-            "action": "",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
+            "//": "stop_climbing",
            "#": "16"
        },
        
--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json
@@ -174,6 +174,7 @@
            "move_mode": "walk",
            "action": "combat_script",
            "action_params": "wait(0.2),keypress(x)",
+            "//": "stop_climbing",
            "#": "2"
        },
        {
--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json
@@ -164,6 +164,8 @@
            "y": 4912.71875,
            "type": "target",
            "move_mode": "walk",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
            "#": "5"
        },
        {
@@ -171,7 +173,8 @@
            "y": 4912.71875,
            "type": "target",
            "move_mode": "walk",
-            "action": "",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
            "#": "5"
        },

--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json
@@ -11,6 +11,12 @@
            "type": "teleport",
            "move_mode": "walk"
        },
+        {
+            "x": 4540.2578125,
+            "y": 4211.9921875,
+            "type": "path",
+            "move_mode": "run"
+        },
        {
            "x": 4532.91748046875,
            "y": 4206.62158203125,
--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json
@@ -61,7 +61,9 @@
            "y": -3702.8671875,
            "type": "path",
            "move_mode": "fly",
-            "action": "stop_flying",
+            "action": "combat_script",
+            "action_params": "keypress(VK_SPACE),wait(0.2),click,wait(0.2),keypress(x),wait(0.2),click",
+            "//": "stop_flying and stop_climbing",
            "#" : "2"
        },

--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json
@@ -28,8 +28,8 @@
        },

        {
-            "x": -3973.0400390625,
-            "y": -4440.087890625,
+            "x": -3975.2333984375,
+            "y": -4438.943359375,
            "type": "path",
            "move_mode": "walk"
        },
@@ -41,23 +41,31 @@
        },

        {
-            "x": -3982.2109375,
-            "y": -4437.1357421875,
+            "x": -3982.5927734375,
+            "y": -4437.373046875,
            "type": "target",
            "move_mode": "walk",
            "action": "",
            "#": "2"
        },
+        {
+            "x": -3982.5927734375,
+            "y": -4437.373046875,
+            "type": "target",
+            "move_mode": "walk",
+            "action": "",
+            "#": "2"
+        },
+
        {
            "x": -3982.3076171875,
            "y": -4437.13671875,
            "type": "path",
            "move_mode": "walk"
        },
-
        {
-            "x": -3975.26171875,
-            "y": -4439.369140625,
+            "x": -3980.82421875,
+            "y": -4437.59375,
            "type": "path",
            "move_mode": "walk"
        },
@@ -77,6 +85,12 @@
            "type": "path",
            "move_mode": "walk"
        },
+        {
+            "x": -3967.64453125,
+            "y": -4435.7802734375,
+            "type": "path",
+            "move_mode": "walk"
+        },

        {
            "x": -3965.724609375,
--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json
@@ -29,7 +29,9 @@
            "y": -3341.205078125,
            "type": "path",
            "move_mode": "fly",
-            "action": "stop_flying"
+            "action": "combat_script",
+            "action_params": "keypress(VK_SPACE),wait(0.5),click",
+            "//": "stop_flying"
        },
        {
            "x": -3531.95703125,
--- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json
@@ -185,8 +185,8 @@
            "move_mode": "run"
        },
        {
-            "x": 8143.2216796875,
-            "y": -1469.74072265625,
+            "x": 8143.83251953125,
+            "y": -1471.2744140625,
            "type": "target",
            "move_mode": "walk",
            "action": "",
--- a/repo/js/AutoArtifacts_A_B_Extra/manifest.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 1,
  "name": "狗粮ABE路线，自动拾取分解",
-  "version": "2.0.3",
+  "version": "2.0.4",
  "bgi_version": "0.38.1",
  "description": "圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。",
  "authors": [
--- a/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json
+++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/【收尾】狗粮-稻妻-神无冢-踏鞴砂③-8个／21个-f.json
@@ -90,7 +90,9 @@
            "y": -3724.44921875,
            "type": "target",
            "move_mode": "walk",
-            "action": "",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
+            "//": "stop_climbing",
            "#": "15"
        },
        
@@ -152,7 +154,9 @@
            "y": -3704.8525390625,
            "type": "target",
            "move_mode": "walk",
-            "action": "",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
+            "//": "stop_climbing",
            "#": "16"
        },
        
--- a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json
+++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json
@@ -174,6 +174,7 @@
            "move_mode": "walk",
            "action": "combat_script",
            "action_params": "wait(0.2),keypress(x)",
+            "//": "stop_climbing",
            "#": "2"
        },
        {
--- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json
+++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个／7个.json
@@ -164,6 +164,8 @@
            "y": 4912.71875,
            "type": "target",
            "move_mode": "walk",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
            "#": "5"
        },
        {
@@ -171,7 +173,8 @@
            "y": 4912.71875,
            "type": "target",
            "move_mode": "walk",
-            "action": "",
+            "action": "combat_script",
+            "action_params": "wait(0.2),keypress(x)",
            "#": "5"
        },

--- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json
+++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-黎翡区-七天神像-3个／5个.json
@@ -11,6 +11,12 @@
            "type": "teleport",
            "move_mode": "walk"
        },
+        {
+            "x": 4540.2578125,
+            "y": 4211.9921875,
+            "type": "path",
+            "move_mode": "run"
+        },
        {
            "x": 4532.91748046875,
            "y": 4206.62158203125,
--- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json
+++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-珊瑚宫东北-6个-f.json
@@ -61,7 +61,9 @@
            "y": -3702.8671875,
            "type": "path",
            "move_mode": "fly",
-            "action": "stop_flying",
+            "action": "combat_script",
+            "action_params": "keypress(VK_SPACE),wait(0.2),click,wait(0.2),keypress(x),wait(0.2),click",
+            "//": "stop_flying and stop_climbing",
            "#" : "2"
        },

--- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json
+++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-清籁岛-越石村-8个-f.json
@@ -28,8 +28,8 @@
        },

        {
-            "x": -3973.0400390625,
-            "y": -4440.087890625,
+            "x": -3975.2333984375,
+            "y": -4438.943359375,
            "type": "path",
            "move_mode": "walk"
        },
@@ -41,23 +41,31 @@
        },

        {
-            "x": -3982.2109375,
-            "y": -4437.1357421875,
+            "x": -3982.5927734375,
+            "y": -4437.373046875,
            "type": "target",
            "move_mode": "walk",
            "action": "",
            "#": "2"
        },
+        {
+            "x": -3982.5927734375,
+            "y": -4437.373046875,
+            "type": "target",
+            "move_mode": "walk",
+            "action": "",
+            "#": "2"
+        },
+
        {
            "x": -3982.3076171875,
            "y": -4437.13671875,
            "type": "path",
            "move_mode": "walk"
        },
-
        {
-            "x": -3975.26171875,
-            "y": -4439.369140625,
+            "x": -3980.82421875,
+            "y": -4437.59375,
            "type": "path",
            "move_mode": "walk"
        },
@@ -77,6 +85,12 @@
            "type": "path",
            "move_mode": "walk"
        },
+        {
+            "x": -3967.64453125,
+            "y": -4435.7802734375,
+            "type": "path",
+            "move_mode": "walk"
+        },

        {
            "x": -3965.724609375,
--- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json
+++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-九条阵屋-2个／3个-f.json
@@ -29,7 +29,9 @@
            "y": -3341.205078125,
            "type": "path",
            "move_mode": "fly",
-            "action": "stop_flying"
+            "action": "combat_script",
+            "action_params": "keypress(VK_SPACE),wait(0.5),click",
+            "//": "stop_flying"
        },
        {
            "x": -3531.95703125,
--- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json
+++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-鸡屁股+7个-f.json
@@ -185,8 +185,8 @@
            "move_mode": "run"
        },
        {
-            "x": 8143.2216796875,
-            "y": -1469.74072265625,
+            "x": 8143.83251953125,
+            "y": -1471.2744140625,
            "type": "target",
            "move_mode": "walk",
            "action": "",