From 16cc5422196cf4e4112376d9e3248983ae39477b Mon Sep 17 00:00:00 2001 From: LmeSzinc Date: Mon, 1 Jun 2020 02:46:05 +0800 Subject: [PATCH] Fix: [EN] event map --- campaign/event_20200521_en/a1.py | 12 ++++++++++++ campaign/event_20200521_en/b2.py | 2 +- campaign/event_20200521_en/b3.py | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/campaign/event_20200521_en/a1.py b/campaign/event_20200521_en/a1.py index ed452dac4..3523049b5 100644 --- a/campaign/event_20200521_en/a1.py +++ b/campaign/event_20200521_en/a1.py @@ -13,6 +13,7 @@ MAP.map_data = ''' -- ME -- -- ++ ME -- ME -- SP -- -- ME ++ -- ME -- MB ''' +MAP.camera_data = ['D1', 'D3', 'F1', 'F3'] class Config: POOR_MAP_DATA = True @@ -25,6 +26,12 @@ class Config: TRUST_EDGE_LINES = True + INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 + EDGE_LINES_HOUGHLINES_THRESHOLD = 40 + COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5 + MID_DIFF_RANGE_H = (140 - 3, 140 + 3) + MID_DIFF_RANGE_V = (143 - 3, 143 + 3) + INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { 'height': (80, 255 - 40), 'width': (0.9, 10), @@ -42,3 +49,8 @@ class Config: class Campaign(CampaignBase): MAP = MAP + def handle_boss_appear_refocus(self): + if self.battle_count == 4: + self.map_swipe((-3, -2)) + + return super().handle_boss_appear_refocus() diff --git a/campaign/event_20200521_en/b2.py b/campaign/event_20200521_en/b2.py index f8a088fbe..9d3b321dc 100644 --- a/campaign/event_20200521_en/b2.py +++ b/campaign/event_20200521_en/b2.py @@ -74,5 +74,5 @@ class Campaign(CampaignBase): return self.battle_default() def battle_5(self): - return self.clear_boss() + return self.fleet_2.clear_boss() diff --git a/campaign/event_20200521_en/b3.py b/campaign/event_20200521_en/b3.py index c1d2dd764..7b5c9c5f0 100644 --- a/campaign/event_20200521_en/b3.py +++ b/campaign/event_20200521_en/b3.py @@ -82,6 +82,6 @@ class Campaign(CampaignBase): return self.battle_default() def battle_5(self): - return self.clear_boss() + return self.fleet_2.clear_boss()