From aa6a49314f7822e186c090d0c0e60e4b31051b5f Mon Sep 17 00:00:00 2001 From: Cerz0 <62533167+Cerz0@users.noreply.github.com> Date: Sun, 31 May 2020 20:55:47 +0200 Subject: [PATCH 1/2] Create campaign_9_3.py --- campaign/campaign_main/campaign_9_3.py | 83 ++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 campaign/campaign_main/campaign_9_3.py diff --git a/campaign/campaign_main/campaign_9_3.py b/campaign/campaign_main/campaign_9_3.py new file mode 100644 index 000000000..92f41a5e4 --- /dev/null +++ b/campaign/campaign_main/campaign_9_3.py @@ -0,0 +1,83 @@ +from module.campaign.campaign_base import CampaignBase +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 +''' +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 +''' +#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}, + ] + +A1, B1, C1, D1, E1, F1, G1, H1, \ +A2, B2, C2, D2, E2, F2, G2, H2, \ +A3, B3, C3, D3, E3, F3, G3, H3, \ +A4, B4, C4, D4, E4, F4, G4, H4, \ +A5, B5, C5, D5, E5, F5, G5, H5, \ +A6, B6, C6, D6, E6, F6, G6, H6, \ + = MAP.flatten() + +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 = { + 'height': (150, 255 - 24), + '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): + if self.clear_roadblocks([road_main]): + return True + if self.clear_potential_roadblocks([road_main]): + return True + + return self.battle_default() + + def battle_5(self): + boss = self.map.select(is_boss=True) + if boss: + if not self.check_accessibility(boss[0]): + if self.clear_roadblocks([road_main]): + return True + if self.clear_potential_roadblocks([road_main]): + return True + + return self.clear_boss() \ No newline at end of file From d85c7e95fabbe2425c7360f2fcafd9d0004d0b6d Mon Sep 17 00:00:00 2001 From: Cerz0 <62533167+Cerz0@users.noreply.github.com> Date: Sun, 31 May 2020 22:01:32 +0200 Subject: [PATCH 2/2] Update campaign_9_3.py --- campaign/campaign_main/campaign_9_3.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/campaign/campaign_main/campaign_9_3.py b/campaign/campaign_main/campaign_9_3.py index 92f41a5e4..fdf120fed 100644 --- a/campaign/campaign_main/campaign_9_3.py +++ b/campaign/campaign_main/campaign_9_3.py @@ -74,10 +74,8 @@ class Campaign(CampaignBase): def battle_5(self): boss = self.map.select(is_boss=True) if boss: - if not self.check_accessibility(boss[0]): + if not self.check_accessibility(boss[0], fleet=2): if self.clear_roadblocks([road_main]): return True - if self.clear_potential_roadblocks([road_main]): - return True - - return self.clear_boss() \ No newline at end of file + + return self.fleet_2.clear_boss() \ No newline at end of file