diff --git a/campaign/event_20200521_cn/a1.py b/campaign/event_20200521_cn/a1.py index 7bd6acbe1..fc539bb77 100644 --- a/campaign/event_20200521_cn/a1.py +++ b/campaign/event_20200521_cn/a1.py @@ -31,13 +31,13 @@ class Config: TRUST_EDGE_LINES = False COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5 INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (100, 235), + 'height': (100, 255 - 24), 'width': 1, 'prominence': 10, 'distance': 35, } EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 80, 255), + 'height': (255 - 24, 255), 'prominence': 2, 'distance': 50, 'wlen': 1000 diff --git a/campaign/event_20200521_cn/b1.py b/campaign/event_20200521_cn/b1.py index caf0d870d..c336e5ba1 100644 --- a/campaign/event_20200521_cn/b1.py +++ b/campaign/event_20200521_cn/b1.py @@ -36,13 +36,13 @@ class Config: TRUST_EDGE_LINES = False COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5 INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (100, 235), + 'height': (100, 255 - 24), 'width': 1, 'prominence': 10, 'distance': 35, } EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 80, 255), + 'height': (255 - 24, 255), 'prominence': 2, 'distance': 50, 'wlen': 1000 diff --git a/campaign/event_20200521_cn/d1.py b/campaign/event_20200521_cn/d1.py index 6a60f69be..84364b6c2 100644 --- a/campaign/event_20200521_cn/d1.py +++ b/campaign/event_20200521_cn/d1.py @@ -73,7 +73,7 @@ class Campaign(CampaignBase): return True if self.clear_enemy(scale=(1,)): return True - if self.clear_enemy(scale=(2,), genre=['light', 'main', 'carrier']): + if self.clear_enemy(scale=(2,), genre=['light', 'main', 'enemy', 'carrier']): return True if self.clear_enemy(genre=['light', 'main']): return True