Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

module/os/map_operation.py

@@ -168,7 +168,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
             self.config.HOMO_EDGE_COLOR_RANGE = (0, 33)
             self.config.MAP_ENSURE_EDGE_INSIGHT_CORNER = ''
 
-    def zone_init(self, fallback_init=True, skip_first_screenshot=True):
+    def zone_init(self, fallback_init=True):
         """
         Wrap get_current_zone(), set self.zone to the current zone.
         This method must be called after entering a new zone.
@@ -176,7 +176,6 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
 
         Args:
             fallback_init (bool): Whether to get zone from globe map when unable to parse zone name.
-            skip_first_screenshot (bool):
 
         Returns:
             Zone: Current zone.
@@ -188,12 +187,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
         self.wait_os_map_buttons()
         logger.info('Get zone name')
         timeout = Timer(1.5, count=5).start()
-        while 1:
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-            else:
-                self.device.screenshot()
-
+        for _ in self.loop():
             # Handle popups
             if self.handle_map_event():
                 timeout.reset()
@@ -246,13 +240,10 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
         """
         return self.appear(MAP_EXIT, offset=(20, 20))
 
-    def map_exit(self, skip_first_screenshot=True):
+    def map_exit(self):
         """
         Exit from an obscure zone, abyssal zone, or stronghold.
 
-        Args:
-            skip_first_screenshot:
-
         Pages:
             in: is_in_map
             out: is_in_map, zone that you came from
@@ -260,12 +251,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
         logger.hr('Map exit')
         confirm_timer = Timer(1, count=2)
         changed = False
-        while 1:
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-            else:
-                self.device.screenshot()
-
+        for _ in self.loop():
             # End
             if changed and self.is_in_map():
                 if confirm_timer.reached():