Merge pull request #258 from LmeSzinc/bug_fix

Bug fix

module/device/screenshot.py

@@ -98,7 +98,14 @@ class Screenshot(Adb, WSA, DroidCast, AScreenCap, Scrcpy):
 
     @cached_property
     def screenshot_deque(self):
-        return deque(maxlen=int(self.config.Error_ScreenshotLength))
+        try:
+            length = int(self.config.Error_ScreenshotLength)
+        except ValueError:
+            logger.error(f'Error_ScreenshotLength={self.config.Error_ScreenshotLength} is not an integer')
+            raise RequestHumanTakeover
+        # Limit in 1~300
+        length = max(1, min(length, 300))
+        return deque(maxlen=length)
 
     @cached_property
     def screenshot_tracking(self):

route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py

@@ -171,9 +171,13 @@ class Route(RouteBase):
         | item     | Waypoint((792.4, 224.5)), | 355.8     | 350      |
         | enemy    | Waypoint((802.3, 198.7)), | 22.7      | 20       |
         | exit_    | Waypoint((801.6, 199.4)), | 210.2     | 13       |
+        | exit1    | Waypoint((799.2, 194.1)), | 22.7      | 18       |
+        | exit2    | Waypoint((805.4, 196.2)), | 114.2     | 18       |
         """
         self.map_init(plane=Luofu_ScalegorgeWaterscape, floor="F1", position=(791.2, 245.8))
-        self.register_domain_exit(Waypoint((801.6, 199.4)), end_rotation=13)
+        self.register_domain_exit(
+            Waypoint((801.6, 199.4)), end_rotation=13,
+            left_door=Waypoint((799.2, 194.1)), right_door=Waypoint((805.4, 196.2)))
         item = Waypoint((792.4, 224.5))
         enemy = Waypoint((802.3, 198.7))
         # ===== End of generated waypoints =====

tasks/rogue/assets/assets_rogue_path.py

@@ -164,13 +164,22 @@ CLICK_NIHILITY = ButtonWrapper(
 )
 CLICK_PRESERVATION = ButtonWrapper(
     name='CLICK_PRESERVATION',
-    share=Button(
+    share=[
+        Button(
             file='./assets/share/rogue/path/CLICK_PRESERVATION.png',
             area=(65, 340, 88, 405),
             search=(45, 320, 108, 425),
             color=(31, 34, 44),
             button=(65, 340, 88, 405),
         ),
+        Button(
+            file='./assets/share/rogue/path/CLICK_PRESERVATION.2.png',
+            area=(150, 345, 200, 395),
+            search=(130, 325, 220, 415),
+            color=(71, 75, 85),
+            button=(150, 345, 200, 395),
+        ),
+    ],
 )
 CLICK_REMEMBRANCE = ButtonWrapper(
     name='CLICK_REMEMBRANCE',

tasks/rogue/assets/assets_rogue_weekly.py

@@ -47,10 +47,10 @@ REWARD_RED_DOT = ButtonWrapper(
     name='REWARD_RED_DOT',
     share=Button(
         file='./assets/share/rogue/weekly/REWARD_RED_DOT.png',
-        area=(94, 582, 122, 610),
-        search=(74, 562, 142, 630),
-        color=(130, 67, 71),
-        button=(94, 582, 122, 610),
+        area=(308, 640, 328, 660),
+        search=(288, 620, 348, 680),
+        color=(179, 57, 63),
+        button=(308, 640, 328, 660),
     ),
 )
 ROGUE_REPORT = ButtonWrapper(

tasks/rogue/entry/path.py

@@ -59,7 +59,7 @@ class RoguePathHandler(RogueUI):
         }
         # Path list is sliding, expand search area
         for b in buttons.values():
-            b.load_search(area_pad_around(b.area, pad=(-100, -5, -100, -5)))
+            b.load_search(area_pad_around(b.area, pad=(-150, -5, -150, -5)))
         return buttons
 
     @cached_property