Add: [EN] Assets updated

Fix: [EN] A3 and C3 of the event Iris of Light and Dark Rerun
Optimize: [EN] commission filter, expect many mistakes yet
Optimize: [EN] added some tips on GUI
Add: [EN] New assets for Tactical Class, this module should work now

campaign/event_20200521_en/a3.py

@@ -3,52 +3,56 @@ from module.map.map_base import CampaignMap
 from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
-MAP = CampaignMap('')
-# MAP.shape = 'K7'
+MAP = CampaignMap('a3')
+MAP.shape = 'K7'
 # MAP.camera_data = ['D2', 'D5', 'F3', 'F5']
-# MAP.map_data = '''
-#     SP ++ ++ ++ ME -- -- -- ME -- MM
-#     -- -- -- -- -- -- ME -- -- -- --
-#     ME -- ++ ME -- -- -- -- ++ ++ --
-#     ME -- -- -- MS ++ __ -- MB ++ --
-#     -- -- ME -- -- -- -- -- -- -- --
-#     -- -- ++ ++ ME ME -- ME ++ ++ ++
-#     SP -- ++ MM ME -- -- -- -- ME MM
-# '''
 MAP.map_data = '''
-    SP ++ ++ ++ -- -- -- -- -- -- --
-    -- -- -- -- -- -- -- -- -- -- --
-    -- -- ++ -- -- -- -- -- ++ ++ --
-    -- -- -- -- -- ++ -- -- -- ++ --
-    -- -- -- -- -- -- -- -- -- -- --
-    -- -- ++ ++ -- -- -- -- ++ ++ ++
-    SP -- ++ ++ -- -- -- -- -- -- --
+    SP ++ ++ ++ ME -- -- -- ME -- MM
+    -- -- -- -- -- -- ME -- -- -- --
+    ME -- ++ ME -- -- -- -- ++ ++ --
+    ME -- -- -- MS ++ __ -- MB ++ --
+    -- -- ME -- -- -- -- -- -- -- --
+    -- -- ++ ++ ME ME -- ME ++ ++ ++
+    SP -- ++ MM ME -- -- -- -- ME MM
 '''
+# MAP.map_data = '''
+#     SP ++ ++ ++ -- -- -- -- -- -- --
+#     -- -- -- -- -- -- -- -- -- -- --
+#     -- -- ++ -- -- -- -- -- ++ ++ --
+#     -- -- -- -- -- ++ -- -- -- ++ --
+#     -- -- -- -- -- -- -- -- -- -- --
+#     -- -- ++ ++ -- -- -- -- ++ ++ ++
+#     SP -- ++ ++ -- -- -- -- -- -- --
+# '''
 
 class Config:
-    SUBMARINE = 0
-    FLEET_BOSS = 0
-
     POOR_MAP_DATA = True
     MAP_HAS_AMBUSH = False
-    MAP_HAS_FLEET_STEP = True
-    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_FLEET_STEP = False
+    MAP_HAS_MOVABLE_ENEMY = False
     MAP_HAS_SIREN = True
-    MAP_HAS_DYNAMIC_RED_BORDER = False
-    MAP_HAS_MAP_STORY = True
-    MAP_SIREN_COUNT = 0
+    MAP_HAS_DYNAMIC_RED_BORDER = True
+    MAP_SIREN_COUNT = 1
+    MAP_GRID_CENTER_TOLERANCE = 0.3
+    MAP_SIREN_TEMPLATE = ['1', '2', '3', 'DD']
 
-    TRUST_EDGE_LINES = False
-    COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
+    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 50
+    MID_DIFF_RANGE_H = (45, 70)
+    MID_DIFF_RANGE_V = (97 - 3, 97 + 3)
+    TRUST_EDGE_LINES = True
+
+    VANISH_POINT_RANGE = ((540, 740), (-4000, -2000))
+    DISTANCE_POINT_X_RANGE = ((-2000, -1000),)
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (100, 255 - 24),
-        'width': 1,
+        'height': (80, 255 - 40),
+        'width': (0.9, 10),
         'prominence': 10,
         'distance': 35,
+        'wlen': 100,
     }
     EDGE_LINES_FIND_PEAKS_PARAMETERS = {
-        'height': (255 - 24, 255),
-        'prominence': 2,
+        'height': (255 - 40, 255),
+        'prominence': 10,
         'distance': 50,
         'wlen': 1000
     }

campaign/event_20200521_en/c3.py

@@ -17,31 +17,39 @@ MAP.map_data = '''
     SP -- ++ ++ ME -- -- -- -- ME MM
 '''
 
-A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
-A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
-A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
-A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
-A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
-A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
-A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
-    = MAP.flatten()
+# A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
+# A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
+# A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
+# A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
+# A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
+# A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
+# A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
+#     = MAP.flatten()
 
 class Config:
     POOR_MAP_DATA = True
     MAP_HAS_AMBUSH = False
-    MAP_HAS_FLEET_STEP = True
-    MAP_HAS_MOVABLE_ENEMY = True
+    MAP_HAS_FLEET_STEP = False
+    MAP_HAS_MOVABLE_ENEMY = False
     MAP_HAS_SIREN = True
-    MAP_HAS_DYNAMIC_RED_BORDER = True
+    # MAP_HAS_DYNAMIC_RED_BORDER = False
     MAP_SIREN_COUNT = 2
+    MAP_GRID_CENTER_TOLERANCE = 0.3
+    MAP_SIREN_TEMPLATE = ['1', '2', '3', 'DD']
 
+    INTERNAL_LINES_HOUGHLINES_THRESHOLD = 50
+    MID_DIFF_RANGE_H = (45, 70)
+    MID_DIFF_RANGE_V = (97 - 3, 97 + 3)
     TRUST_EDGE_LINES = True
 
+    VANISH_POINT_RANGE = ((540, 740), (-4000, -2000))
+    DISTANCE_POINT_X_RANGE = ((-2000, -1000),)
     INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (80, 255 - 40),
         'width': (0.9, 10),
         'prominence': 10,
         'distance': 35,
+        'wlen': 100,
     }
     EDGE_LINES_FIND_PEAKS_PARAMETERS = {
         'height': (255 - 40, 255),

campaign/event_20200521_en/d2.py

@@ -33,9 +33,8 @@ MAP.spawn_data = [
 ]
 
 class Config:
-    SUBMARINE = 1
-    FLEET_BOSS = 2
-
+    SUBMARINE = 0
+    FLEET_BOSS = 0
     MAP_HAS_AMBUSH = False
     MAP_HAS_FLEET_STEP = False
     MAP_HAS_MOVABLE_ENEMY = False