fix ：JP activity explore story

pur1fying · Aug 22, 2024 · ae6cb37 · ae6cb37
1 parent 365bc07
commit ae6cb37
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/core/default_config.py b/core/default_config.py
@@ -642,7 +642,8 @@
             "レッドウインター連邦学園",
             "百鬼夜行中心部",
             "D.U.シラトリ区",
-            "山海経中央特区"
+            "山海経中央特区",
+            "春葉原"
           ]
     },
     "current_game_activity": {

diff --git a/module/activities/Moonlight Dream.py b/module/activities/Moonlight Dream.py
@@ -152,9 +152,12 @@ def start_story(self):
         "formation_edit1",
         "reward_acquired"
     ]
-    img_ends = "plot_formation-edit"
+    img_ends = [
+        "plot_formation-edit",
+        "activity_unit-formation",
+    ]
     res = picture.co_detect(self, rgb_ends, None, img_ends, img_possibles, skip_first_screenshot=True)
-    if res == "formation_edit1" or res == "plot_formation-edit":
+    if res == "formation_edit1" or res == "plot_formation-edit" or res == "activity_unit-formation":
         start_fight(self, 1)
         main_story.auto_fight(self)
     elif res == "reward_acquired":
@@ -167,7 +170,8 @@ def start_fight(self, i):
         "formation_edit" + str(i): (1156, 659)
     }
     img_possibles = {
-        "plot_formation-edit": (1156, 659)
+        "plot_formation-edit": (1156, 659),
+        "activity_unit-formation": (1156, 659),
     }
     rgb_ends = "fighting_feature"
     picture.co_detect(self, rgb_ends, rgb_possibles, None, img_possibles, skip_first_screenshot=True)

diff --git a/src/images/JP/activity/common/unit-formation.png b/src/images/JP/activity/common/unit-formation.png
diff --git a/src/images/JP/x_y_range/activity_common.py b/src/images/JP/x_y_range/activity_common.py
@@ -4,6 +4,7 @@
     'play-guide': (535, 132, 706, 171),
     'menu': (103, 7, 250, 38),
     "fight-success-confirm": (600, 650, 681, 684),
+    "unit-formation": (102, 10, 200, 40),
     "task-no-goals": (324, 381, 534, 408),
     "task-info": (578, 124, 702, 153)
 }