From a953d5b4b25d4ea7fb3a0da86a816ca3de5f71d4 Mon Sep 17 00:00:00 2001 From: Cerz0 <62533167+Cerz0@users.noreply.github.com> Date: Thu, 4 Jun 2020 13:50:59 +0200 Subject: [PATCH] Update campaign_10_1.py Corrected map_data Set up map.weight, spawn_data and roadblocks --- campaign/campaign_main/campaign_10_1.py | 83 ++++++++++++++++++------- 1 file changed, 59 insertions(+), 24 deletions(-) diff --git a/campaign/campaign_main/campaign_10_1.py b/campaign/campaign_main/campaign_10_1.py index ef1921289..ecad3a6f7 100644 --- a/campaign/campaign_main/campaign_10_1.py +++ b/campaign/campaign_main/campaign_10_1.py @@ -7,30 +7,31 @@ 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 ME ME MB - -- ME ME ME ++ ++ MB - -- -- ++ ME ME ++ MB - SP -- ++ ++ -- -- ++ + SP -- ++ -- ME ME -- + -- -- ++ ME ME ME ME + -- ME ME ME ++ ++ MB + -- ME ME ME ME ++ MB + -- -- ++ -- ME ME ME + 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 ''' -# MAP.weight_data = ''' -# 10 10 10 10 10 10 10 -# 10 20 10 10 10 10 10 -# 10 10 10 10 30 10 10 -# 10 10 10 10 10 10 10 -# 10 10 10 10 10 10 10 -# 10 10 10 10 10 10 10 -# ''' # MAP.camera_data = ['D3'] -# MAP.spawn_data = [ -# {'battle': 0, 'enemy': 3}, -# {'battle': 1, 'enemy': 2, 'mystery': 1}, -# {'battle': 2, 'enemy': 2, 'mystery': 1}, -# {'battle': 3, 'enemy': 1, 'mystery': 2}, -# {'battle': 4, 'enemy': 1}, -# {'battle': 5, 'boss': 1}, -# ] +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}, + ] A1, B1, C1, D1, E1, F1, G1, \ A2, B2, C2, D2, E2, F2, G2, \ @@ -40,10 +41,44 @@ A5, B5, C5, D5, E5, F5, G5, \ A6, B6, C6, D6, E6, F6, G6, \ = MAP.flatten() +road_main = RoadGrids([B4, C4, D4, E5, F5, G5]) + class Config: - pass + 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 + 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_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