[EN] Localization progress

- Some GUI optimizations
- Minor fix in Quick Guide

campaign/event_20200521_en/a1.py

@@ -14,9 +14,7 @@ MAP.map_data = '''
     SP -- -- ME ++ -- ME -- MB
 '''
 
-
 class Config:
-    SUBMARINE = 1
     POOR_MAP_DATA = True
     MAP_HAS_AMBUSH = False
     MAP_HAS_FLEET_STEP = True

campaign/event_20200521_en/a2.py

@@ -15,7 +15,6 @@ MAP.map_data = '''
 '''
 
 class Config:
-    SUBMARINE = 1
     POOR_MAP_DATA = True
     MAP_HAS_AMBUSH = False
     MAP_HAS_FLEET_STEP = True

campaign/event_20200521_en/a3.py

@@ -2,9 +2,8 @@ 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
-# from campaign.event_20200521_en.a1 import Config
 
-MAP = CampaignMap('a3')
+MAP = CampaignMap('')
 # MAP.shape = 'K7'
 # MAP.camera_data = ['D2', 'D5', 'F3', 'F5']
 # MAP.map_data = '''
@@ -17,43 +16,43 @@ MAP = CampaignMap('a3')
 #     SP -- ++ MM ME -- -- -- -- ME MM
 # '''
 MAP.map_data = '''
-    SP ++ ++ ++ -- -- -- -- -- -- MM
+    SP ++ ++ ++ -- -- -- -- -- -- --
     -- -- -- -- -- -- -- -- -- -- --
     -- -- ++ -- -- -- -- -- ++ ++ --
-    -- -- -- -- MS ++ -- -- MB ++ --
+    -- -- -- -- -- ++ -- -- -- ++ --
     -- -- -- -- -- -- -- -- -- -- --
     -- -- ++ ++ -- -- -- -- ++ ++ ++
-    SP -- ++ ++ -- -- -- -- -- -- MM
+    SP -- ++ ++ -- -- -- -- -- -- --
 '''
 
-# MAP.spawn_data = [
-#     {'battle': 0, 'enemy': 2, 'siren': 1},
-#     {'battle': 1, 'enemy': 1},
-#     {'battle': 2, 'enemy': 1},
-#     {'battle': 3, 'enemy': 1},
-#     {'battle': 4, 'enemy': 1, 'boss': 1},
-# ]
-
-# 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:
     SUBMARINE = 0
-    FLEET_BOSS = 2
+    FLEET_BOSS = 0
 
     POOR_MAP_DATA = True
     MAP_HAS_AMBUSH = False
     MAP_HAS_FLEET_STEP = True
     MAP_HAS_MOVABLE_ENEMY = True
     MAP_HAS_SIREN = True
-    MAP_HAS_DYNAMIC_RED_BORDER = True
-    MAP_SIREN_COUNT = 1
+    MAP_HAS_DYNAMIC_RED_BORDER = False
+    MAP_HAS_MAP_STORY = True
+    MAP_SIREN_COUNT = 0
+
+    TRUST_EDGE_LINES = False
+    COINCIDENT_POINT_ENCOURAGE_DISTANCE = 1.5
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (100, 255 - 24),
+        'width': 1,
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 24, 255),
+        'prominence': 2,
+        'distance': 50,
+        'wlen': 1000
+    }
+
 
 class Campaign(CampaignBase):
     MAP = MAP

campaign/event_20200521_en/b3.py

@@ -19,7 +19,6 @@ MAP.map_data = '''
 '''
 
 class Config:
-    SUBMARINE = 1
     POOR_MAP_DATA = True
     MAP_HAS_AMBUSH = False
     MAP_HAS_FLEET_STEP = False

doc/Quick guide.md

@@ -14,7 +14,7 @@
 
 * Create a folder where you will put the virtual environment, I recommend creating a folder `venv` in the project's root directory
 * Go to project root in command line
-* type `python -m venv path_to_your_folder_venv`
+* type `python -m venv path_to_your_folder\venv`
 
     ![venv](quickguide.assets/venv.png)
     

module/config/argparser_en.py

@@ -288,10 +288,10 @@ def main(ini_name=''):
 
     # 每日设置
     daily_task = daily_parser.add_argument_group('Daily settings', 'Does not support submarine daily')
-    daily_task.add_argument('--daily_mission_1', default=default('--daily_mission_1'), choices=['daily_air', 'daily_gun', 'daily_torpedo'])
-    daily_task.add_argument('--daily_mission_2', default=default('--daily_mission_2'), choices=['index_1', 'index_2', 'index_3'])
-    daily_task.add_argument('--daily_mission_4', default=default('--daily_mission_4'), choices=['index_1', 'index_2', 'index_3'])
-    daily_task.add_argument('--daily_mission_5', default=default('--daily_mission_5'), choices=['index_1', 'index_2', 'index_3'])
+    daily_task.add_argument('--tactical_training', default=default('--tactical_training'), choices=['daily_air', 'daily_gun', 'daily_torpedo'])
+    daily_task.add_argument('--fierce_assault', default=default('--fierce_assault'), choices=['index_1', 'index_2', 'index_3'])
+    daily_task.add_argument('--escort_mission', default=default('--escort_mission'), choices=['index_1', 'index_2', 'index_3'])
+    daily_task.add_argument('--advance_mission', default=default('--advance_mission'), choices=['index_1', 'index_2', 'index_3'])
     daily_task.add_argument('--daily_fleet', default=default('--daily_fleet'), choices=['1', '2', '3', '4', '5', '6'])
     daily_task.add_argument('--daily_equipment', default=default('--daily_equipment'), help='Change equipment before playing, unload equipment after playing, do not need to fill in 0 \ncomma, such as 3, 1, 0, 1, 1, 0')
 

module/config/dictionary.py

@@ -129,10 +129,10 @@ dic_true_eng_to_eng = {
     'enable_daily_mission': 'enable_daily_mission',
     'enable_hard_campaign': 'enable_hard_campaign',
     'enable_exercise': 'enable_exercise',
-    'daily_mission_1': 'daily_mission_1',
-    'daily_mission_2': 'daily_mission_2',
-    'daily_mission_4': 'daily_mission_4',
-    'daily_mission_5': 'daily_mission_5',
+    'tactical_training': 'daily_mission_1',
+    'fierce_assault': 'daily_mission_2',
+    'escort_mission': 'daily_mission_4',
+    'advance_mission': 'daily_mission_5',
     'daily_fleet': 'daily_fleet',
     'daily_equipment': 'daily_equipment',
     'hard_campaign': 'hard_campaign',

module/reward/commission.py

@@ -15,20 +15,20 @@ from module.ui.page import page_reward, page_commission, CAMPAIGN_CHECK
 from module.ui.ui import UI
 
 dictionary = {
-    'major_comm': ['Self Training', 'Defense Exercise', 'Research Mission', 'Tool Prep', 'Tactical Class', 'Cargo Transport'],
-    'daily_comm': ['Daily Resource Extraction', 'Awakening Tactical Research'],
-    'extra_drill': ['Sailing Training', 'Defense Patrol', 'Buoy Inspection'],
+    'major_comm': ['Self', 'Defense Exercise', 'Research Mission', 'Prep', 'Tactical Class', 'Cargo Transport'],
+    'daily_comm': ['Daily', 'Awakening'],
+    'extra_drill': ['Sailing', 'Defense Patrol', 'Buoy Inspection'],
     'extra_part': ['Commission'],
     'extra_cube': ['Exercise'],
     'extra_oil': ['Oil Extraction'],
     'extra_book': ['Merchant Escort'],
-    'urgent_drill': ['Cargo Defense', 'Enemy Scouts', 'Enemy Force', 'Enemy Elites'],
+    'urgent_drill': ['Cargo Defense', 'Scouts', 'Force', 'Elites'],
     'urgent_part': ['Lavella', 'Maui', 'Rendova', 'Kongbanna'],
-    'urgent_book': ['Tyrant', 'Poro', 'Makira', 'Kapolo', 'Manne ', 'Mary', 'Isle', 'Kotlin'],
-    'urgent_box': ['Gear', 'Handover'],
-    'urgent_cube': ['Merchant Rescue', 'Enemy Attack'],
-    'urgent_gem': ['VIP Escort', 'Holiday Escort', 'Patrol Escort'],
-    'urgent_ship': ['Launch Ceremony']
+    'urgent_book': ['Tyrant', 'Poro', 'Makira', 'Kapolo', 'Manne ', 'St.', 'Isle', 'Kotlin'],
+    'urgent_box': ['Gear Transport', 'Handover'],
+    'urgent_cube': ['Merchant Rescue', 'Attack'],
+    'urgent_gem': ['VIP ', 'Holiday', 'Patrol Escort'],
+    'urgent_ship': ['Launch']
 }
 
 
@@ -41,7 +41,7 @@ class Commission:
         self.valid = True
 
         # Name
-        area = area_offset((211, 26, 415, 49), self.area[0:2])
+        area = area_offset((176, 23, 420, 50), self.area[0:2])
         button = Button(area=area, color=(), button=area, name='COMMISSION')
         ocr = Ocr(button, lang='cnocr', back=(74, 97, 148), use_binary=False)
         self.button = button