Merge pull request #198 from Yinhaoran1128/dev

Upd: Use DraggableList to rewrite choose rogue path and add propagation in rogue

module/config/argument/args.json

@@ -1208,7 +1208,8 @@
           "Abundance",
           "The_Hunt",
           "Destruction",
-          "Elation"
+          "Elation",
+          "Propagation"
         ]
       },
       "Bonus": {

module/config/argument/argument.yaml

@@ -212,7 +212,7 @@ RogueWorld:
     ]
   Path:
     value: The_Hunt
-    option: [ Preservation, Remembrance, Nihility, Abundance, The_Hunt, Destruction, Elation ]
+    option: [ Preservation, Remembrance, Nihility, Abundance, The_Hunt, Destruction, Elation, Propagation ]
   Bonus:
     value: Blessing Cosmos
     option: [ Blessing Cosmos, Miracle Cosmos, Fragmented Cosmos ]

module/config/config_generated.py

@@ -119,7 +119,7 @@ class GeneratedConfig:
 
     # Group `RogueWorld`
     RogueWorld_World = 'Simulated_Universe_World_7'  # Simulated_Universe_World_3, Simulated_Universe_World_4, Simulated_Universe_World_5, Simulated_Universe_World_6, Simulated_Universe_World_7, Simulated_Universe_World_8
-    RogueWorld_Path = 'The_Hunt'  # Preservation, Remembrance, Nihility, Abundance, The_Hunt, Destruction, Elation
+    RogueWorld_Path = 'The_Hunt'  # Preservation, Remembrance, Nihility, Abundance, The_Hunt, Destruction, Elation, Propagation
     RogueWorld_Bonus = 'Blessing Cosmos'  # Blessing Cosmos, Miracle Cosmos, Fragmented Cosmos
     RogueWorld_DomainStrategy = 'combat'  # combat, occurrence
     RogueWorld_UseImmersifier = True

module/config/i18n/en-US.json

@@ -806,7 +806,8 @@
       "Abundance": "Abundance",
       "The_Hunt": "The Hunt",
       "Destruction": "Destruction",
-      "Elation": "Elation"
+      "Elation": "Elation",
+      "Propagation": "Propagation"
     },
     "Bonus": {
       "name": "Blessings of Trailblaze",

module/config/i18n/es-ES.json

@@ -806,7 +806,8 @@
       "Abundance": "Abundancia",
       "The_Hunt": "Cacería",
       "Destruction": "Destrucción",
-      "Elation": "Exultación"
+      "Elation": "Exultación",
+      "Propagation": "Propagación"
     },
     "Bonus": {
       "name": "Bendiciones",

module/config/i18n/ja-JP.json

@@ -806,7 +806,8 @@
       "Abundance": "Abundance",
       "The_Hunt": "The_Hunt",
       "Destruction": "Destruction",
-      "Elation": "Elation"
+      "Elation": "Elation",
+      "Propagation": "Propagation"
     },
     "Bonus": {
       "name": "RogueWorld.Bonus.name",

module/config/i18n/zh-CN.json

@@ -806,7 +806,8 @@
       "Abundance": "丰饶",
       "The_Hunt": "巡猎",
       "Destruction": "毁灭",
-      "Elation": "欢愉"
+      "Elation": "欢愉",
+      "Propagation": "繁育"
     },
     "Bonus": {
       "name": "开拓祝福三选一",

module/config/i18n/zh-TW.json

@@ -806,7 +806,8 @@
       "Abundance": "豐饒",
       "The_Hunt": "巡獵",
       "Destruction": "毀滅",
-      "Elation": "歡愉"
+      "Elation": "歡愉",
+      "Propagation": "繁育"
     },
     "Bonus": {
       "name": "開拓祝福三選一",

tasks/rogue/assets/assets_rogue_path.py

@@ -63,6 +63,16 @@ CHECK_PRESERVATION = ButtonWrapper(
         button=(220, 308, 270, 358),
     ),
 )
+CHECK_PROPAGATION = ButtonWrapper(
+    name='CHECK_PROPAGATION',
+    share=Button(
+        file='./assets/share/rogue/path/CHECK_PROPAGATION.png',
+        area=(206, 308, 286, 372),
+        search=(186, 288, 306, 392),
+        color=(126, 104, 75),
+        button=(206, 308, 286, 372),
+    ),
+)
 CHECK_REMEMBRANCE = ButtonWrapper(
     name='CHECK_REMEMBRANCE',
     share=Button(
@@ -83,6 +93,26 @@ CHECK_THE_HUNT = ButtonWrapper(
         button=(221, 324, 271, 374),
     ),
 )
+CHOOSE_LEFT = ButtonWrapper(
+    name='CHOOSE_LEFT',
+    share=Button(
+        file='./assets/share/rogue/path/CHOOSE_LEFT.png',
+        area=(44, 292, 102, 365),
+        search=(24, 272, 122, 385),
+        color=(30, 33, 42),
+        button=(44, 292, 102, 365),
+    ),
+)
+CHOOSE_RIGHT = ButtonWrapper(
+    name='CHOOSE_RIGHT',
+    share=Button(
+        file='./assets/share/rogue/path/CHOOSE_RIGHT.png',
+        area=(1177, 291, 1236, 364),
+        search=(1157, 271, 1256, 384),
+        color=(32, 33, 39),
+        button=(1177, 291, 1236, 364),
+    ),
+)
 CLICK_ABUNDANCE = ButtonWrapper(
     name='CLICK_ABUNDANCE',
     share=Button(
@@ -163,3 +193,20 @@ CONFIRM_PATH = ButtonWrapper(
         button=(865, 640, 1139, 675),
     ),
 )
+PAGE_ROGUE_PATH = ButtonWrapper(
+    name='PAGE_ROGUE_PATH',
+    cn=Button(
+        file='./assets/cn/rogue/path/PAGE_ROGUE_PATH.png',
+        area=(713, 87, 759, 109),
+        search=(693, 67, 779, 129),
+        color=(122, 120, 119),
+        button=(713, 87, 759, 109),
+    ),
+    en=Button(
+        file='./assets/en/rogue/path/PAGE_ROGUE_PATH.png',
+        area=(606, 89, 656, 108),
+        search=(586, 69, 676, 128),
+        color=(114, 112, 112),
+        button=(606, 89, 656, 108),
+    ),
+)

tasks/rogue/entry/path.py

@@ -40,6 +40,7 @@ class RoguePathHandler(RogueUI):
             KEYWORDS_ROGUE_PATH.The_Hunt: CHECK_THE_HUNT,
             KEYWORDS_ROGUE_PATH.Destruction: CHECK_DESTRUCTION,
             KEYWORDS_ROGUE_PATH.Elation: CHECK_ELATION,
+            KEYWORDS_ROGUE_PATH.Propagation: CHECK_PROPAGATION
         }
         return buttons
 
@@ -60,11 +61,28 @@ class RoguePathHandler(RogueUI):
         return buttons
 
     def _get_path_click(self, path: RoguePath) -> ButtonWrapper:
-        try:
-            return self._rogue_path_clicks[path]
-        except KeyError:
-            logger.critical(f'Invalid rogue path: {path}')
-            raise ScriptError
+        buttons = self._rogue_path_clicks
+        if ret := buttons.get(path):
+            return ret
+        else:
+            # choose the closest path
+            paths = list(buttons.keys())
+            path_click = min(paths, key=lambda p: min(self._calculate_distance(p, path)))
+            return buttons.get(path_click)
+
+    @staticmethod
+    def _calculate_distance(path_1: RoguePath, path_2: RoguePath):
+        """
+        click times from path1 to path2
+
+        Returns:
+            tuple: (left_times, right_times)
+        """
+        length = len(path_1.instances)
+        distance = path_1.id - path_2.id
+        left_times = distance % length
+        right_times = -distance % length
+        return left_times, right_times
 
     def _get_selected_path(self, skip_first_screenshot=True) -> RoguePath | None:
         timeout = Timer(1, count=5).start()
@@ -86,8 +104,8 @@ class RoguePathHandler(RogueUI):
         return None
 
     def _is_page_rogue_path(self) -> bool:
-        appear = [self.appear(button) for button in self._rogue_path_clicks.values()]
-        return all(appear)
+        appear = self.appear(PAGE_ROGUE_PATH)
+        return appear
 
     def _is_team_prepared(self) -> bool:
         """
@@ -99,6 +117,30 @@ class RoguePathHandler(RogueUI):
         logger.attr('TeamSlotsPrepared', slots)
         return slots > 0
 
+    def _change_confirm_path(self, path: RoguePath, skip_first_screenshot=True) -> bool:
+        timeout = Timer(20, count=10).start()
+        selected_path_last = None
+        while 1:
+            if skip_first_screenshot:
+                skip_first_screenshot = False
+            else:
+                self.device.screenshot()
+            selected_path = self._get_selected_path()
+            if selected_path == path:
+                return True
+            elif selected_path != selected_path_last:
+                left_times, right_times = self._calculate_distance(selected_path, path)
+                if left_times <= right_times:
+                    self.device.click(CHOOSE_LEFT)
+                else:
+                    self.device.click(CHOOSE_RIGHT)
+            if timeout.reached():
+                break
+            selected_path_last = selected_path
+
+        logger.warning('Unable to change into chosen path')
+        return False
+
     def rogue_path_select(self, path: str | RoguePath, skip_first_screenshot=True):
         """
         Raises:
@@ -110,7 +152,7 @@ class RoguePathHandler(RogueUI):
                 or page_main if previous rogue run had bonus selected but didn't finish any domain
         """
         logger.hr('Rogue path select', level=2)
-        path: RoguePath = RoguePath.find(path)
+        path: RoguePath = RoguePath.find_path(path)
         logger.info(f'Select path: {path}')
         entry = self._get_path_click(path)
         while 1:
@@ -143,10 +185,6 @@ class RoguePathHandler(RogueUI):
                     continue
             # Confirm path
             if self.appear(CONFIRM_PATH, interval=2):
-                if self._get_selected_path() == path:
+                if self._change_confirm_path(path):
                     self.device.click(CONFIRM_PATH)
                     continue
-                else:
-                    logger.warning('Selected to the wrong path')
-                    self.device.click(BACK)
-                    continue

tasks/rogue/keywords/classes.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import ClassVar
 
 from dev_tools.keyword_extract import UI_LANGUAGES
+from module.exception import ScriptError
 from module.ocr.keyword import Keyword
 
 
@@ -35,6 +36,14 @@ class RoguePath(Keyword):
         return [self.__getattribute__(f"{server}_parsed").replace("the", '')
                 for server in UI_LANGUAGES if hasattr(self, f"{server}_parsed")]
 
+    @classmethod
+    def find_path(cls, name):
+        for instance in cls.instances.values():
+            if name == instance.name:
+                return instance
+        # Not found
+        raise ScriptError(f'Cannot find a {cls.__name__} instance that matches "{name}"')
+
 
 @dataclass(repr=False)
 class RogueResonance(Keyword):