From fe6815d20a92cacf54d6932d5297a6991097923a Mon Sep 17 00:00:00 2001 From: kyO The NinjA Date: Fri, 29 May 2020 14:34:43 -0300 Subject: [PATCH] [EN] Localization progress - Some GUI optimizations - Minor fix in Quick Guide --- assets/en/combat/BATTLE_STATUS_C.png | Bin 0 -> 13839 bytes assets/en/combat/BATTLE_STATUS_D.png | Bin 0 -> 13839 bytes campaign/event_20200521_en/a1.py | 2 -- campaign/event_20200521_en/a2.py | 1 - campaign/event_20200521_en/a3.py | 49 +++++++++++++-------------- campaign/event_20200521_en/b3.py | 1 - doc/Quick guide.md | 2 +- module/config/argparser_en.py | 8 ++--- module/config/dictionary.py | 8 ++--- module/reward/commission.py | 20 +++++------ 10 files changed, 43 insertions(+), 48 deletions(-) create mode 100644 assets/en/combat/BATTLE_STATUS_C.png create mode 100644 assets/en/combat/BATTLE_STATUS_D.png diff --git a/assets/en/combat/BATTLE_STATUS_C.png b/assets/en/combat/BATTLE_STATUS_C.png new file mode 100644 index 0000000000000000000000000000000000000000..3b0066efc60b28891452efc066d9d7dff1524fde GIT binary patch literal 13839 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 literal 0 HcmV?d00001 diff --git a/assets/en/combat/BATTLE_STATUS_D.png b/assets/en/combat/BATTLE_STATUS_D.png new file mode 100644 index 0000000000000000000000000000000000000000..3b0066efc60b28891452efc066d9d7dff1524fde GIT binary patch literal 13839 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 literal 0 HcmV?d00001 diff --git a/campaign/event_20200521_en/a1.py b/campaign/event_20200521_en/a1.py index d14fc3a84..ed452dac4 100644 --- a/campaign/event_20200521_en/a1.py +++ b/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 diff --git a/campaign/event_20200521_en/a2.py b/campaign/event_20200521_en/a2.py index 3377b3ca7..f0e1f8cf8 100644 --- a/campaign/event_20200521_en/a2.py +++ b/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 diff --git a/campaign/event_20200521_en/a3.py b/campaign/event_20200521_en/a3.py index b373482b9..8bf20402c 100644 --- a/campaign/event_20200521_en/a3.py +++ b/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 \ No newline at end of file diff --git a/campaign/event_20200521_en/b3.py b/campaign/event_20200521_en/b3.py index 06b97d0c1..f1f7446d9 100644 --- a/campaign/event_20200521_en/b3.py +++ b/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 diff --git a/doc/Quick guide.md b/doc/Quick guide.md index a26b4612c..0283c7bb5 100644 --- a/doc/Quick guide.md +++ b/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) diff --git a/module/config/argparser_en.py b/module/config/argparser_en.py index 30bcf1ba2..ebac8a79a 100644 --- a/module/config/argparser_en.py +++ b/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') diff --git a/module/config/dictionary.py b/module/config/dictionary.py index 03a3f3458..69d14347a 100644 --- a/module/config/dictionary.py +++ b/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', diff --git a/module/reward/commission.py b/module/reward/commission.py index c3d33bc79..37fe3a173 100644 --- a/module/reward/commission.py +++ b/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