Merge pull request #1714 from LmeSzinc/bug_fix

Bug fix

Author: LmeSzinc

module/os_ash/meta.py

@@ -441,7 +441,7 @@ def _ensure_meta_level(self):
 
     def _in_meta_assist_page(self):
         # AL redirects to unfinished self beacon after assist, so switch back
-        if self.appear_then_click(BEACON_LIST, offset=(-20, -5, 300, 5)):
+        if self.appear_then_click(BEACON_LIST, offset=(-20, -5, 300, 5), interval=2):
             return False
         return self.appear(BEACON_MY, offset=(20, 20))
 

module/shop/base.py

@@ -5,6 +5,7 @@
 from module.base.decorator import cached_property
 from module.base.filter import Filter
 from module.base.timer import Timer
+from module.combat.assets import GET_ITEMS_1, GET_SHIP
 from module.exception import ScriptError
 from module.logger import logger
 from module.shop.assets import *
@@ -161,6 +162,23 @@ def shop_detect_items(self, image=None):
             logger.info('No shop items found')
             return []
 
+    def shop_obstruct_handle(self):
+        """
+        Remove obstructions in shop view if any
+
+        Returns:
+            bool:
+        """
+        # Handle shop obstructions
+        if self.appear(GET_SHIP, interval=1):
+            self.device.click(SHOP_CLICK_SAFE_AREA)
+            return True
+        if self.appear(GET_ITEMS_1, interval=1):
+            self.device.click(SHOP_CLICK_SAFE_AREA)
+            return True
+
+        return False
+
     def shop_get_items(self, skip_first_screenshot=True):
         """
         Args:
@@ -186,6 +204,10 @@ def shop_get_items(self, skip_first_screenshot=True):
             else:
                 self.device.screenshot()
 
+            if self.shop_obstruct_handle():
+                timeout.reset()
+                continue
+
             shop_items.predict(
                 self.device.image,
                 name=True,

module/shop/clerk.py

@@ -1,7 +1,6 @@
 import cv2
 
 from module.base.timer import Timer
-from module.combat.assets import GET_ITEMS_1, GET_SHIP
 from module.exception import ScriptError
 from module.logger import logger
 from module.ocr.ocr import Digit, DigitCounter
@@ -265,19 +264,14 @@ def shop_buy_execute(self, item, skip_first_screenshot=True):
             if self.shop_buy_handle(item):
                 self.interval_reset(BACK_ARROW)
                 continue
-            if self.appear(GET_SHIP, interval=1):
-                self.device.click(SHOP_CLICK_SAFE_AREA)
-                self.interval_reset(BACK_ARROW)
-                continue
             if self.handle_retirement():
                 self.interval_reset(BACK_ARROW)
                 continue
-            if self.appear(GET_ITEMS_1, interval=1):
-                self.device.click(SHOP_CLICK_SAFE_AREA)
+            if self.handle_info_bar():
                 self.interval_reset(BACK_ARROW)
                 success = True
                 continue
-            if self.handle_info_bar():
+            if self.shop_obstruct_handle():
                 self.interval_reset(BACK_ARROW)
                 success = True
                 continue

module/ui/navbar.py

@@ -1,7 +1,9 @@
 from module.base.base import ModuleBase
 from module.base.button import ButtonGrid
 from module.base.timer import Timer
+from module.combat.assets import GET_ITEMS_1, GET_SHIP
 from module.logger import logger
+from module.shop.assets import SHOP_CLICK_SAFE_AREA
 
 
 class Navbar:
@@ -85,6 +87,33 @@ def get_total(self, main):
         _, left, right = self.get_info(main=main)
         return right - left + 1
 
+    def _shop_obstruct_handle(self, main):
+        """
+        IFF in shop, then remove obstructions
+        in shop view if any
+
+        Args:
+            main (ModuleBase):
+
+        Returns:
+            bool:
+        """
+        # Check name, identifies if NavBar
+        # instance belongs to shop module
+        if self.name != 'SHOP_BOTTOM_NAVBAR':
+            return False
+
+        # Handle shop obstructions
+        if main.appear(GET_SHIP, interval=1):
+            main.device.click(SHOP_CLICK_SAFE_AREA)
+            return True
+        if main.appear(GET_ITEMS_1, interval=1):
+            main.device.click(SHOP_CLICK_SAFE_AREA)
+            return True
+
+        return False
+
+
     def set(self, main, left=None, right=None, upper=None, bottom=None, skip_first_screenshot=True):
         """
         Set nav bar from 1 direction.
@@ -125,6 +154,11 @@ def set(self, main, left=None, right=None, upper=None, bottom=None, skip_first_s
                 logger.warning(f'{self.name} failed to set {text.strip()}')
                 return False
 
+            if self._shop_obstruct_handle():
+                interval.reset()
+                timeout.reset()
+                continue
+
             active, minimum, maximum = self.get_info(main=main)
             logger.info(f'Nav item active: {active} from range ({minimum}, {maximum})')
             # if active is None: