From 26c4d6552d6ae64dfa250afe144b514f5380129e Mon Sep 17 00:00:00 2001
From: LmeSzinc <lmeszincsales@gmail.com>
Date: Fri, 5 Jun 2020 10:54:29 +0800
Subject: [PATCH 1/7] Add: Reward loop when finished, to all function

---
 alas.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/alas.py b/alas.py
index d6ab4861f..c2722aa5b 100644
--- a/alas.py
+++ b/alas.py
@@ -37,6 +37,11 @@ class AzurLaneAutoScript:
                 with open(f'{folder}/log.txt', 'w') as f:
                     f.writelines(text)
 
+    def reward_when_finished(self):
+        from module.reward.reward import Reward
+        az = Reward(self.config)
+        az.reward_loop()
+
     def setting(self):
         for key, value in self.config.config['Setting'].items():
             print(f'{key} = {value}')
@@ -49,9 +54,7 @@ class AzurLaneAutoScript:
             print(f'{key} = {value}')
 
         logger.hr('Reward Settings saved')
-        from module.reward.reward import Reward
-        az = Reward(self.config)
-        az.reward_loop()
+        self.reward_when_finished()
 
     def emulator(self):
         for key, value in self.config.config['Emulator'].items():
@@ -72,20 +75,18 @@ class AzurLaneAutoScript:
         from module.campaign.run import CampaignRun
         az = CampaignRun(self.config)
         az.run(self.config.CAMPAIGN_NAME)
+        self.reward_when_finished()
 
     def daily(self):
         """
         Method to run daily missions.
         """
-        flag = True
-
         if self.config.ENABLE_DAILY_MISSION:
             from module.daily.daily import Daily
             az = Daily(self.config)
             if not az.record_executed_since():
                 az.run()
                 az.record_save()
-                flag = True
 
         if self.config.ENABLE_HARD_CAMPAIGN:
             from module.hard.hard import CampaignHard
@@ -93,7 +94,6 @@ class AzurLaneAutoScript:
             if not az.record_executed_since():
                 az.run()
                 az.record_save()
-                flag = True
 
         if self.config.ENABLE_EXERCISE:
             from module.exercise.exercise import Exercise
@@ -101,12 +101,8 @@ class AzurLaneAutoScript:
             if not az.record_executed_since():
                 az.run()
                 az.record_save()
-                flag = True
 
-        if flag:
-            from module.reward.reward import Reward
-            az = Reward(self.config)
-            az.reward()
+        self.reward_when_finished()
 
     def event(self):
         """
@@ -115,11 +111,13 @@ class AzurLaneAutoScript:
         from module.campaign.run import CampaignRun
         az = CampaignRun(self.config)
         az.run(self.config.CAMPAIGN_EVENT, folder=self.config.EVENT_NAME)
+        self.reward_when_finished()
 
     def event_daily_ab(self):
         from module.event.campaign_ab import CampaignAB
         az = CampaignAB(self.config)
         az.run_event_daily()
+        self.reward_when_finished()
 
     def semi_auto(self):
         from module.daemon.daemon import AzurLaneDaemon
@@ -130,16 +128,19 @@ class AzurLaneAutoScript:
         from module.campaign.run import CampaignRun
         az = CampaignRun(self.config)
         az.run('campaign_7_2_mystery_farming')
+        self.reward_when_finished()
 
     def c124_leveling(self):
         from module.campaign.run import CampaignRun
         az = CampaignRun(self.config)
         az.run('campaign_12_4_leveling')
+        self.reward_when_finished()
 
     def c122_leveling(self):
         from module.campaign.run import CampaignRun
         az = CampaignRun(self.config)
         az.run('campaign_12_2_leveling')
+        self.reward_when_finished()
 
     def retire(self):
         from module.retire.retirement import Retirement

From 83afdafccbe7b5ab16868b3cb6eefd030c6e0ee2 Mon Sep 17 00:00:00 2001
From: LmeSzinc <lmeszincsales@gmail.com>
Date: Fri, 5 Jun 2020 18:10:48 +0800
Subject: [PATCH 2/7] Fix: Commission not found

- Add commission_swipe_to_top, because switching daily/urgent won't reset commission list now
---
 assets/cn/reward/COMMISSION_SCROLL.png     | Bin 0 -> 7846 bytes
 assets/cn/reward/COMMISSION_SCROLL_TOP.png | Bin 0 -> 5535 bytes
 assets/en/reward/COMMISSION_SCROLL.png     | Bin 0 -> 7846 bytes
 assets/en/reward/COMMISSION_SCROLL_TOP.png | Bin 0 -> 5535 bytes
 module/reward/assets.py                    |   2 ++
 module/reward/commission.py                |  25 +++++++++++++++++++++
 6 files changed, 27 insertions(+)
 create mode 100644 assets/cn/reward/COMMISSION_SCROLL.png
 create mode 100644 assets/cn/reward/COMMISSION_SCROLL_TOP.png
 create mode 100644 assets/en/reward/COMMISSION_SCROLL.png
 create mode 100644 assets/en/reward/COMMISSION_SCROLL_TOP.png

diff --git a/assets/cn/reward/COMMISSION_SCROLL.png b/assets/cn/reward/COMMISSION_SCROLL.png
new file mode 100644
index 0000000000000000000000000000000000000000..27d5d9294df8e3ba3ae7945c01c6ad9dea2e712a
GIT binary patch
literal 7846
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
Qd~zUl745Ty%J9Jd0BI9qI{*Lx

literal 0
HcmV?d00001

diff --git a/assets/cn/reward/COMMISSION_SCROLL_TOP.png b/assets/cn/reward/COMMISSION_SCROLL_TOP.png
new file mode 100644
index 0000000000000000000000000000000000000000..f31cb4b8aafa98b704f7268ed978e2b46eb48752
GIT binary patch
literal 5535
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

literal 0
HcmV?d00001

diff --git a/assets/en/reward/COMMISSION_SCROLL.png b/assets/en/reward/COMMISSION_SCROLL.png
new file mode 100644
index 0000000000000000000000000000000000000000..27d5d9294df8e3ba3ae7945c01c6ad9dea2e712a
GIT binary patch
literal 7846
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
Qd~zUl745Ty%J9Jd0BI9qI{*Lx

literal 0
HcmV?d00001

diff --git a/assets/en/reward/COMMISSION_SCROLL_TOP.png b/assets/en/reward/COMMISSION_SCROLL_TOP.png
new file mode 100644
index 0000000000000000000000000000000000000000..f31cb4b8aafa98b704f7268ed978e2b46eb48752
GIT binary patch
literal 5535
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

literal 0
HcmV?d00001

diff --git a/module/reward/assets.py b/module/reward/assets.py
index 1e6b9b4ad..da8da9b14 100644
--- a/module/reward/assets.py
+++ b/module/reward/assets.py
@@ -9,6 +9,8 @@ COMMISSION_ADVICE = Button(area={'cn': (871, 322, 999, 383), 'en': (871, 328, 10
 COMMISSION_DAILY = Button(area={'cn': (35, 132, 67, 186), 'en': (30, 126, 75, 188)}, color={'cn': (208, 172, 118), 'en': (170, 132, 92)}, button={'cn': (35, 132, 67, 186), 'en': (30, 126, 75, 188)}, file={'cn': './assets/cn/reward/COMMISSION_DAILY.png', 'en': './assets/en/reward/COMMISSION_DAILY.png'})
 COMMISSION_HAS_PENDING = Button(area={'cn': (357, 300, 359, 330), 'en': (357, 300, 359, 330)}, color={'cn': (86, 201, 173), 'en': (81, 205, 174)}, button={'cn': (357, 300, 359, 330), 'en': (357, 300, 359, 330)}, file={'cn': './assets/cn/reward/COMMISSION_HAS_PENDING.png', 'en': './assets/en/reward/COMMISSION_HAS_PENDING.png'})
 COMMISSION_NOTICE_AT_CAMPAIGN = Button(area={'cn': (1054, 647, 1061, 654), 'en': (1054, 647, 1061, 654)}, color={'cn': (197, 89, 64), 'en': (197, 89, 64)}, button={'cn': (1054, 647, 1061, 654), 'en': (1054, 647, 1061, 654)}, file={'cn': './assets/cn/reward/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'en': './assets/en/reward/COMMISSION_NOTICE_AT_CAMPAIGN.png'})
+COMMISSION_SCROLL = Button(area={'cn': (1255, 0, 1260, 720), 'en': (1255, 0, 1260, 720)}, color={'cn': (111, 104, 69), 'en': (111, 104, 69)}, button={'cn': (1255, 0, 1260, 720), 'en': (1255, 0, 1260, 720)}, file={'cn': './assets/cn/reward/COMMISSION_SCROLL.png', 'en': './assets/en/reward/COMMISSION_SCROLL.png'})
+COMMISSION_SCROLL_TOP = Button(area={'cn': (1254, 81, 1261, 88), 'en': (1254, 81, 1261, 88)}, color={'cn': (247, 209, 66), 'en': (247, 209, 66)}, button={'cn': (1254, 81, 1261, 88), 'en': (1254, 81, 1261, 88)}, file={'cn': './assets/cn/reward/COMMISSION_SCROLL_TOP.png', 'en': './assets/en/reward/COMMISSION_SCROLL_TOP.png'})
 COMMISSION_START = Button(area={'cn': (1028, 322, 1156, 383), 'en': (1031, 333, 1147, 383)}, color={'cn': (229, 175, 113), 'en': (227, 169, 108)}, button={'cn': (1028, 322, 1156, 383), 'en': (1031, 333, 1147, 383)}, file={'cn': './assets/cn/reward/COMMISSION_START.png', 'en': './assets/en/reward/COMMISSION_START.png'})
 COMMISSION_STOP_SCROLLING = Button(area={'cn': (115, 236, 179, 487), 'en': (115, 236, 179, 487)}, color={'cn': (50, 55, 74), 'en': (50, 55, 74)}, button={'cn': (115, 236, 179, 487), 'en': (115, 236, 179, 487)}, file={'cn': './assets/cn/reward/COMMISSION_STOP_SCROLLING.png', 'en': './assets/en/reward/COMMISSION_STOP_SCROLLING.png'})
 COMMISSION_URGENT = Button(area={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283)}, color={'cn': (215, 188, 124), 'en': (169, 138, 95)}, button={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283)}, file={'cn': './assets/cn/reward/COMMISSION_URGENT.png', 'en': './assets/en/reward/COMMISSION_URGENT.png'})
diff --git a/module/reward/commission.py b/module/reward/commission.py
index 50a494918..456d2760a 100644
--- a/module/reward/commission.py
+++ b/module/reward/commission.py
@@ -9,6 +9,7 @@ from module.base.decorator import Config
 from module.base.ocr import Ocr
 from module.base.timer import Timer
 from module.base.utils import area_offset, get_color, random_rectangle_vector
+from module.base.utils import color_similar_1d, random_rectangle_point
 from module.handler.info_handler import InfoHandler
 from module.logger import logger
 from module.reward.assets import *
@@ -413,6 +414,26 @@ class RewardCommission(UI, InfoHandler):
         self.device.sleep(0.3)
         self.device.screenshot()
 
+    def _commission_swipe_to_top(self, bar_padding_y=10):
+        if self.appear(COMMISSION_SCROLL_TOP):
+            # Already at top
+            return False
+
+        mean = np.mean(self.device.image.crop(COMMISSION_SCROLL.area), axis=1)
+        bar = np.where(color_similar_1d(mean, color=(247, 211, 66)))[0]
+        if len(bar) < bar_padding_y * 2:
+            # No scroll found.
+            return False
+
+        bar = (COMMISSION_SCROLL.area[0], np.min(bar) + bar_padding_y,
+               COMMISSION_SCROLL.area[2], np.max(bar) - bar_padding_y)
+        p1 = random_rectangle_point(bar)
+        p2 = random_rectangle_point(COMMISSION_SCROLL_TOP.area)
+        self.device.drag(p1, p2, shake=(15, 0), point_random=(0, 0, 0, 0))
+        self.device.sleep(0.3)
+        self.device.screenshot()
+        return True
+
     def _commission_scan_list(self):
         commission = CommissionGroup(self.config)
         commission.merge(self.device.image)
@@ -432,10 +453,12 @@ class RewardCommission(UI, InfoHandler):
     def _commission_scan_all(self):
         logger.hr('Scan daily')
         self._commission_ensure_mode('daily')
+        self._commission_swipe_to_top()
         daily = self._commission_scan_list()
 
         logger.hr('Scan urgent')
         self._commission_ensure_mode('urgent')
+        self._commission_swipe_to_top()
         urgent = self._commission_scan_list()
 
         logger.hr('Showing commission')
@@ -529,11 +552,13 @@ class RewardCommission(UI, InfoHandler):
             for comm in self.daily_choose:
                 if not self._commission_ensure_mode('daily'):
                     self._commission_mode_reset()
+                self._commission_swipe_to_top()
                 self._commission_find_and_start(comm)
         if self.urgent_choose:
             for comm in self.urgent_choose:
                 if not self._commission_ensure_mode('urgent'):
                     self._commission_mode_reset()
+                self._commission_swipe_to_top()
                 self._commission_find_and_start(comm)
         if not self.daily_choose and not self.urgent_choose:
             logger.info('No commission chose')

From b186382fddc908de3aab968b9ab066eaa0daf071 Mon Sep 17 00:00:00 2001
From: LmeSzinc <lmeszincsales@gmail.com>
Date: Fri, 5 Jun 2020 18:41:56 +0800
Subject: [PATCH 3/7] Add: Boss fleet check from chapter 7 to 13

---
 module/config/config.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module/config/config.py b/module/config/config.py
index 6760073f8..ff4fa599b 100644
--- a/module/config/config.py
+++ b/module/config/config.py
@@ -382,6 +382,11 @@ class AzurLaneConfig:
             logger.warning(f'Mob fleet [{self.FLEET_1}] and boss fleet [{self.FLEET_2}] is the same')
             logger.warning('They should to be set to different fleets')
             exit(1)
+        if self.COMMAND.lower() == 'main' and self.CAMPAIGN_NAME.startswith('campaign_'):
+            if int(self.CAMPAIGN_NAME.split('_')[1]) >= 7 and self.FLEET_2 == 0:
+                logger.warning('You should use 2 fleets from chapter 7 to 13')
+                logger.warning(f'Current: mob fleet [{self.FLEET_1}], boss fleet [{self.FLEET_2}]')
+                exit(1)
 
     def save(self):
         self.config.write(codecs.open(self.CONFIG_FILE, "w+", "utf8"))

From 66d119e250d6e701dd3d94bffb8cea09b1fe2b55 Mon Sep 17 00:00:00 2001
From: LmeSzinc <lmeszincsales@gmail.com>
Date: Fri, 5 Jun 2020 20:22:27 +0800
Subject: [PATCH 4/7] Add: camera_data_spawn_point

---
 campaign/campaign_main/campaign_7_1.py |  1 +
 module/map/camera.py                   | 11 +++++++++--
 module/map/map_base.py                 | 19 +++++++++++++++++++
 module/map/map_grids.py                |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/campaign/campaign_main/campaign_7_1.py b/campaign/campaign_main/campaign_7_1.py
index 9f46e1556..97bf63c44 100644
--- a/campaign/campaign_main/campaign_7_1.py
+++ b/campaign/campaign_main/campaign_7_1.py
@@ -11,6 +11,7 @@ MAP.map_data = '''
     SP -- ++ ++ -- ME ME MB
 '''
 MAP.camera_data = ['C1', 'E1']
+MAP.camera_data_spawn_point = ['C1']
 MAP.weight_data = '''
     40 30 21 20 17 15 50 50
     40 40 50 50 16 13 50 50
diff --git a/module/map/camera.py b/module/map/camera.py
index 4900257fe..ecb623869 100644
--- a/module/map/camera.py
+++ b/module/map/camera.py
@@ -258,10 +258,17 @@ class Camera(InfoHandler):
         self.map.reset_fleet()
 
         queue = self.map.camera_data
+        if battle_count == 0:
+            queue.add(self.map.camera_data_spawn_point)
+
         while len(queue) > 0:
             if self.map.missing_is_none(battle_count, mystery_count, siren_count, carrier_count):
-                logger.info('All spawn found, Early stopped.')
-                break
+                if battle_count == 0 and queue.count != queue.delete(self.map.camera_data_spawn_point).count:
+                    logger.info('Continue scanning spawn points.')
+                    pass
+                else:
+                    logger.info('All spawn found, Early stopped.')
+                    break
             queue = queue.sort_by_camera_distance(self.camera)
             self.focus_to(queue[0])
             self.predict(is_carrier_scan=is_carrier_scan)
diff --git a/module/map/map_base.py b/module/map/map_base.py
index 5b8829040..094b16bef 100644
--- a/module/map/map_base.py
+++ b/module/map/map_base.py
@@ -45,6 +45,7 @@ class CampaignMap:
         self._spawn_data = []
         self._spawn_data_backup = []
         self._camera_data = []
+        self._camera_data_spawn_point = []
         self.in_map_swipe_preset_data = None
         self.poor_map_data = False
         self.camera_sight = (-3, -1, 3, 2)
@@ -89,6 +90,7 @@ class CampaignMap:
 
         # camera_data can be generate automatically, but it's better to set it manually.
         self.camera_data = [location2node(loca) for loca in camera_2d(self._shape, sight=self.camera_sight)]
+        self.camera_data_spawn_point = []
         # weight_data set to 10.
         for grid in self:
             grid.weight = 10.
@@ -208,6 +210,23 @@ class CampaignMap:
         """
         self._camera_data = SelectedGrids([self[node2location(node)] for node in nodes])
 
+    @property
+    def camera_data_spawn_point(self):
+        """Additional camera_data to detect fleets at spawn point.
+
+        Returns:
+            SelectedGrids:
+        """
+        return self._camera_data_spawn_point
+
+    @camera_data_spawn_point.setter
+    def camera_data_spawn_point(self, nodes):
+        """
+        Args:
+            nodes (list): Contains str.
+        """
+        self._camera_data_spawn_point = SelectedGrids([self[node2location(node)] for node in nodes])
+
     @property
     def spawn_data(self):
         return self._spawn_data
diff --git a/module/map/map_grids.py b/module/map/map_grids.py
index 99253331a..a033d6b17 100644
--- a/module/map/map_grids.py
+++ b/module/map/map_grids.py
@@ -92,7 +92,7 @@ class SelectedGrids:
         Returns:
             SelectedGrids:
         """
-        return SelectedGrids(self.grids + grids.grids)
+        return SelectedGrids(list(set(self.grids + grids.grids)))
 
     def delete(self, grids):
         """

From d042f926b539c55f9cb2f59de4ed85e3b112a5e8 Mon Sep 17 00:00:00 2001
From: LmeSzinc <lmeszincsales@gmail.com>
Date: Fri, 5 Jun 2020 21:51:08 +0800
Subject: [PATCH 5/7] Fix: Catch other error caused by info_bar

- Increase EDGE_LINES_HOUGHLINES_THRESHOLD in chapter 3
---
 campaign/campaign_main/campaign_3_1.py | 3 +--
 module/map/camera.py                   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/campaign/campaign_main/campaign_3_1.py b/campaign/campaign_main/campaign_3_1.py
index b87a7025d..1f35beedf 100644
--- a/campaign/campaign_main/campaign_3_1.py
+++ b/campaign/campaign_main/campaign_3_1.py
@@ -34,11 +34,10 @@ A4, B4, C4, D4, E4, F4, G4, \
 
 class Config:
     FLEET_BOSS = 1
-
     MAP_MYSTERY_HAS_CARRIER = True
 
     INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
-    EDGE_LINES_HOUGHLINES_THRESHOLD = 40
+    EDGE_LINES_HOUGHLINES_THRESHOLD = 75
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (120, 255 - 40),
         'width': (1.5, 10),
diff --git a/module/map/camera.py b/module/map/camera.py
index ecb623869..e3aa810db 100644
--- a/module/map/camera.py
+++ b/module/map/camera.py
@@ -113,7 +113,7 @@ class Camera(InfoHandler):
 
         try:
             self.grids = Grids(self.device.image, config=self.config)
-        except PerspectiveError as e:
+        except Exception as e:
             if self.info_bar_count():
                 logger.info('Perspective error cause by info bar. Waiting.')
                 self.handle_info_bar()

From 1e94b5d69c4a1f56a3c2e9118ed242a19014c6f5 Mon Sep 17 00:00:00 2001
From: Cerz0 <62533167+Cerz0@users.noreply.github.com>
Date: Fri, 5 Jun 2020 17:19:03 +0200
Subject: [PATCH 6/7] Update: map 10-1

Update campaign_10_1.py
---
 campaign/campaign_main/campaign_10_1.py | 53 +++++++++++++------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/campaign/campaign_main/campaign_10_1.py b/campaign/campaign_main/campaign_10_1.py
index ecad3a6f7..ec3c7870d 100644
--- a/campaign/campaign_main/campaign_10_1.py
+++ b/campaign/campaign_main/campaign_10_1.py
@@ -15,12 +15,12 @@ MAP.map_data = '''
 	SP -- ++ ++ -- -- ++
 '''
 MAP.weight_data = '''
-	10 10 10 10 40 40 10
-	10 20 10 30 30 40 40
-	10 40 30 30 30 10 10
-	10 10 10 10 30 10 10
-	10 10 10 10 10 10 10
-	10 10 10 10 10 10 10
+	50 50 50 50 50 40 50
+	50 50 50 30 30 50 40
+	50 40 30 30 30 50 05
+	50 25 20 20 30 50 05
+	50 50 50 15 10 10 05
+	50 50 50 50 50 50 50
 '''
 # MAP.camera_data = ['D3']
 MAP.spawn_data = [
@@ -43,18 +43,17 @@ A6, B6, C6, D6, E6, F6, G6, \
 
 road_main = RoadGrids([B4, C4, D4, E5, F5, G5])
 
-
 class Config:
-	INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
-	EDGE_LINES_HOUGHLINES_THRESHOLD = 40
-	COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
-	INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
+    EDGE_LINES_HOUGHLINES_THRESHOLD = 40
+    COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (150, 255 - 24),
         'width': (0.9, 10),
         'prominence': 10,
         'distance': 35,
 	}
-	EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (255 - 24, 255),
         'prominence': 10,
         'distance': 50,
@@ -64,21 +63,23 @@ class Config:
 
 
 class Campaign(CampaignBase):
-	MAP = MAP
+    MAP = MAP
 	
-	def battle_0(self):
-		if self.clear_roadblocks([road_main]):
-			return True
-		if self.clear_potential_roadblocks([road_main]):
-			return True
+    def battle_0(self):
+        self.fleet_2_push_forward()
+		
+        if self.clear_roadblocks([road_main]):
+            return True
+        if self.clear_potential_roadblocks([road_main]):
+            return True
 
-		return self.battle_default()
+        return self.battle_default()
 
-	def battle_6(self):
-		boss = self.map.select(is_boss=True)
-		if boss:
-			if not self.check_accessibility(boss[0], fleet=2):
-				if self.clear_roadblocks([road_main]):
-					return True
+    def battle_6(self):
+        boss = self.map.select(is_boss=True)
+        if boss:
+            if not self.check_accessibility(boss[0], fleet=2):
+                if self.clear_roadblocks([road_main]):
+                    return True
 				
-		return self.fleet_2.clear_boss()
\ No newline at end of file
+        return self.fleet_2.clear_boss()
\ No newline at end of file

From a3feef6f1bb69578c831658ab20133c44eb5d6d3 Mon Sep 17 00:00:00 2001
From: LmeSzinc <lmeszincsales@gmail.com>
Date: Fri, 5 Jun 2020 23:25:50 +0800
Subject: [PATCH 7/7] Format: PEP-8 for campaign maps

---
 campaign/campaign_main/campaign_10_1.py |  54 +++++-----
 campaign/campaign_main/campaign_10_2.py |   1 -
 campaign/campaign_main/campaign_10_4.py |   1 -
 campaign/campaign_main/campaign_3_2.py  |   1 -
 campaign/campaign_main/campaign_9_2.py  | 137 ++++++++++++------------
 campaign/campaign_main/campaign_9_3.py  |  87 +++++++--------
 campaign/campaign_main/campaign_9_4.py  |  84 ++++++++-------
 7 files changed, 182 insertions(+), 183 deletions(-)

diff --git a/campaign/campaign_main/campaign_10_1.py b/campaign/campaign_main/campaign_10_1.py
index ec3c7870d..e5d13e440 100644
--- a/campaign/campaign_main/campaign_10_1.py
+++ b/campaign/campaign_main/campaign_10_1.py
@@ -3,35 +3,34 @@ from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
-
 MAP = CampaignMap('10-1')
 MAP.shape = 'G6'
 MAP.map_data = '''
-	SP -- ++ -- ME ME --
-	-- -- ++ ME ME ME ME
-	-- ME ME ME ++ ++ MB
-	-- ME ME ME ME ++ MB
-	-- -- ++ -- ME ME ME
-	SP -- ++ ++ -- -- ++
+    SP -- ++ -- ME ME --
+    -- -- ++ ME ME ME ME
+    -- ME ME ME ++ ++ MB
+    -- ME ME ME ME ++ MB
+    -- -- ++ -- ME ME ME
+    SP -- ++ ++ -- -- ++
 '''
 MAP.weight_data = '''
-	50 50 50 50 50 40 50
-	50 50 50 30 30 50 40
-	50 40 30 30 30 50 05
-	50 25 20 20 30 50 05
-	50 50 50 15 10 10 05
-	50 50 50 50 50 50 50
+    50 50 50 50 50 40 50
+    50 50 50 30 30 50 40
+    50 40 30 30 30 50 05
+    50 25 20 20 30 50 05
+    50 50 50 15 10 10 05
+    50 50 50 50 50 50 50
 '''
 # MAP.camera_data = ['D3']
 MAP.spawn_data = [
-     {'battle': 0, 'enemy': 4},
-     {'battle': 1, 'enemy': 1},
-     {'battle': 2, 'enemy': 1},
-     {'battle': 3, 'enemy': 1},
-     {'battle': 4, 'enemy': 1},
-     {'battle': 5},
-	 {'battle': 6, 'boss': 1},
- ]
+    {'battle': 0, 'enemy': 4},
+    {'battle': 1, 'enemy': 1},
+    {'battle': 2, 'enemy': 1},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5},
+    {'battle': 6, 'boss': 1},
+]
 
 A1, B1, C1, D1, E1, F1, G1, \
 A2, B2, C2, D2, E2, F2, G2, \
@@ -43,6 +42,7 @@ A6, B6, C6, D6, E6, F6, G6, \
 
 road_main = RoadGrids([B4, C4, D4, E5, F5, G5])
 
+
 class Config:
     INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
     EDGE_LINES_HOUGHLINES_THRESHOLD = 40
@@ -52,22 +52,22 @@ class Config:
         'width': (0.9, 10),
         'prominence': 10,
         'distance': 35,
-	}
+    }
     EDGE_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (255 - 24, 255),
         'prominence': 10,
         'distance': 50,
         'width': (0, 10),
         'wlen': 1000,
-	}
+    }
 
 
 class Campaign(CampaignBase):
     MAP = MAP
-	
+
     def battle_0(self):
         self.fleet_2_push_forward()
-		
+
         if self.clear_roadblocks([road_main]):
             return True
         if self.clear_potential_roadblocks([road_main]):
@@ -81,5 +81,5 @@ class Campaign(CampaignBase):
             if not self.check_accessibility(boss[0], fleet=2):
                 if self.clear_roadblocks([road_main]):
                     return True
-				
-        return self.fleet_2.clear_boss()
\ No newline at end of file
+
+        return self.fleet_2.clear_boss()
diff --git a/campaign/campaign_main/campaign_10_2.py b/campaign/campaign_main/campaign_10_2.py
index 6038fee70..3b04900fb 100644
--- a/campaign/campaign_main/campaign_10_2.py
+++ b/campaign/campaign_main/campaign_10_2.py
@@ -3,7 +3,6 @@ from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
-
 MAP = CampaignMap('10-2')
 MAP.shape = 'H6'
 MAP.map_data = '''
diff --git a/campaign/campaign_main/campaign_10_4.py b/campaign/campaign_main/campaign_10_4.py
index 944d4eb4f..3c6f93a30 100644
--- a/campaign/campaign_main/campaign_10_4.py
+++ b/campaign/campaign_main/campaign_10_4.py
@@ -3,7 +3,6 @@ from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
-
 MAP = CampaignMap('10-4')
 MAP.shape = 'I6'
 MAP.map_data = '''
diff --git a/campaign/campaign_main/campaign_3_2.py b/campaign/campaign_main/campaign_3_2.py
index e0e833019..35dcd4869 100644
--- a/campaign/campaign_main/campaign_3_2.py
+++ b/campaign/campaign_main/campaign_3_2.py
@@ -48,7 +48,6 @@ class Campaign(CampaignBase):
         return self.battle_default()
 
     def battle_3(self):
-        # print(H1.__dict__)
         self.clear_all_mystery()
 
         if not self.check_accessibility(H1, fleet='boss'):
diff --git a/campaign/campaign_main/campaign_9_2.py b/campaign/campaign_main/campaign_9_2.py
index d537d91bb..b38d8cfe3 100644
--- a/campaign/campaign_main/campaign_9_2.py
+++ b/campaign/campaign_main/campaign_9_2.py
@@ -3,32 +3,31 @@ from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
-
 MAP = CampaignMap('9-2')
 MAP.shape = 'I5'
 MAP.map_data = '''
-	++ ++ ME -- MB ME -- ME --
-	MM ++ ME ME MB ME ++ ME --
-	ME -- ME ++ ++ ++ ++ ME ++
-	-- ++ -- -- ++ SP -- ME --
-	-- ME -- SP ++ SP -- -- --  
+    ++ ++ ME -- MB ME -- ME --
+    MM ++ ME ME MB ME ++ ME --
+    ME -- ME ++ ++ ++ ++ ME ++
+    -- ++ -- -- ++ SP -- ME --
+    -- ME -- SP ++ SP -- -- --  
 '''
-#MAP.weight_data = '''
-#	10 10 30 10 10 10 10 10 10
-#	10 10 20 30 10 30 10 10 10
-#	30 10 20 10 10 10 10 10 10
-#	10 10 10 10 10 10 10 10 10
-#	10 30 10 10 10 10 10 10 10
-#'''
-#MAP.camera_data = ['D4']
+MAP.weight_data = '''
+    10 10 30 10 10 10 10 10 10
+    10 10 20 30 10 30 10 10 10
+    30 10 20 10 10 10 10 10 10
+    10 10 10 10 10 10 10 10 10
+    10 30 10 10 10 10 10 10 10
+'''
+MAP.camera_data = ['D4']
 MAP.spawn_data = [
-     {'battle': 0, 'enemy': 3},
-     {'battle': 1, 'enemy': 2},
-     {'battle': 2, 'enemy': 2},
-     {'battle': 3, 'enemy': 1},
-     {'battle': 4, 'enemy': 1},
-     {'battle': 5, 'boss': 1},
- ]
+    {'battle': 0, 'enemy': 3},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5, 'boss': 1},
+]
 
 A1, B1, C1, D1, E1, F1, G1, H1, I1, \
 A2, B2, C2, D2, E2, F2, G2, H2, I2, \
@@ -40,66 +39,66 @@ A5, B5, C5, D5, E5, F5, G5, H5, I5, \
 road_main = RoadGrids([C3, C2, [C1, D2], F1, H1, H2, H3, H4])
 
 
-
 class Config:
-	SUBMARINE = 0
-	INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
-	EDGE_LINES_HOUGHLINES_THRESHOLD = 40
-	COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
-	INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+    SUBMARINE = 0
+    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
+    EDGE_LINES_HOUGHLINES_THRESHOLD = 40
+    COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (150, 255 - 24),
         'width': (0.9, 10),
         'prominence': 10,
         'distance': 35,
-	}
-	EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (255 - 24, 255),
         'prominence': 10,
         'distance': 50,
         'width': (0, 10),
         'wlen': 1000,
-	}
+    }
+
 
 class Campaign(CampaignBase):
-	MAP = MAP
+    MAP = MAP
 
-	def battle_0(self):
-		if self.fleet_at(D5, fleet=2):
-			self.map.weight_data = '''
-				10 10 30 10 10 20 30 40 10
-				10 10 10 10 10 30 10 50 10
-				30 10 10 10 10 10 10 60 10
-				10 10 10 10 10 10 10 70 10
-				10 30 10 10 10 10 10 10 10
-			'''
-		if self.fleet_at(F4, fleet=2):
-			self.map.weight_data = '''
-				10 10 30 10 10 10 10 10 10
-				10 10 20 30 10 30 10 10 10
-				30 10 20 10 10 10 10 10 10
-				10 10 10 10 10 10 10 10 10
-				10 30 10 10 10 10 10 10 10
-			'''
-		if self.fleet_at(F5, fleet=2):
-			self.map.weight_data = '''
-				10 10 30 10 10 10 10 10 10
-				10 10 20 30 10 30 10 10 10
-				30 10 20 10 10 10 10 10 10
-				10 10 10 10 10 10 10 10 10
-				10 30 10 10 10 10 10 10 10
-			'''
-		if self.clear_roadblocks([road_main]):
-			return True
-		if self.clear_potential_roadblocks([road_main]):
-			return True
+    def battle_0(self):
+        if self.fleet_at(D5, fleet=2):
+            self.map.weight_data = '''
+                10 10 30 10 10 20 30 40 10
+                10 10 10 10 10 30 10 50 10
+                30 10 10 10 10 10 10 60 10
+                10 10 10 10 10 10 10 70 10
+                10 30 10 10 10 10 10 10 10
+            '''
+        if self.fleet_at(F4, fleet=2):
+            self.map.weight_data = '''
+                10 10 30 10 10 10 10 10 10
+                10 10 20 30 10 30 10 10 10
+                30 10 20 10 10 10 10 10 10
+                10 10 10 10 10 10 10 10 10
+                10 30 10 10 10 10 10 10 10
+            '''
+        if self.fleet_at(F5, fleet=2):
+            self.map.weight_data = '''
+                10 10 30 10 10 10 10 10 10
+                10 10 20 30 10 30 10 10 10
+                30 10 20 10 10 10 10 10 10
+                10 10 10 10 10 10 10 10 10
+                10 30 10 10 10 10 10 10 10
+            '''
+        if self.clear_roadblocks([road_main]):
+            return True
+        if self.clear_potential_roadblocks([road_main]):
+            return True
 
-		return self.battle_default()
+        return self.battle_default()
 
-	def battle_5(self):
-		boss = self.map.select(is_boss=True)
-		if boss:
-			if not self.check_accessibility(boss[0], fleet=2):
-				if self.clear_roadblocks([road_main]):
-					return True
-				
-		return self.fleet_2.clear_boss()
\ No newline at end of file
+    def battle_5(self):
+        boss = self.map.select(is_boss=True)
+        if boss:
+            if not self.check_accessibility(boss[0], fleet=2):
+                if self.clear_roadblocks([road_main]):
+                    return True
+
+        return self.fleet_2.clear_boss()
diff --git a/campaign/campaign_main/campaign_9_3.py b/campaign/campaign_main/campaign_9_3.py
index fdf120fed..d8521199c 100644
--- a/campaign/campaign_main/campaign_9_3.py
+++ b/campaign/campaign_main/campaign_9_3.py
@@ -3,34 +3,33 @@ from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
-
 MAP = CampaignMap('9-3')
 MAP.shape = 'H6'
 MAP.map_data = '''
-	MB -- ME -- ME -- ++ MB
-	ME ++ ++ ++ MB ME ++ --
-	ME __ -- SP ++ ME ME --
-	-- -- ME ++ SP -- __ ME
-	++ -- ME MB ++ ++ ++ --
-	++ ++ -- ME -- ME ME MB
+    MB -- ME -- ME -- ++ MB
+    ME ++ ++ ++ MB ME ++ --
+    ME __ -- SP ++ ME ME --
+    -- -- ME ++ SP -- __ ME
+    ++ -- ME MB ++ ++ ++ --
+    ++ ++ -- ME -- ME ME MB
 '''
 MAP.weight_data = '''
-	10 10 10 10 10 10 10 10
-	10 10 10 10 10 10 10 10
-	10 10 10 10 10 10 20 10
-	10 10 20 10 10 10 10 10
-	10 10 10 10 10 10 10 10
-	10 10 10 10 10 10 10 10
+    10 10 10 10 10 10 10 10
+    10 10 10 10 10 10 10 10
+    10 10 10 10 10 10 20 10
+    10 10 20 10 10 10 10 10
+    10 10 10 10 10 10 10 10
+    10 10 10 10 10 10 10 10
 '''
-#MAP.camera_data = ['D4']
+# MAP.camera_data = ['D4']
 MAP.spawn_data = [
-     {'battle': 0, 'enemy': 3},
-     {'battle': 1, 'enemy': 2},
-     {'battle': 2, 'enemy': 2},
-     {'battle': 3, 'enemy': 1},
-     {'battle': 4, 'enemy': 1},
-     {'battle': 5, 'boss': 1},
- ]
+    {'battle': 0, 'enemy': 3},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 1},
+    {'battle': 5, 'boss': 1},
+]
 
 A1, B1, C1, D1, E1, F1, G1, H1, \
 A2, B2, C2, D2, E2, F2, G2, H2, \
@@ -42,40 +41,42 @@ A6, B6, C6, D6, E6, F6, G6, H6, \
 
 road_main = RoadGrids([A2, A3, C5, D6, F2, F3, F6, G6, H4])
 
+
 class Config:
-	INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
-	EDGE_LINES_HOUGHLINES_THRESHOLD = 40
-	COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
-	INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
+    EDGE_LINES_HOUGHLINES_THRESHOLD = 40
+    COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (150, 255 - 24),
         'width': (0.9, 10),
         'prominence': 10,
         'distance': 35,
-	}
-	EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (255 - 24, 255),
         'prominence': 10,
         'distance': 50,
         'width': (0, 10),
         'wlen': 1000,
-	}
+    }
+
 
 class Campaign(CampaignBase):
-	MAP = MAP
+    MAP = MAP
 
-	def battle_0(self):
-		if self.clear_roadblocks([road_main]):
-			return True
-		if self.clear_potential_roadblocks([road_main]):
-			return True
+    def battle_0(self):
+        if self.clear_roadblocks([road_main]):
+            return True
+        if self.clear_potential_roadblocks([road_main]):
+            return True
 
-		return self.battle_default()
+        return self.battle_default()
 
-	def battle_5(self):
-		boss = self.map.select(is_boss=True)
-		if boss:
-			if not self.check_accessibility(boss[0], fleet=2):
-				if self.clear_roadblocks([road_main]):
-					return True
-				
-		return self.fleet_2.clear_boss()
\ No newline at end of file
+    def battle_5(self):
+        boss = self.map.select(is_boss=True)
+        if boss:
+            if not self.check_accessibility(boss[0], fleet=2):
+                if self.clear_roadblocks([road_main]):
+                    return True
+
+        return self.fleet_2.clear_boss()
diff --git a/campaign/campaign_main/campaign_9_4.py b/campaign/campaign_main/campaign_9_4.py
index d708b9b76..3ca32c481 100644
--- a/campaign/campaign_main/campaign_9_4.py
+++ b/campaign/campaign_main/campaign_9_4.py
@@ -7,31 +7,31 @@ MAP = CampaignMap('9-4')
 MAP.shape = 'I6'
 
 MAP.map_data = '''
-	MB -- ME -- ++ ++ ++ -- MB
-	-- ++ __ ME -- ME ME ME --
-	ME -- ME -- ME -- __ ++ --
-	ME -- ++ ++ -- -- ME __ ME
-	SP -- MA ++ ME -- ++ ME --
-	SP -- -- ME -- ME ++ -- MB
+    MB -- ME -- ++ ++ ++ -- MB
+    -- ++ __ ME -- ME ME ME --
+    ME -- ME -- ME -- __ ++ --
+    ME -- ++ ++ -- -- ME __ ME
+    SP -- MA ++ ME -- ++ ME --
+    SP -- -- ME -- ME ++ -- MB
 '''
 
 MAP.weight_data = '''
-	10 10 20 10 10 10 10 10 10
-	10 10 10 20 10 10 10 10 10
-	10 10 20 10 20 10 10 10 10
-	20 10 10 10 10 10 10 10 10
-	10 10 10 10 10 10 10 10 10
-	10 10 10 10 10 10 10 10 10
+    10 10 20 10 10 10 10 10 10
+    10 10 10 20 10 10 10 10 10
+    10 10 20 10 20 10 10 10 10
+    20 10 10 10 10 10 10 10 10
+    10 10 10 10 10 10 10 10 10
+    10 10 10 10 10 10 10 10 10
 '''
 
 MAP.spawn_data = [
-     {'battle': 0, 'enemy': 3},
-     {'battle': 1, 'enemy': 2},
-     {'battle': 2, 'enemy': 2},
-     {'battle': 3, 'enemy': 1},
-     {'battle': 4, 'enemy': 2},
-     {'battle': 5, 'boss': 1},
- ]
+    {'battle': 0, 'enemy': 3},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 1},
+    {'battle': 4, 'enemy': 2},
+    {'battle': 5, 'boss': 1},
+]
 
 A1, B1, C1, D1, E1, F1, G1, H1, I1, \
 A2, B2, C2, D2, E2, F2, G2, H2, I2, \
@@ -43,40 +43,42 @@ A6, B6, C6, D6, E6, F6, G6, H6, I6, \
 
 road_main = RoadGrids([A3, D6, [E5, F6], G4, I4])
 
+
 class Config:
-	INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
-	EDGE_LINES_HOUGHLINES_THRESHOLD = 40
-	COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
-	INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
+    EDGE_LINES_HOUGHLINES_THRESHOLD = 40
+    COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (150, 255 - 24),
         'width': (0.9, 10),
         'prominence': 10,
         'distance': 35,
-	}
-	EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (255 - 24, 255),
         'prominence': 10,
         'distance': 50,
         'width': (0, 10),
         'wlen': 1000,
-	}
+    }
+
 
 class Campaign(CampaignBase):
-	MAP = MAP
+    MAP = MAP
 
-	def battle_0(self):
-		if self.clear_roadblocks([road_main]):
-			return True
-		if self.clear_potential_roadblocks([road_main]):
-			return True
+    def battle_0(self):
+        if self.clear_roadblocks([road_main]):
+            return True
+        if self.clear_potential_roadblocks([road_main]):
+            return True
 
-		return self.battle_default()
+        return self.battle_default()
 
-	def battle_5(self):
-		boss = self.map.select(is_boss=True)
-		if boss:
-			if not self.check_accessibility(boss[0], fleet=2):
-				if self.clear_roadblocks([road_main]):
-					return True
-				
-		return self.fleet_2.clear_boss()
\ No newline at end of file
+    def battle_5(self):
+        boss = self.map.select(is_boss=True)
+        if boss:
+            if not self.check_accessibility(boss[0], fleet=2):
+                if self.clear_roadblocks([road_main]):
+                    return True
+
+        return self.fleet_2.clear_boss()