Fix: none cost (#3947)

* fix: none cost

* upd: assets

Author: SaarChaffee

assets/shop/os/EmptyT1_1.png

@@ -115,44 +115,27 @@ def __init__(self, grids, templates, template_area=(40, 21, 89, 70), amount_area
         self.price_ocr = PRICE_OCR
         self.counter_area = counter_area
 
-    def predict(self, image, shop_index=None, scroll_pos=None) -> List[OSShopItem]:
+    def predict(self, image, counter=False, shop_index=None, scroll_pos=None) -> List[OSShopItem]:
         """
         Args:
             image (np.ndarray):
+            counter (bool): If predict item counter.
             shop_index (bool): If predict shop index.
             scroll_pos (bool): If predict scroll position.
 
         Returns:
             list[Item]:
         """
-        self._load_image(image)
-        amount_list = [item.crop(self.amount_area) for item in self.items]
-        amount_list = self.amount_ocr.ocr(amount_list, direct_ocr=True)
-        counter_list = [item.crop(self.counter_area) for item in self.items]
-        counter_list = self.counter_ocr.ocr(counter_list, direct_ocr=True)
-        name_list = [self.match_template(item.image) for item in self.items]
-        cost_list = [self.match_cost_template(item) for item in self.items]
-        price_list = [item.crop(self.price_area) for item in self.items]
-        price_list = self.price_ocr.ocr(price_list, direct_ocr=True)
-        ignore = 0
-        items = []
-
-        for i, a, t, n, c, p in zip(self.items, amount_list, counter_list, name_list, cost_list, price_list):
-            if (p <= 0):
-                ignore += 1
-                continue
-            i.amount = a
-            i.count, i.total_count = t
-            i.name = n
-            i.cost = c
-            i.price = p
-            if isinstance(shop_index, int):
+        super().predict(image, name=True, amount=True, cost=True, price=True)
+        if counter and len(self.items):
+            counter_list = [item.crop(self.counter_area) for item in self.items]
+            counter_list = self.counter_ocr.ocr(counter_list, direct_ocr=True)
+            for i, t in zip(self.items, counter_list):
+                i.count, i.total_count = t
+
+        if isinstance(shop_index, int) and isinstance(scroll_pos, float) and len(self.items):
+            for i in self.items:
                 i.shop_index = shop_index
-            if isinstance(scroll_pos, float):
                 i.scroll_pos = scroll_pos
-            items.append(i)
 
-        if ignore > 0:
-            logger.warning(f'Ignore {ignore} items, because price <= 0')
-
-        return items
+        return self.items

assets/shop/os/EmptyT2_1.png

@@ -79,7 +79,7 @@ def os_shop_get_items(self, shop_index=False, scroll_pos=False) -> List[Item]:
         self.os_shop_items.grids = self._get_os_shop_grid()
         if self.config.SHOP_EXTRACT_TEMPLATE:
             self.os_shop_items.extract_template(self.device.image, './assets/shop/os')
-        self.os_shop_items.predict(self.device.image, shop_index=shop_index, scroll_pos=scroll_pos)
+        self.os_shop_items.predict(self.device.image, counter=True, shop_index=shop_index, scroll_pos=scroll_pos)
         shop_items = self.os_shop_items.items
 
         if len(shop_items):

module/os_shop/item.py

@@ -178,7 +178,7 @@ def handle_akashi_supply_buy(self, grid):
     def get_currency_coins(self, item):
         if item.cost == 'YellowCoins':
             if get_os_reset_remain() == 0:
-                return self._shop_yellow_coins
+                return self._shop_yellow_coins - 100
             elif self.is_cl1_enabled:
                 return self._shop_yellow_coins - self.config.OS_CL1_YELLOW_COINS_PRESERVE
             else: