Added new EN assets and new maps support

- Added suport to 10-1 and 10-2
- Added suport to EN event Iris of Light and Dark Rerun, only D2 at the moment
- New EN assets

campaign/campaign_main/campaign_10_1.py

@@ -0,0 +1,49 @@
+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('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 -- ++ ++ -- -- ++
+'''
+# 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},
+# ]
+
+A1, B1, C1, D1, E1, F1, G1, \
+A2, B2, C2, D2, E2, F2, G2, \
+A3, B3, C3, D3, E3, F3, G3, \
+A4, B4, C4, D4, E4, F4, G4, \
+A5, B5, C5, D5, E5, F5, G5, \
+A6, B6, C6, D6, E6, F6, G6, \
+    = MAP.flatten()
+
+
+class Config:
+    pass
+
+
+class Campaign(CampaignBase):
+    MAP = MAP

campaign/campaign_main/campaign_10_2.py

@@ -0,0 +1,49 @@
+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('10-2')
+MAP.shape = 'H6'
+MAP.map_data = '''
+    MB -- ME ME -- ++ ME MB
+    -- ++ ++ ME ME ++ ME ME
+    -- SP ++ ++ __ ME ME ++
+    -- SP ++ ++ -- ME ME ++
+    -- ++ ++ -- ME ++ ME ME
+    -- -- -- -- ME ++ ME MB
+'''
+# MAP.weight_data = '''
+#     10 10 10 10 10 10 10 10
+#     10 20 10 10 10 10 10 10
+#     10 10 10 10 30 10 10 20
+#     10 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},
+# ]
+
+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()
+
+
+class Config:
+    pass
+
+
+class Campaign(CampaignBase):
+    MAP = MAP

campaign/event_20200521_en/d2.py

@@ -0,0 +1,41 @@
+from module.campaign.campaign_base import CampaignBase
+from module.map.map_base import CampaignMap
+
+MAP = CampaignMap('d2')
+MAP.shape = 'I7'
+MAP.map_data = '''
+    SP -- -- -- -- -- ME ++ MB 
+    -- ME -- MS ME -- -- ++ -- 
+    -- -- ME ++ ++ ++ -- -- -- 
+    ME __ -- ME ME ME -- MS -- 
+    ME MS -- ++ ++ ++ -- -- -- 
+    -- ME -- ME -- -- -- ++ -- 
+    SP -- -- -- -- ME -- ++ MB 
+'''
+
+MAP.camera_data = ['D2', 'B5', 'H4']
+MAP.weight_data = """
+    40 40 40 40 40 40 30 40 20
+    40 30 40 10 30 40 40 40 40
+    40 40 30 40 40 40 40 40 40
+    30 30 40 30 30 30 40 10 40
+    30 10 40 40 40 40 40 40 40
+    40 30 40 30 40 40 40 40 40
+    40 40 40 40 40 30 40 40 20
+"""
+
+class Config:
+    CAMPAIGN_MODE = 'hard'
+    SUBMARINE = 1
+    FLEET_BOSS = 2
+    POOR_MAP_DATA = False
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_FLEET_STEP = False
+    MAP_HAS_MOVABLE_ENEMY = False
+    MAP_HAS_SIREN = True
+    MAP_HAS_DYNAMIC_RED_BORDER = False
+    MAP_HAS_MAP_STORY = False
+    MAP_SIREN_COUNT = 3
+
+class Campaign(CampaignBase):
+    MAP = MAP

module/config/dictionary.py

@@ -195,12 +195,8 @@ dic_true_eng_to_eng = {
     'good_opponent': 'good_opponent',
 
     # Event
-    '北境序曲': 'event_20200227_cn',
+    'event_20200521_en': 'event_20200521_en',
-    '复刻斯图尔特的硝烟': 'event_20200312_cn',
+
-    '微层混合': 'event_20200326_cn',
-    '复刻苍红的回响': 'event_20200423_cn',
-    '夜幕下的归途': 'event_20200507_cn',
-    '穹顶下的圣咏曲': 'event_20200521_cn',
 }
 
 dic_chi_to_eng = {

module/handler/assets.py

@@ -14,7 +14,7 @@ FORMATION_3 = Button(area={'cn': (1108, 415, 1170, 477), 'en': (1108, 415, 1170,
 FORMATION_LOCATION = Button(area={'cn': (145, 115, 437, 159), 'en': (145, 115, 437, 159)}, color={'cn': (103, 118, 118), 'en': (103, 118, 118)}, button={'cn': (145, 115, 437, 159), 'en': (145, 115, 437, 159)}, file={'cn': './assets/cn/handler/FORMATION_LOCATION.png', 'en': './assets/en/handler/FORMATION_LOCATION.png'})
 GET_AMMO = Button(area={'cn': (792, 315, 794, 333), 'en': (792, 315, 794, 333)}, color={'cn': (251, 250, 255), 'en': (251, 250, 255)}, button={'cn': (792, 315, 794, 333), 'en': (792, 315, 794, 333)}, file={'cn': './assets/cn/handler/GET_AMMO.png', 'en': './assets/en/handler/GET_AMMO.png'})
 GET_ITEMS_1 = Button(area={'cn': (538, 217, 741, 253), 'en': (550, 215, 739, 246)}, color={'cn': (160, 192, 248), 'en': (157, 187, 233)}, button={'cn': (924, 653, 943, 672), 'en': (924, 653, 943, 672)}, file={'cn': './assets/cn/handler/GET_ITEMS_1.png', 'en': './assets/en/handler/GET_ITEMS_1.png'})
-GET_MISSION = Button(area={'cn': (553, 491, 727, 551), 'en': (553, 491, 727, 551)}, color={'cn': (96, 144, 204), 'en': (96, 144, 204)}, button={'cn': (553, 491, 727, 551), 'en': (553, 491, 727, 551)}, file={'cn': './assets/cn/handler/GET_MISSION.png', 'en': './assets/en/handler/GET_MISSION.png'})
+GET_MISSION = Button(area={'cn': (553, 491, 727, 551), 'en': (553, 481, 727, 541)}, color={'cn': (96, 144, 204), 'en': (109, 153, 209)}, button={'cn': (553, 491, 727, 551), 'en': (553, 481, 727, 541)}, file={'cn': './assets/cn/handler/GET_MISSION.png', 'en': './assets/en/handler/GET_MISSION.png'})
 INFO_BAR_1 = Button(area={'cn': (194, 297, 1086, 299), 'en': (194, 297, 1086, 299)}, color={'cn': (107, 158, 255), 'en': (107, 158, 255)}, button={'cn': (194, 297, 1086, 299), 'en': (194, 297, 1086, 299)}, file={'cn': './assets/cn/handler/INFO_BAR_1.png', 'en': './assets/en/handler/INFO_BAR_1.png'})
 INFO_BAR_2 = Button(area={'cn': (194, 234, 1086, 236), 'en': (194, 234, 1086, 236)}, color={'cn': (107, 158, 255), 'en': (107, 158, 255)}, button={'cn': (194, 234, 1086, 236), 'en': (194, 234, 1086, 236)}, file={'cn': './assets/cn/handler/INFO_BAR_2.png', 'en': './assets/en/handler/INFO_BAR_2.png'})
 INFO_BAR_3 = Button(area={'cn': (194, 171, 1086, 173), 'en': (194, 171, 1086, 173)}, color={'cn': (107, 158, 255), 'en': (107, 158, 255)}, button={'cn': (194, 171, 1086, 173), 'en': (194, 171, 1086, 173)}, file={'cn': './assets/cn/handler/INFO_BAR_3.png', 'en': './assets/en/handler/INFO_BAR_3.png'})