Chore: Format code

Author: LmeSzinc

module/freebies/supply_pack.py

@@ -128,14 +128,11 @@ def goto_supply_pack(self, skip_first_screenshot=True):
             in: page_shop
             out: page_supply_pack, supply pack tab
         """
-        while 1:
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-            else:
-                self.device.screenshot()     
-      
+        logger.info('Goto supply pack')
+        for _ in self.loop():
+
             if self.match_template_color(page_supply_pack.check_button, offset=(20, 20)):
-                logger.info("Page arrive: page_supply_pack")
+                logger.info('At supply pack')
                 break
 
             elif self.appear_then_click(page_supply_pack.check_button, offset=(20, 20), interval=3):

module/shop/base.py

@@ -1,10 +1,10 @@
-import numpy as np
 import re
 
+import numpy as np
+
 from module.base.button import ButtonGrid
 from module.base.decorator import Config, cached_property
 from module.base.filter import Filter
-from module.base.utils import rgb2gray
 from module.base.timer import Timer
 from module.combat.assets import GET_ITEMS_1, GET_ITEMS_3, GET_SHIP
 from module.logger import logger
@@ -50,6 +50,7 @@ class ShopItem_250814(Item):
     Calculation result of unsold ship_T2 is 0.36, so 0.3 is taken as threshold,
     result of sold product is < 0.2
     """
+
     def predict_valid(self):
         mean = np.mean(np.max(self.image, axis=2) > 139)
         return mean > 0.3
@@ -100,6 +101,7 @@ def predict(self, image, name=True, amount=True, cost=False, price=False, tag=Fa
 class ShopItemGrid_250814(ShopItemGrid):
     item_class = ShopItem_250814
 
+
 class ShopBase(UI):
     _currency = 0
     shop_template_folder = ''

module/shop/shop_core.py

@@ -104,7 +104,14 @@ def shop_core_items(self):
             ShopItemGrid:
         """
         shop_grid = self.shop_grid
-        shop_core_items = ShopItemGrid_250814(shop_grid, templates={}, template_area=(25, 20, 82, 72), amount_area=(42, 50, 65, 65), cost_area=(-12, 115, 60, 155), price_area=(18, 121, 85, 150))
+        shop_core_items = ShopItemGrid_250814(
+            shop_grid,
+            templates={},
+            template_area=(25, 20, 82, 72),
+            amount_area=(42, 50, 65, 65),
+            cost_area=(-12, 115, 60, 155),
+            price_area=(18, 121, 85, 150),
+        )
         shop_core_items.load_template_folder(self.shop_template_folder)
         shop_core_items.load_cost_template_folder('./assets/shop/cost')
         return shop_core_items

module/shop/shop_general.py

@@ -165,7 +165,14 @@ def shop_general_items(self):
         """
         shop_grid = self.shop_grid
 
-        shop_general_items = ShopItemGrid_250814(shop_grid, templates={}, template_area=(25, 20, 82, 72), amount_area=(42, 50, 65, 65), cost_area=(-12, 115, 60, 155), price_area=(14, 121, 85, 150))
+        shop_general_items = ShopItemGrid_250814(
+            shop_grid,
+            templates={},
+            template_area=(25, 20, 82, 72),
+            amount_area=(42, 50, 65, 65),
+            cost_area=(-12, 115, 60, 155),
+            price_area=(14, 121, 85, 150),
+        )
         shop_general_items.load_template_folder(self.shop_template_folder)
         shop_general_items.load_cost_template_folder('./assets/shop/cost')
         return shop_general_items

module/shop/shop_guild.py

@@ -117,7 +117,14 @@ def shop_guild_items(self):
             ShopItemGrid:
         """
         shop_grid = self.shop_grid
-        shop_guild_items = ShopItemGrid_250814(shop_grid, templates={}, template_area=(25, 20, 82, 72), amount_area=(42, 50, 65, 65), cost_area=(-12, 115, 60, 155), price_area=(14, 121, 85, 150))
+        shop_guild_items = ShopItemGrid_250814(
+            shop_grid,
+            templates={},
+            template_area=(25, 20, 82, 72),
+            amount_area=(42, 50, 65, 65),
+            cost_area=(-12, 115, 60, 155),
+            price_area=(14, 121, 85, 150),
+        )
         self.shop_template_folder = './assets/shop/guild'
         shop_guild_items.load_template_folder(self.shop_template_folder)
         shop_guild_items.load_cost_template_folder('./assets/shop/cost')

module/shop/shop_medal.py

@@ -24,7 +24,6 @@
 
 class ShopAdaptiveScroll(AdaptiveScroll):
     def match_color(self, main):
-        from module.base.utils import save_image
         area = (self.area[0] - self.background, self.area[1], self.area[2] + self.background, self.area[3])
         image = main.image_crop(area, copy=False)
 
@@ -46,6 +45,7 @@ def match_color(self, main):
         mask[peaks] = 1
         return mask
 
+
 MEDAL_SHOP_SCROLL_250814 = ShopAdaptiveScroll(
     MEDAL_SHOP_SCROLL_AREA_250814.button,
     background=1,

module/shop/shop_merit.py

@@ -87,7 +87,14 @@ def shop_merit_items(self):
             ShopItemGrid:
         """
         shop_grid = self.shop_grid
-        shop_merit_items = ShopItemGrid_250814(shop_grid, templates={}, template_area=(25, 20, 82, 72), amount_area=(42, 50, 65, 65), cost_area=(-12, 115, 60, 155), price_area=(14, 121, 85, 150))
+        shop_merit_items = ShopItemGrid_250814(
+            shop_grid,
+            templates={},
+            template_area=(25, 20, 82, 72),
+            amount_area=(42, 50, 65, 65),
+            cost_area=(-12, 115, 60, 155),
+            price_area=(14, 121, 85, 150),
+        )
         shop_merit_items.load_template_folder(self.shop_template_folder)
         shop_merit_items.load_cost_template_folder('./assets/shop/cost')
         return shop_merit_items