diff --git a/alas.py b/alas.py index 3755171ac..1398c8782 100644 --- a/alas.py +++ b/alas.py @@ -99,7 +99,8 @@ class AzurLaneAutoScript: Save logs to ./log/error//log.txt """ from module.base.utils import save_image - from module.handler.sensitive_info import handle_sensitive_image, handle_sensitive_logs + from module.handler.sensitive_info import (handle_sensitive_image, + handle_sensitive_logs) if self.config.Error_SaveError: if not os.path.exists('./log/error'): os.mkdir('./log/error') diff --git a/campaign/campaign_hard/campaign_hard.py b/campaign/campaign_hard/campaign_hard.py index 785ceddb7..30412f7c4 100644 --- a/campaign/campaign_hard/campaign_hard.py +++ b/campaign/campaign_hard/campaign_hard.py @@ -1,9 +1,9 @@ from module.base.timer import Timer from module.campaign.campaign_base import CampaignBase +from module.exception import CampaignEnd from module.hard.equipment import HardEquipment from module.logger import logger -from module.map.assets import MAP_PREPARATION, FLEET_PREPARATION -from module.exception import CampaignEnd +from module.map.assets import FLEET_PREPARATION, MAP_PREPARATION from module.ui.ui import CAMPAIGN_CHECK diff --git a/campaign/campaign_main/campaign_10_1.py b/campaign/campaign_main/campaign_10_1.py index 071b085ef..3e46e5c9b 100644 --- a/campaign/campaign_main/campaign_10_1.py +++ b/campaign/campaign_main/campaign_10_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('10-1') MAP.shape = 'G6' diff --git a/campaign/campaign_main/campaign_10_2.py b/campaign/campaign_main/campaign_10_2.py index 4ce8d0d07..3da6bd7e6 100644 --- a/campaign/campaign_main/campaign_10_2.py +++ b/campaign/campaign_main/campaign_10_2.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('10-2') MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_10_3.py b/campaign/campaign_main/campaign_10_3.py index 0c2eb642e..31afb004c 100644 --- a/campaign/campaign_main/campaign_10_3.py +++ b/campaign/campaign_main/campaign_10_3.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('10-3') MAP.shape = 'I6' diff --git a/campaign/campaign_main/campaign_10_4.py b/campaign/campaign_main/campaign_10_4.py index 39909c78e..fe0110917 100644 --- a/campaign/campaign_main/campaign_10_4.py +++ b/campaign/campaign_main/campaign_10_4.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('10-4') MAP.shape = 'I6' diff --git a/campaign/campaign_main/campaign_11_1.py b/campaign/campaign_main/campaign_11_1.py index 85c71d340..f50e3412d 100644 --- a/campaign/campaign_main/campaign_11_1.py +++ b/campaign/campaign_main/campaign_11_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('11-1') MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_11_2.py b/campaign/campaign_main/campaign_11_2.py index be53a8aea..b262d2f29 100644 --- a/campaign/campaign_main/campaign_11_2.py +++ b/campaign/campaign_main/campaign_11_2.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('11-2') MAP.shape = 'K6' diff --git a/campaign/campaign_main/campaign_11_3.py b/campaign/campaign_main/campaign_11_3.py index b3b7cb9a6..1e4f64125 100644 --- a/campaign/campaign_main/campaign_11_3.py +++ b/campaign/campaign_main/campaign_11_3.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('11-3') MAP.shape = 'I7' diff --git a/campaign/campaign_main/campaign_11_4.py b/campaign/campaign_main/campaign_11_4.py index eb106c232..7ba9bd6e9 100644 --- a/campaign/campaign_main/campaign_11_4.py +++ b/campaign/campaign_main/campaign_11_4.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('11-4') MAP.shape = 'J8' diff --git a/campaign/campaign_main/campaign_12_1.py b/campaign/campaign_main/campaign_12_1.py index bba376b4e..d36202090 100644 --- a/campaign/campaign_main/campaign_12_1.py +++ b/campaign/campaign_main/campaign_12_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_12_2.py b/campaign/campaign_main/campaign_12_2.py index 6c5d01858..3e2df5edd 100644 --- a/campaign/campaign_main/campaign_12_2.py +++ b/campaign/campaign_main/campaign_12_2.py @@ -1,8 +1,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.campaign_main.campaign_12_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'I7' diff --git a/campaign/campaign_main/campaign_12_2_leveling.py b/campaign/campaign_main/campaign_12_2_leveling.py index ee9d8114b..acc7444f6 100644 --- a/campaign/campaign_main/campaign_12_2_leveling.py +++ b/campaign/campaign_main/campaign_12_2_leveling.py @@ -1,8 +1,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.campaign_main.campaign_12_1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'I7' diff --git a/campaign/campaign_main/campaign_12_3.py b/campaign/campaign_main/campaign_12_3.py index 9f521a60e..e1bf69cab 100644 --- a/campaign/campaign_main/campaign_12_3.py +++ b/campaign/campaign_main/campaign_12_3.py @@ -1,8 +1,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.campaign_main.campaign_12_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'J7' diff --git a/campaign/campaign_main/campaign_12_4.py b/campaign/campaign_main/campaign_12_4.py index 8de3eb7f6..2849133b2 100644 --- a/campaign/campaign_main/campaign_12_4.py +++ b/campaign/campaign_main/campaign_12_4.py @@ -1,8 +1,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.campaign_main.campaign_12_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('12-4') MAP.shape = 'K8' diff --git a/campaign/campaign_main/campaign_12_4_leveling.py b/campaign/campaign_main/campaign_12_4_leveling.py index cef873bd3..f9120e0f2 100644 --- a/campaign/campaign_main/campaign_12_4_leveling.py +++ b/campaign/campaign_main/campaign_12_4_leveling.py @@ -1,8 +1,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.campaign_main.campaign_12_1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('12-4') MAP.shape = 'K8' diff --git a/campaign/campaign_main/campaign_12_4_timeout_leveling.py b/campaign/campaign_main/campaign_12_4_timeout_leveling.py index 50b93bbe4..153decea0 100644 --- a/campaign/campaign_main/campaign_12_4_timeout_leveling.py +++ b/campaign/campaign_main/campaign_12_4_timeout_leveling.py @@ -1,8 +1,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 module.combat.assets import * +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids class Campaign(CampaignBase): @@ -116,6 +116,7 @@ class Campaign(CampaignBase): from module.config.config import AzurLaneConfig + az = Campaign(AzurLaneConfig('alas')) for n in range(10000): logger.hr(f'count: {n}') diff --git a/campaign/campaign_main/campaign_13_1.py b/campaign/campaign_main/campaign_13_1.py index 4ef20079b..a60f55d50 100644 --- a/campaign/campaign_main/campaign_13_1.py +++ b/campaign/campaign_main/campaign_13_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('13-1') MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_13_2.py b/campaign/campaign_main/campaign_13_2.py index 902071d4d..aba228343 100644 --- a/campaign/campaign_main/campaign_13_2.py +++ b/campaign/campaign_main/campaign_13_2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .campaign_13_1 import Config as ConfigBase MAP = CampaignMap('13-2') diff --git a/campaign/campaign_main/campaign_13_3.py b/campaign/campaign_main/campaign_13_3.py index 885ab7814..2355b7ae7 100644 --- a/campaign/campaign_main/campaign_13_3.py +++ b/campaign/campaign_main/campaign_13_3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .campaign_13_1 import Config as ConfigBase MAP = CampaignMap('13-3') diff --git a/campaign/campaign_main/campaign_13_4.py b/campaign/campaign_main/campaign_13_4.py index b776f77d7..581eef44a 100644 --- a/campaign/campaign_main/campaign_13_4.py +++ b/campaign/campaign_main/campaign_13_4.py @@ -1,6 +1,7 @@ from module.campaign.campaign_base import CampaignBase from module.map.map_base import CampaignMap -from module.map.map_grids import SelectedGrids, RoadGrids +from module.map.map_grids import RoadGrids, SelectedGrids + from .campaign_13_1 import Config as ConfigBase MAP = CampaignMap('13-4') diff --git a/campaign/campaign_main/campaign_14_1.py b/campaign/campaign_main/campaign_14_1.py index 0848a5b3a..16eb9015a 100644 --- a/campaign/campaign_main/campaign_14_1.py +++ b/campaign/campaign_main/campaign_14_1.py @@ -1,7 +1,8 @@ -from .campaign_14_base import CampaignBase -from module.map.map_base import CampaignMap -from module.map.map_grids import SelectedGrids, RoadGrids from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_14_base import CampaignBase from .campaign_14_base import Config as ConfigBase MAP = CampaignMap('14-1') diff --git a/campaign/campaign_main/campaign_14_2.py b/campaign/campaign_main/campaign_14_2.py index 2acc538a2..c95bc1b8b 100644 --- a/campaign/campaign_main/campaign_14_2.py +++ b/campaign/campaign_main/campaign_14_2.py @@ -1,7 +1,8 @@ -from .campaign_14_base import CampaignBase -from module.map.map_base import CampaignMap -from module.map.map_grids import SelectedGrids, RoadGrids from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_14_base import CampaignBase from .campaign_14_base import Config as ConfigBase MAP = CampaignMap('14-2') diff --git a/campaign/campaign_main/campaign_14_3.py b/campaign/campaign_main/campaign_14_3.py index 70d8829df..055b7cd80 100644 --- a/campaign/campaign_main/campaign_14_3.py +++ b/campaign/campaign_main/campaign_14_3.py @@ -1,7 +1,8 @@ -from .campaign_14_base import CampaignBase -from module.map.map_base import CampaignMap -from module.map.map_grids import SelectedGrids, RoadGrids from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_14_base import CampaignBase from .campaign_14_base import Config as ConfigBase MAP = CampaignMap('14-3') diff --git a/campaign/campaign_main/campaign_14_4.py b/campaign/campaign_main/campaign_14_4.py index 4c51b0f17..1952906b3 100644 --- a/campaign/campaign_main/campaign_14_4.py +++ b/campaign/campaign_main/campaign_14_4.py @@ -1,7 +1,8 @@ -from .campaign_14_base import CampaignBase -from module.map.map_base import CampaignMap -from module.map.map_grids import SelectedGrids, RoadGrids from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_14_base import CampaignBase from .campaign_14_base import Config as ConfigBase MAP = CampaignMap('14-4') diff --git a/campaign/campaign_main/campaign_1_1.py b/campaign/campaign_main/campaign_1_1.py index acb1cfb7f..78b9b6612 100644 --- a/campaign/campaign_main/campaign_1_1.py +++ b/campaign/campaign_main/campaign_1_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G1' diff --git a/campaign/campaign_main/campaign_1_1_affinity_farming.py b/campaign/campaign_main/campaign_1_1_affinity_farming.py index f628d78fc..9c774a1ee 100644 --- a/campaign/campaign_main/campaign_1_1_affinity_farming.py +++ b/campaign/campaign_main/campaign_1_1_affinity_farming.py @@ -1,10 +1,11 @@ import numpy as np from module.campaign.campaign_base import CampaignBase -from module.map.map_base import CampaignMap -from module.map.map_grids import SelectedGrids, RoadGrids +from module.exception import CampaignEnd, ScriptEnd from module.logger import logger -from module.exception import ScriptEnd, CampaignEnd +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .campaign_1_1 import MAP from .campaign_1_1 import Config as ConfigBase diff --git a/campaign/campaign_main/campaign_1_2.py b/campaign/campaign_main/campaign_1_2.py index 529619557..e8a47d44e 100644 --- a/campaign/campaign_main/campaign_1_2.py +++ b/campaign/campaign_main/campaign_1_2.py @@ -1,8 +1,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.campaign_main.campaign_1_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'E3' diff --git a/campaign/campaign_main/campaign_1_3.py b/campaign/campaign_main/campaign_1_3.py index 095fb80b0..9c39843d1 100644 --- a/campaign/campaign_main/campaign_1_3.py +++ b/campaign/campaign_main/campaign_1_3.py @@ -1,8 +1,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.campaign_main.campaign_1_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F3' diff --git a/campaign/campaign_main/campaign_1_4.py b/campaign/campaign_main/campaign_1_4.py index 1f7f504f9..8a5a29554 100644 --- a/campaign/campaign_main/campaign_1_4.py +++ b/campaign/campaign_main/campaign_1_4.py @@ -1,8 +1,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.campaign_main.campaign_1_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G3' diff --git a/campaign/campaign_main/campaign_2_1.py b/campaign/campaign_main/campaign_2_1.py index 1ef682d47..682e19f96 100644 --- a/campaign/campaign_main/campaign_2_1.py +++ b/campaign/campaign_main/campaign_2_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F4' diff --git a/campaign/campaign_main/campaign_2_2.py b/campaign/campaign_main/campaign_2_2.py index 88565493b..9139e68b9 100644 --- a/campaign/campaign_main/campaign_2_2.py +++ b/campaign/campaign_main/campaign_2_2.py @@ -1,8 +1,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.campaign_main.campaign_2_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G5' diff --git a/campaign/campaign_main/campaign_2_3.py b/campaign/campaign_main/campaign_2_3.py index f45ab03cb..02654c313 100644 --- a/campaign/campaign_main/campaign_2_3.py +++ b/campaign/campaign_main/campaign_2_3.py @@ -1,8 +1,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.campaign_main.campaign_2_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F5' diff --git a/campaign/campaign_main/campaign_2_4.py b/campaign/campaign_main/campaign_2_4.py index 675cbf18f..9ebd7ae47 100644 --- a/campaign/campaign_main/campaign_2_4.py +++ b/campaign/campaign_main/campaign_2_4.py @@ -1,8 +1,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.campaign_main.campaign_2_1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G4' diff --git a/campaign/campaign_main/campaign_3_1.py b/campaign/campaign_main/campaign_3_1.py index 51fe5cabc..3c2498aa1 100644 --- a/campaign/campaign_main/campaign_3_1.py +++ b/campaign/campaign_main/campaign_3_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G4' diff --git a/campaign/campaign_main/campaign_3_2.py b/campaign/campaign_main/campaign_3_2.py index be8e92ced..aca94c849 100644 --- a/campaign/campaign_main/campaign_3_2.py +++ b/campaign/campaign_main/campaign_3_2.py @@ -1,8 +1,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.campaign_main.campaign_3_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H4' diff --git a/campaign/campaign_main/campaign_3_3.py b/campaign/campaign_main/campaign_3_3.py index 601512c27..47335c3a9 100644 --- a/campaign/campaign_main/campaign_3_3.py +++ b/campaign/campaign_main/campaign_3_3.py @@ -1,8 +1,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.campaign_main.campaign_3_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F5' diff --git a/campaign/campaign_main/campaign_3_4.py b/campaign/campaign_main/campaign_3_4.py index 52919a0df..07cde0468 100644 --- a/campaign/campaign_main/campaign_3_4.py +++ b/campaign/campaign_main/campaign_3_4.py @@ -1,8 +1,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.campaign_main.campaign_3_1 import Config as Config31 +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H4' diff --git a/campaign/campaign_main/campaign_4_1.py b/campaign/campaign_main/campaign_4_1.py index 357fcd1f0..936a9674c 100644 --- a/campaign/campaign_main/campaign_4_1.py +++ b/campaign/campaign_main/campaign_4_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F6' diff --git a/campaign/campaign_main/campaign_4_2.py b/campaign/campaign_main/campaign_4_2.py index 33e24c6a7..5450b21b4 100644 --- a/campaign/campaign_main/campaign_4_2.py +++ b/campaign/campaign_main/campaign_4_2.py @@ -1,8 +1,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.campaign_main.campaign_4_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F6' diff --git a/campaign/campaign_main/campaign_4_3.py b/campaign/campaign_main/campaign_4_3.py index 755c07582..97968f155 100644 --- a/campaign/campaign_main/campaign_4_3.py +++ b/campaign/campaign_main/campaign_4_3.py @@ -1,8 +1,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.campaign_main.campaign_4_1 import Config as Config41 +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G4' diff --git a/campaign/campaign_main/campaign_4_4.py b/campaign/campaign_main/campaign_4_4.py index 70331d3d3..0eea44a33 100644 --- a/campaign/campaign_main/campaign_4_4.py +++ b/campaign/campaign_main/campaign_4_4.py @@ -1,8 +1,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.campaign_main.campaign_4_1 import Config as Config41 +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_5_1.py b/campaign/campaign_main/campaign_5_1.py index cadcdbba0..c0bf41cf4 100644 --- a/campaign/campaign_main/campaign_5_1.py +++ b/campaign/campaign_main/campaign_5_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_5_2.py b/campaign/campaign_main/campaign_5_2.py index ce9b8e599..54eed7013 100644 --- a/campaign/campaign_main/campaign_5_2.py +++ b/campaign/campaign_main/campaign_5_2.py @@ -1,8 +1,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.campaign_main.campaign_5_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H5' diff --git a/campaign/campaign_main/campaign_5_3.py b/campaign/campaign_main/campaign_5_3.py index 97f8bd509..8786e7716 100644 --- a/campaign/campaign_main/campaign_5_3.py +++ b/campaign/campaign_main/campaign_5_3.py @@ -1,8 +1,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.campaign_main.campaign_5_1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G5' diff --git a/campaign/campaign_main/campaign_5_4.py b/campaign/campaign_main/campaign_5_4.py index d9add73d9..d88468370 100644 --- a/campaign/campaign_main/campaign_5_4.py +++ b/campaign/campaign_main/campaign_5_4.py @@ -1,8 +1,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.campaign_main.campaign_5_1 import Config as Config51 +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H5' diff --git a/campaign/campaign_main/campaign_6_1.py b/campaign/campaign_main/campaign_6_1.py index 34da5567f..7f318738e 100644 --- a/campaign/campaign_main/campaign_6_1.py +++ b/campaign/campaign_main/campaign_6_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H5' diff --git a/campaign/campaign_main/campaign_6_2.py b/campaign/campaign_main/campaign_6_2.py index 9a6ccf0f1..79f719a09 100644 --- a/campaign/campaign_main/campaign_6_2.py +++ b/campaign/campaign_main/campaign_6_2.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_6_3.py b/campaign/campaign_main/campaign_6_3.py index a8937bd18..2b78322be 100644 --- a/campaign/campaign_main/campaign_6_3.py +++ b/campaign/campaign_main/campaign_6_3.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H5' diff --git a/campaign/campaign_main/campaign_6_4.py b/campaign/campaign_main/campaign_6_4.py index 7a5258d49..2257b3dea 100644 --- a/campaign/campaign_main/campaign_6_4.py +++ b/campaign/campaign_main/campaign_6_4.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_7_1.py b/campaign/campaign_main/campaign_7_1.py index f3ed2a671..fa66c2ae4 100644 --- a/campaign/campaign_main/campaign_7_1.py +++ b/campaign/campaign_main/campaign_7_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H3' diff --git a/campaign/campaign_main/campaign_7_2.py b/campaign/campaign_main/campaign_7_2.py index 2b37e82bc..e61a1f385 100644 --- a/campaign/campaign_main/campaign_7_2.py +++ b/campaign/campaign_main/campaign_7_2.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('7-2') MAP.shape = 'H5' diff --git a/campaign/campaign_main/campaign_7_2_mystery_farming.py b/campaign/campaign_main/campaign_7_2_mystery_farming.py index 9569edee3..8571ba5c3 100644 --- a/campaign/campaign_main/campaign_7_2_mystery_farming.py +++ b/campaign/campaign_main/campaign_7_2_mystery_farming.py @@ -1,9 +1,9 @@ -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.campaign_main.campaign_7_2 import MAP from campaign.campaign_main.campaign_7_2 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids # MAP.in_map_swipe_preset_data = (-1, 0) diff --git a/campaign/campaign_main/campaign_7_3.py b/campaign/campaign_main/campaign_7_3.py index f336d96cb..403b161ab 100644 --- a/campaign/campaign_main/campaign_7_3.py +++ b/campaign/campaign_main/campaign_7_3.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('7-3') MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_7_4.py b/campaign/campaign_main/campaign_7_4.py index 668ca8891..fd29f5b02 100644 --- a/campaign/campaign_main/campaign_7_4.py +++ b/campaign/campaign_main/campaign_7_4.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('7-4') MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_8_1.py b/campaign/campaign_main/campaign_8_1.py index 3d88a394e..df409f0b6 100644 --- a/campaign/campaign_main/campaign_8_1.py +++ b/campaign/campaign_main/campaign_8_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('8-1') MAP.shape = 'I3' diff --git a/campaign/campaign_main/campaign_8_2.py b/campaign/campaign_main/campaign_8_2.py index 7d3c619d9..8b137191a 100644 --- a/campaign/campaign_main/campaign_8_2.py +++ b/campaign/campaign_main/campaign_8_2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .campaign_8_1 import Config as ConfigBase MAP = CampaignMap('8-3') diff --git a/campaign/campaign_main/campaign_8_3.py b/campaign/campaign_main/campaign_8_3.py index f66fbfd5b..289416d1a 100644 --- a/campaign/campaign_main/campaign_8_3.py +++ b/campaign/campaign_main/campaign_8_3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .campaign_8_1 import Config as ConfigBase MAP = CampaignMap('8-3') diff --git a/campaign/campaign_main/campaign_8_4.py b/campaign/campaign_main/campaign_8_4.py index 493c8429e..98773247a 100644 --- a/campaign/campaign_main/campaign_8_4.py +++ b/campaign/campaign_main/campaign_8_4.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .campaign_8_1 import Config as ConfigBase MAP = CampaignMap('8-4') diff --git a/campaign/campaign_main/campaign_8_4_leveling.py b/campaign/campaign_main/campaign_8_4_leveling.py index 303be5b2c..d55e39ae6 100644 --- a/campaign/campaign_main/campaign_8_4_leveling.py +++ b/campaign/campaign_main/campaign_8_4_leveling.py @@ -1,6 +1,6 @@ -from .campaign_8_4 import * -from .campaign_8_4 import Config as ConfigBase from .campaign_8_4 import Campaign as CampaignBase +from .campaign_8_4 import Config as ConfigBase +from .campaign_8_4 import * class Config(ConfigBase): diff --git a/campaign/campaign_main/campaign_9_1.py b/campaign/campaign_main/campaign_9_1.py index b93de143a..0d7c427fe 100644 --- a/campaign/campaign_main/campaign_9_1.py +++ b/campaign/campaign_main/campaign_9_1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('9-2') MAP.shape = 'H5' diff --git a/campaign/campaign_main/campaign_9_2.py b/campaign/campaign_main/campaign_9_2.py index 8c987c798..9b40db819 100644 --- a/campaign/campaign_main/campaign_9_2.py +++ b/campaign/campaign_main/campaign_9_2.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('9-2') MAP.shape = 'I5' diff --git a/campaign/campaign_main/campaign_9_3.py b/campaign/campaign_main/campaign_9_3.py index bff5525e3..216ebb362 100644 --- a/campaign/campaign_main/campaign_9_3.py +++ b/campaign/campaign_main/campaign_9_3.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('9-3') MAP.shape = 'H6' diff --git a/campaign/campaign_main/campaign_9_4.py b/campaign/campaign_main/campaign_9_4.py index 01be16337..453b8cf7f 100644 --- a/campaign/campaign_main/campaign_9_4.py +++ b/campaign/campaign_main/campaign_9_4.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('9-4') MAP.shape = 'I6' diff --git a/campaign/campaign_sos/campaign_10_5.py b/campaign/campaign_sos/campaign_10_5.py index 89442c4d0..de5d17609 100644 --- a/campaign/campaign_sos/campaign_10_5.py +++ b/campaign/campaign_sos/campaign_10_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'I6' diff --git a/campaign/campaign_sos/campaign_3_5.py b/campaign/campaign_sos/campaign_3_5.py index 609cb7008..d1dc9541d 100644 --- a/campaign/campaign_sos/campaign_3_5.py +++ b/campaign/campaign_sos/campaign_3_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'H5' diff --git a/campaign/campaign_sos/campaign_4_5.py b/campaign/campaign_sos/campaign_4_5.py index 5bcea278a..a0ad6b0e0 100644 --- a/campaign/campaign_sos/campaign_4_5.py +++ b/campaign/campaign_sos/campaign_4_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'H7' diff --git a/campaign/campaign_sos/campaign_5_5.py b/campaign/campaign_sos/campaign_5_5.py index 3d6b6ad7b..6119ec254 100644 --- a/campaign/campaign_sos/campaign_5_5.py +++ b/campaign/campaign_sos/campaign_5_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'H6' diff --git a/campaign/campaign_sos/campaign_6_5.py b/campaign/campaign_sos/campaign_6_5.py index 27f684360..ca137e474 100644 --- a/campaign/campaign_sos/campaign_6_5.py +++ b/campaign/campaign_sos/campaign_6_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'H6' diff --git a/campaign/campaign_sos/campaign_7_5.py b/campaign/campaign_sos/campaign_7_5.py index 849a168a5..96aeca528 100644 --- a/campaign/campaign_sos/campaign_7_5.py +++ b/campaign/campaign_sos/campaign_7_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'H6' diff --git a/campaign/campaign_sos/campaign_8_5.py b/campaign/campaign_sos/campaign_8_5.py index 5aa0f93ed..3dff953bb 100644 --- a/campaign/campaign_sos/campaign_8_5.py +++ b/campaign/campaign_sos/campaign_8_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'H7' diff --git a/campaign/campaign_sos/campaign_9_5.py b/campaign/campaign_sos/campaign_9_5.py index 1e945bd17..2068a9167 100644 --- a/campaign/campaign_sos/campaign_9_5.py +++ b/campaign/campaign_sos/campaign_9_5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SOS') MAP.shape = 'I6' diff --git a/campaign/campaign_war_archives/campaign_base.py b/campaign/campaign_war_archives/campaign_base.py index b52d1ac38..1021dccbc 100644 --- a/campaign/campaign_war_archives/campaign_base.py +++ b/campaign/campaign_war_archives/campaign_base.py @@ -5,8 +5,10 @@ from module.ui.assets import WAR_ARCHIVES_CHECK from module.ui.page import page_archives from module.ui.scroll import Scroll from module.ui.switch import Switch -from module.war_archives.assets import WAR_ARCHIVES_EX_ON, WAR_ARCHIVES_SP_ON, \ - WAR_ARCHIVES_CAMPAIGN_CHECK, WAR_ARCHIVES_SCROLL +from module.war_archives.assets import (WAR_ARCHIVES_CAMPAIGN_CHECK, + WAR_ARCHIVES_EX_ON, + WAR_ARCHIVES_SCROLL, + WAR_ARCHIVES_SP_ON) from module.war_archives.dictionary import dic_archives_template WAR_ARCHIVES_SWITCH = Switch('War_Archives_switch', is_selector=True) diff --git a/campaign/event_20200227_cn/c2.py b/campaign/event_20200227_cn/c2.py index 8aee4d9dc..aed450435 100644 --- a/campaign/event_20200227_cn/c2.py +++ b/campaign/event_20200227_cn/c2.py @@ -1,9 +1,8 @@ -from module.campaign.campaign_base import CampaignBase -from module.map.map_base import CampaignMap from module.campaign.assets import C2 as ENTRANCE -from module.map.map_grids import SelectedGrids, RoadGrids +from module.campaign.campaign_base import CampaignBase from module.logger import logger - +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('c2') MAP.shape = 'G7' diff --git a/campaign/event_20200227_cn/d3.py b/campaign/event_20200227_cn/d3.py index 4929d05bf..d50754818 100644 --- a/campaign/event_20200227_cn/d3.py +++ b/campaign/event_20200227_cn/d3.py @@ -1,8 +1,7 @@ +from module.campaign.assets import D3 as ENTRANCE from module.campaign.campaign_base import CampaignBase from module.map.map_base import CampaignMap -from module.campaign.assets import D3 as ENTRANCE -from module.map.map_grids import SelectedGrids, RoadGrids - +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('d3') MAP.shape = 'H7' diff --git a/campaign/event_20200312_cn/sp3.py b/campaign/event_20200312_cn/sp3.py index 40ac95837..57a7f280d 100644 --- a/campaign/event_20200312_cn/sp3.py +++ b/campaign/event_20200312_cn/sp3.py @@ -1,10 +1,9 @@ -from module.campaign.campaign_base import CampaignBase -from module.map.map_base import CampaignMap from module.campaign.assets import EVENT_20200312CN_SP3 as ENTRANCE -from module.map.map_grids import SelectedGrids, RoadGrids -from module.ui.assets import CAMPAIGN_GOTO_DAILY +from module.campaign.campaign_base import CampaignBase from module.logger import logger - +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids +from module.ui.assets import CAMPAIGN_GOTO_DAILY MAP = CampaignMap('d3') MAP.shape = 'I6' diff --git a/campaign/event_20200326_cn/a1.py b/campaign/event_20200326_cn/a1.py index 8bee3a560..6283368c0 100644 --- a/campaign/event_20200326_cn/a1.py +++ b/campaign/event_20200326_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F7' diff --git a/campaign/event_20200326_cn/a2.py b/campaign/event_20200326_cn/a2.py index a24e7d339..a9c5650fd 100644 --- a/campaign/event_20200326_cn/a2.py +++ b/campaign/event_20200326_cn/a2.py @@ -1,8 +1,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_20200326_cn.a1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F8' diff --git a/campaign/event_20200326_cn/a3.py b/campaign/event_20200326_cn/a3.py index 7e733712b..84f84ce2f 100644 --- a/campaign/event_20200326_cn/a3.py +++ b/campaign/event_20200326_cn/a3.py @@ -1,8 +1,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_20200326_cn.a1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G7' diff --git a/campaign/event_20200326_cn/b1.py b/campaign/event_20200326_cn/b1.py index 51df007e3..5099df008 100644 --- a/campaign/event_20200326_cn/b1.py +++ b/campaign/event_20200326_cn/b1.py @@ -1,8 +1,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_20200326_cn.a1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H7' diff --git a/campaign/event_20200326_cn/b2.py b/campaign/event_20200326_cn/b2.py index b1c4a0bc0..c63ae4d76 100644 --- a/campaign/event_20200326_cn/b2.py +++ b/campaign/event_20200326_cn/b2.py @@ -1,8 +1,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_20200326_cn.a1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'F9' diff --git a/campaign/event_20200326_cn/b3.py b/campaign/event_20200326_cn/b3.py index 7981ab41d..c197c9b9d 100644 --- a/campaign/event_20200326_cn/b3.py +++ b/campaign/event_20200326_cn/b3.py @@ -1,8 +1,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_20200326_cn.a1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G9' diff --git a/campaign/event_20200326_cn/d3.py b/campaign/event_20200326_cn/d3.py index 7e873ce79..7c6f51e0c 100644 --- a/campaign/event_20200326_cn/d3.py +++ b/campaign/event_20200326_cn/d3.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'G9' diff --git a/campaign/event_20200423_cn/a1.py b/campaign/event_20200423_cn/a1.py index 0bba7060f..1de799abb 100644 --- a/campaign/event_20200423_cn/a1.py +++ b/campaign/event_20200423_cn/a1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/a2.py b/campaign/event_20200423_cn/a2.py index 7a7e4dc99..b38ca6323 100644 --- a/campaign/event_20200423_cn/a2.py +++ b/campaign/event_20200423_cn/a2.py @@ -1,8 +1,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_20200423_cn.a1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/a3.py b/campaign/event_20200423_cn/a3.py index 7141601ee..cfa3a70d4 100644 --- a/campaign/event_20200423_cn/a3.py +++ b/campaign/event_20200423_cn/a3.py @@ -1,8 +1,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_20200423_cn.a1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/b1.py b/campaign/event_20200423_cn/b1.py index 619b5c100..ef0f83b6a 100644 --- a/campaign/event_20200423_cn/b1.py +++ b/campaign/event_20200423_cn/b1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/b2.py b/campaign/event_20200423_cn/b2.py index 0f59f36fb..eaee4aaa8 100644 --- a/campaign/event_20200423_cn/b2.py +++ b/campaign/event_20200423_cn/b2.py @@ -1,8 +1,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_20200423_cn.b1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/b3.py b/campaign/event_20200423_cn/b3.py index 62b93b3db..3924187c4 100644 --- a/campaign/event_20200423_cn/b3.py +++ b/campaign/event_20200423_cn/b3.py @@ -1,8 +1,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_20200423_cn.b1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/c1.py b/campaign/event_20200423_cn/c1.py index 79c57dc45..f124f49d2 100644 --- a/campaign/event_20200423_cn/c1.py +++ b/campaign/event_20200423_cn/c1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/c2.py b/campaign/event_20200423_cn/c2.py index 7b4590143..1d540d0b7 100644 --- a/campaign/event_20200423_cn/c2.py +++ b/campaign/event_20200423_cn/c2.py @@ -1,8 +1,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_20200423_cn.c1 import Config +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/c3.py b/campaign/event_20200423_cn/c3.py index 676eabc4e..1519409e5 100644 --- a/campaign/event_20200423_cn/c3.py +++ b/campaign/event_20200423_cn/c3.py @@ -1,8 +1,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_20200423_cn.c1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/d1.py b/campaign/event_20200423_cn/d1.py index 24e6c9b89..51a0014aa 100644 --- a/campaign/event_20200423_cn/d1.py +++ b/campaign/event_20200423_cn/d1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/d2.py b/campaign/event_20200423_cn/d2.py index caa0b1993..c8695d934 100644 --- a/campaign/event_20200423_cn/d2.py +++ b/campaign/event_20200423_cn/d2.py @@ -1,8 +1,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_20200423_cn.d1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200423_cn/d3.py b/campaign/event_20200423_cn/d3.py index 6eb79249f..979f9f172 100644 --- a/campaign/event_20200423_cn/d3.py +++ b/campaign/event_20200423_cn/d3.py @@ -1,8 +1,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_20200423_cn.d1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200507_cn/sp1.py b/campaign/event_20200507_cn/sp1.py index abc77356c..11975d48e 100644 --- a/campaign/event_20200507_cn/sp1.py +++ b/campaign/event_20200507_cn/sp1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200507_cn/sp2.py b/campaign/event_20200507_cn/sp2.py index e1bc4c758..2f5b732ec 100644 --- a/campaign/event_20200507_cn/sp2.py +++ b/campaign/event_20200507_cn/sp2.py @@ -1,9 +1,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_20200507_cn.sp1 import Config - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200507_cn/sp3.py b/campaign/event_20200507_cn/sp3.py index 0c6da7c7d..55421957b 100644 --- a/campaign/event_20200507_cn/sp3.py +++ b/campaign/event_20200507_cn/sp3.py @@ -1,9 +1,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_20200507_cn.sp1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/a1.py b/campaign/event_20200521_cn/a1.py index fc539bb77..2fff6b4bd 100644 --- a/campaign/event_20200521_cn/a1.py +++ b/campaign/event_20200521_cn/a1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/a2.py b/campaign/event_20200521_cn/a2.py index aeaf899cd..0b95a4aba 100644 --- a/campaign/event_20200521_cn/a2.py +++ b/campaign/event_20200521_cn/a2.py @@ -1,9 +1,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_cn.a1 import Config - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/a3.py b/campaign/event_20200521_cn/a3.py index cf091669a..149997606 100644 --- a/campaign/event_20200521_cn/a3.py +++ b/campaign/event_20200521_cn/a3.py @@ -1,9 +1,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_cn.a1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/b1.py b/campaign/event_20200521_cn/b1.py index c336e5ba1..197845b64 100644 --- a/campaign/event_20200521_cn/b1.py +++ b/campaign/event_20200521_cn/b1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/b2.py b/campaign/event_20200521_cn/b2.py index 7dbf318a4..8295207dc 100644 --- a/campaign/event_20200521_cn/b2.py +++ b/campaign/event_20200521_cn/b2.py @@ -1,9 +1,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_cn.b1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = """ diff --git a/campaign/event_20200521_cn/b3.py b/campaign/event_20200521_cn/b3.py index f3c68b194..1061acaab 100644 --- a/campaign/event_20200521_cn/b3.py +++ b/campaign/event_20200521_cn/b3.py @@ -1,9 +1,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_cn.b1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = """ diff --git a/campaign/event_20200521_cn/c1.py b/campaign/event_20200521_cn/c1.py index 705f72a33..e4747f710 100644 --- a/campaign/event_20200521_cn/c1.py +++ b/campaign/event_20200521_cn/c1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/c2.py b/campaign/event_20200521_cn/c2.py index 69d4ef8f0..15ea6b64d 100644 --- a/campaign/event_20200521_cn/c2.py +++ b/campaign/event_20200521_cn/c2.py @@ -1,9 +1,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_cn.c1 import Config - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/c3.py b/campaign/event_20200521_cn/c3.py index 3cb4f9d14..930b8ff5c 100644 --- a/campaign/event_20200521_cn/c3.py +++ b/campaign/event_20200521_cn/c3.py @@ -1,9 +1,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_cn.c1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200521_cn/d2.py b/campaign/event_20200521_cn/d2.py index 85547dd7b..b8078031a 100644 --- a/campaign/event_20200521_cn/d2.py +++ b/campaign/event_20200521_cn/d2.py @@ -1,9 +1,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_cn.d1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = """ diff --git a/campaign/event_20200521_cn/d3.py b/campaign/event_20200521_cn/d3.py index bc7b333bd..9d7449d27 100644 --- a/campaign/event_20200521_cn/d3.py +++ b/campaign/event_20200521_cn/d3.py @@ -1,9 +1,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_cn.d1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = """ diff --git a/campaign/event_20200521_en/a1.py b/campaign/event_20200521_en/a1.py index fbf4890aa..742b41b8e 100644 --- a/campaign/event_20200521_en/a1.py +++ b/campaign/event_20200521_en/a1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('a1') MAP.shape = 'I5' diff --git a/campaign/event_20200521_en/a2.py b/campaign/event_20200521_en/a2.py index f0e1f8cf8..6317841f1 100644 --- a/campaign/event_20200521_en/a2.py +++ b/campaign/event_20200521_en/a2.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('a2') MAP.shape = 'J6' diff --git a/campaign/event_20200521_en/a3.py b/campaign/event_20200521_en/a3.py index d13edd082..edb31e984 100644 --- a/campaign/event_20200521_en/a3.py +++ b/campaign/event_20200521_en/a3.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('a3') MAP.shape = 'K7' diff --git a/campaign/event_20200521_en/b1.py b/campaign/event_20200521_en/b1.py index ae2156a8b..ec691146e 100644 --- a/campaign/event_20200521_en/b1.py +++ b/campaign/event_20200521_en/b1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('b1') MAP.shape = 'H6' diff --git a/campaign/event_20200521_en/b2.py b/campaign/event_20200521_en/b2.py index 9d3b321dc..e042fb228 100644 --- a/campaign/event_20200521_en/b2.py +++ b/campaign/event_20200521_en/b2.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('b2') MAP.shape = 'I7' diff --git a/campaign/event_20200521_en/b3.py b/campaign/event_20200521_en/b3.py index 7b5c9c5f0..2e0f7c097 100644 --- a/campaign/event_20200521_en/b3.py +++ b/campaign/event_20200521_en/b3.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('b3') MAP.shape = 'I9' diff --git a/campaign/event_20200521_en/c1.py b/campaign/event_20200521_en/c1.py index 1cf1420a3..e9bfecce0 100644 --- a/campaign/event_20200521_en/c1.py +++ b/campaign/event_20200521_en/c1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('c1') MAP.shape = 'I5' diff --git a/campaign/event_20200521_en/c2.py b/campaign/event_20200521_en/c2.py index 659869133..033ca96a3 100644 --- a/campaign/event_20200521_en/c2.py +++ b/campaign/event_20200521_en/c2.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('c2') MAP.shape = 'J6' diff --git a/campaign/event_20200521_en/c3.py b/campaign/event_20200521_en/c3.py index 62f2993db..39831f43d 100644 --- a/campaign/event_20200521_en/c3.py +++ b/campaign/event_20200521_en/c3.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('c3') MAP.shape = 'K7' diff --git a/campaign/event_20200521_en/d1.py b/campaign/event_20200521_en/d1.py index cc2fc90f5..3cd014b7a 100644 --- a/campaign/event_20200521_en/d1.py +++ b/campaign/event_20200521_en/d1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('d1') MAP.shape = 'H6' diff --git a/campaign/event_20200521_en/d3.py b/campaign/event_20200521_en/d3.py index 6558f2cbd..72211c3c5 100644 --- a/campaign/event_20200521_en/d3.py +++ b/campaign/event_20200521_en/d3.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('d3') MAP.shape = 'I9' diff --git a/campaign/event_20200603_cn/sp1.py b/campaign/event_20200603_cn/sp1.py index 5dd04c993..45775536e 100644 --- a/campaign/event_20200603_cn/sp1.py +++ b/campaign/event_20200603_cn/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'K7' diff --git a/campaign/event_20200603_cn/sp2.py b/campaign/event_20200603_cn/sp2.py index aad5bb633..6cabaed6e 100644 --- a/campaign/event_20200603_cn/sp2.py +++ b/campaign/event_20200603_cn/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20200603_cn/sp3.py b/campaign/event_20200603_cn/sp3.py index a439f01f5..02436371a 100644 --- a/campaign/event_20200603_cn/sp3.py +++ b/campaign/event_20200603_cn/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20200603_en/sp1.py b/campaign/event_20200603_en/sp1.py index 37626d25f..e3d6ca0c5 100644 --- a/campaign/event_20200603_en/sp1.py +++ b/campaign/event_20200603_en/sp1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP = CampaignMap('sp1') diff --git a/campaign/event_20200603_en/sp2.py b/campaign/event_20200603_en/sp2.py index 55dc85090..faf58d515 100644 --- a/campaign/event_20200603_en/sp2.py +++ b/campaign/event_20200603_en/sp2.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('sp2') MAP.shape = 'g7' diff --git a/campaign/event_20200603_en/sp3.py b/campaign/event_20200603_en/sp3.py index 14e456bd7..b282b241e 100644 --- a/campaign/event_20200603_en/sp3.py +++ b/campaign/event_20200603_en/sp3.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('sp3') MAP.shape = 'i6' diff --git a/campaign/event_20200611_en/a1.py b/campaign/event_20200611_en/a1.py index 79deaaf16..655fe782b 100644 --- a/campaign/event_20200611_en/a1.py +++ b/campaign/event_20200611_en/a1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200611_en/a2.py b/campaign/event_20200611_en/a2.py index 19f9c31a6..f8281db86 100644 --- a/campaign/event_20200611_en/a2.py +++ b/campaign/event_20200611_en/a2.py @@ -1,9 +1,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_20200611_en.a1 import Config - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200611_en/a3.py b/campaign/event_20200611_en/a3.py index eff5a64de..17b609355 100644 --- a/campaign/event_20200611_en/a3.py +++ b/campaign/event_20200611_en/a3.py @@ -1,9 +1,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_20200611_en.a1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H7' diff --git a/campaign/event_20200611_en/b1.py b/campaign/event_20200611_en/b1.py index cb6ef8b51..058ad7acf 100644 --- a/campaign/event_20200611_en/b1.py +++ b/campaign/event_20200611_en/b1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200611_en/b2.py b/campaign/event_20200611_en/b2.py index f0a6d41f3..738641f33 100644 --- a/campaign/event_20200611_en/b2.py +++ b/campaign/event_20200611_en/b2.py @@ -1,9 +1,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_20200611_en.b1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'K7' diff --git a/campaign/event_20200611_en/b3.py b/campaign/event_20200611_en/b3.py index 3eddbe164..222c7a4bb 100644 --- a/campaign/event_20200611_en/b3.py +++ b/campaign/event_20200611_en/b3.py @@ -1,9 +1,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_20200611_en.b1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'N10' diff --git a/campaign/event_20200611_en/c1.py b/campaign/event_20200611_en/c1.py index 705f72a33..e4747f710 100644 --- a/campaign/event_20200611_en/c1.py +++ b/campaign/event_20200611_en/c1.py @@ -1,8 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200611_en/c2.py b/campaign/event_20200611_en/c2.py index a3e93cff4..63f78ee24 100644 --- a/campaign/event_20200611_en/c2.py +++ b/campaign/event_20200611_en/c2.py @@ -1,9 +1,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_20200611_en.c1 import Config - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = ''' diff --git a/campaign/event_20200611_en/c3.py b/campaign/event_20200611_en/c3.py index 3ba9c6d32..2e63ca87f 100644 --- a/campaign/event_20200611_en/c3.py +++ b/campaign/event_20200611_en/c3.py @@ -1,9 +1,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_20200611_en.c1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.shape = 'H7' diff --git a/campaign/event_20200611_en/d2.py b/campaign/event_20200611_en/d2.py index 0b84c0894..58401c02e 100644 --- a/campaign/event_20200611_en/d2.py +++ b/campaign/event_20200611_en/d2.py @@ -1,9 +1,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_20200611_en.d1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = """ diff --git a/campaign/event_20200611_en/d3.py b/campaign/event_20200611_en/d3.py index 23dc0d923..cb8d9658b 100644 --- a/campaign/event_20200611_en/d3.py +++ b/campaign/event_20200611_en/d3.py @@ -1,9 +1,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_20200611_en.d1 import Config as ConfigBase - +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap() MAP.map_data = """ diff --git a/campaign/event_20200716_en/a1.py b/campaign/event_20200716_en/a1.py index 3cfae679f..b2a51b70d 100644 --- a/campaign/event_20200716_en/a1.py +++ b/campaign/event_20200716_en/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/a2.py b/campaign/event_20200716_en/a2.py index 926a21a4c..a996edd38 100644 --- a/campaign/event_20200716_en/a2.py +++ b/campaign/event_20200716_en/a2.py @@ -1,8 +1,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_20200716_en.a1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A2') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/a3.py b/campaign/event_20200716_en/a3.py index b74acf890..521e2e67c 100644 --- a/campaign/event_20200716_en/a3.py +++ b/campaign/event_20200716_en/a3.py @@ -1,8 +1,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_20200716_en.a1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A3') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/a4.py b/campaign/event_20200716_en/a4.py index 5224c69e6..8027c82a2 100644 --- a/campaign/event_20200716_en/a4.py +++ b/campaign/event_20200716_en/a4.py @@ -1,8 +1,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_20200716_en.a1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A4') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/b1.py b/campaign/event_20200716_en/b1.py index 32f88dd77..44454b161 100644 --- a/campaign/event_20200716_en/b1.py +++ b/campaign/event_20200716_en/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/b2.py b/campaign/event_20200716_en/b2.py index 858359426..3c670aeef 100644 --- a/campaign/event_20200716_en/b2.py +++ b/campaign/event_20200716_en/b2.py @@ -1,8 +1,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_20200716_en.b1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B2') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/c1.py b/campaign/event_20200716_en/c1.py index a189ee4b9..99b5737c3 100644 --- a/campaign/event_20200716_en/c1.py +++ b/campaign/event_20200716_en/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/c2.py b/campaign/event_20200716_en/c2.py index dac87fd50..76aab40ec 100644 --- a/campaign/event_20200716_en/c2.py +++ b/campaign/event_20200716_en/c2.py @@ -1,8 +1,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_20200716_en.c1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C2') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/c3.py b/campaign/event_20200716_en/c3.py index add95e84d..b4a185d42 100644 --- a/campaign/event_20200716_en/c3.py +++ b/campaign/event_20200716_en/c3.py @@ -1,8 +1,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_20200716_en.c1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C3') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/c4.py b/campaign/event_20200716_en/c4.py index f98a52b56..3c2aafbe8 100644 --- a/campaign/event_20200716_en/c4.py +++ b/campaign/event_20200716_en/c4.py @@ -1,8 +1,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_20200716_en.c1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C4') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/d1.py b/campaign/event_20200716_en/d1.py index b936abe53..2d2a3a587 100644 --- a/campaign/event_20200716_en/d1.py +++ b/campaign/event_20200716_en/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200716_en/d2.py b/campaign/event_20200716_en/d2.py index 0296778a1..780c43dfe 100644 --- a/campaign/event_20200716_en/d2.py +++ b/campaign/event_20200716_en/d2.py @@ -1,8 +1,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_20200716_en.d1 import Config as ConfigBase +from module.campaign.campaign_base import CampaignBase +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D2') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/event_20200723_cn/a1.py b/campaign/event_20200723_cn/a1.py index 2c8bbeb85..2b6970c6a 100644 --- a/campaign/event_20200723_cn/a1.py +++ b/campaign/event_20200723_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I7' diff --git a/campaign/event_20200723_cn/a2.py b/campaign/event_20200723_cn/a2.py index 244fd8203..b24f23e44 100644 --- a/campaign/event_20200723_cn/a2.py +++ b/campaign/event_20200723_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20200723_cn/a3.py b/campaign/event_20200723_cn/a3.py index 6d3f96c69..8758b42d9 100644 --- a/campaign/event_20200723_cn/a3.py +++ b/campaign/event_20200723_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20200723_cn/b1.py b/campaign/event_20200723_cn/b1.py index eb41ea0e1..4e5a9e095 100644 --- a/campaign/event_20200723_cn/b1.py +++ b/campaign/event_20200723_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'I8' diff --git a/campaign/event_20200723_cn/b2.py b/campaign/event_20200723_cn/b2.py index febca3a1a..66a5d7b71 100644 --- a/campaign/event_20200723_cn/b2.py +++ b/campaign/event_20200723_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20200723_cn/b3.py b/campaign/event_20200723_cn/b3.py index bdf942f3c..7c715345e 100644 --- a/campaign/event_20200723_cn/b3.py +++ b/campaign/event_20200723_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20200723_cn/c1.py b/campaign/event_20200723_cn/c1.py index d591460f1..b1bf51a06 100644 --- a/campaign/event_20200723_cn/c1.py +++ b/campaign/event_20200723_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I7' diff --git a/campaign/event_20200723_cn/c2.py b/campaign/event_20200723_cn/c2.py index 3c72aebe2..32f847f4f 100644 --- a/campaign/event_20200723_cn/c2.py +++ b/campaign/event_20200723_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20200723_cn/c3.py b/campaign/event_20200723_cn/c3.py index 1a1275fab..31032741b 100644 --- a/campaign/event_20200723_cn/c3.py +++ b/campaign/event_20200723_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20200723_cn/d1.py b/campaign/event_20200723_cn/d1.py index 00b90ab12..65e95b690 100644 --- a/campaign/event_20200723_cn/d1.py +++ b/campaign/event_20200723_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'I8' diff --git a/campaign/event_20200723_cn/d2.py b/campaign/event_20200723_cn/d2.py index 42219d66b..514ad3b00 100644 --- a/campaign/event_20200723_cn/d2.py +++ b/campaign/event_20200723_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20200723_cn/d3.py b/campaign/event_20200723_cn/d3.py index 279dc38e1..94c1be6ac 100644 --- a/campaign/event_20200723_cn/d3.py +++ b/campaign/event_20200723_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20200723_cn/sp.py b/campaign/event_20200723_cn/sp.py index 2aaa066bb..7d4791c22 100644 --- a/campaign/event_20200723_cn/sp.py +++ b/campaign/event_20200723_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'M10' diff --git a/campaign/event_20200806_cn/sp1.py b/campaign/event_20200806_cn/sp1.py index 5793aed4e..2d7d79d55 100644 --- a/campaign/event_20200806_cn/sp1.py +++ b/campaign/event_20200806_cn/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'H6' diff --git a/campaign/event_20200806_cn/sp2.py b/campaign/event_20200806_cn/sp2.py index b56f5e9ff..9d18a27cd 100644 --- a/campaign/event_20200806_cn/sp2.py +++ b/campaign/event_20200806_cn/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20200806_cn/sp3.py b/campaign/event_20200806_cn/sp3.py index 7d6567d35..37f3ce0ac 100644 --- a/campaign/event_20200806_cn/sp3.py +++ b/campaign/event_20200806_cn/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20200820_cn/a1.py b/campaign/event_20200820_cn/a1.py index 74032d10b..6442c23b7 100644 --- a/campaign/event_20200820_cn/a1.py +++ b/campaign/event_20200820_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/event_20200820_cn/a2.py b/campaign/event_20200820_cn/a2.py index 25385f8e3..41d2429c5 100644 --- a/campaign/event_20200820_cn/a2.py +++ b/campaign/event_20200820_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20200820_cn/a3.py b/campaign/event_20200820_cn/a3.py index 844d60706..df575dd5d 100644 --- a/campaign/event_20200820_cn/a3.py +++ b/campaign/event_20200820_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20200820_cn/b1.py b/campaign/event_20200820_cn/b1.py index b6ddbf411..93af7fbcf 100644 --- a/campaign/event_20200820_cn/b1.py +++ b/campaign/event_20200820_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'I7' diff --git a/campaign/event_20200820_cn/b2.py b/campaign/event_20200820_cn/b2.py index 7282d8493..e171b9135 100644 --- a/campaign/event_20200820_cn/b2.py +++ b/campaign/event_20200820_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20200820_cn/b3.py b/campaign/event_20200820_cn/b3.py index b8178bc48..6726ca077 100644 --- a/campaign/event_20200820_cn/b3.py +++ b/campaign/event_20200820_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20200820_cn/c1.py b/campaign/event_20200820_cn/c1.py index d9a1a8f99..e5fbba55f 100644 --- a/campaign/event_20200820_cn/c1.py +++ b/campaign/event_20200820_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/event_20200820_cn/c2.py b/campaign/event_20200820_cn/c2.py index f7f497dd2..552d222cc 100644 --- a/campaign/event_20200820_cn/c2.py +++ b/campaign/event_20200820_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20200820_cn/c3.py b/campaign/event_20200820_cn/c3.py index 907ab1cd9..7b89d601a 100644 --- a/campaign/event_20200820_cn/c3.py +++ b/campaign/event_20200820_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20200820_cn/d1.py b/campaign/event_20200820_cn/d1.py index b3c5cf3e8..7720544ec 100644 --- a/campaign/event_20200820_cn/d1.py +++ b/campaign/event_20200820_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'I7' diff --git a/campaign/event_20200820_cn/d2.py b/campaign/event_20200820_cn/d2.py index db0348b09..799bc100a 100644 --- a/campaign/event_20200820_cn/d2.py +++ b/campaign/event_20200820_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20200820_cn/d3.py b/campaign/event_20200820_cn/d3.py index f08bea43f..6d54818ea 100644 --- a/campaign/event_20200820_cn/d3.py +++ b/campaign/event_20200820_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20200820_cn/sp.py b/campaign/event_20200820_cn/sp.py index f7c4fb7fd..044bdb525 100644 --- a/campaign/event_20200820_cn/sp.py +++ b/campaign/event_20200820_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'I7' diff --git a/campaign/event_20200903_en/sp0.py b/campaign/event_20200903_en/sp0.py index 04a9c6798..fcbc66a32 100644 --- a/campaign/event_20200903_en/sp0.py +++ b/campaign/event_20200903_en/sp0.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP0') MAP.shape = 'J6' diff --git a/campaign/event_20200903_en/sp1.py b/campaign/event_20200903_en/sp1.py index ab762204a..1058a99f7 100644 --- a/campaign/event_20200903_en/sp1.py +++ b/campaign/event_20200903_en/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'K7' diff --git a/campaign/event_20200903_en/sp2.py b/campaign/event_20200903_en/sp2.py index 2df4ed4bd..0760ad8fb 100644 --- a/campaign/event_20200903_en/sp2.py +++ b/campaign/event_20200903_en/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20200903_en/sp3.py b/campaign/event_20200903_en/sp3.py index c378f38b9..46535a312 100644 --- a/campaign/event_20200903_en/sp3.py +++ b/campaign/event_20200903_en/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20200917_cn/campaign_base.py b/campaign/event_20200917_cn/campaign_base.py index 232131c72..ac474ddbe 100644 --- a/campaign/event_20200917_cn/campaign_base.py +++ b/campaign/event_20200917_cn/campaign_base.py @@ -1,7 +1,7 @@ +from module.base.button import Button +from module.base.utils import * from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger -from module.base.utils import * -from module.base.button import Button # Here manually type coordinates, because the ball appears in event Dreamwaker's Butterfly only. BALL = Button(area=(571, 283, 696, 387), color=(), button=(597, 274, 671, 343)) diff --git a/campaign/event_20200917_cn/ht1.py b/campaign/event_20200917_cn/ht1.py index d31e16441..0f08b86d2 100644 --- a/campaign/event_20200917_cn/ht1.py +++ b/campaign/event_20200917_cn/ht1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('HT1') MAP.shape = 'K7' diff --git a/campaign/event_20200917_cn/ht2.py b/campaign/event_20200917_cn/ht2.py index 39fbc7bf5..9e49b92a3 100644 --- a/campaign/event_20200917_cn/ht2.py +++ b/campaign/event_20200917_cn/ht2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .ht1 import Config as ConfigBase MAP = CampaignMap('HT2') diff --git a/campaign/event_20200917_cn/ht3.py b/campaign/event_20200917_cn/ht3.py index 930c05d8a..7963c6e05 100644 --- a/campaign/event_20200917_cn/ht3.py +++ b/campaign/event_20200917_cn/ht3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .ht1 import Config as ConfigBase MAP = CampaignMap('HT3') diff --git a/campaign/event_20200917_cn/ht4.py b/campaign/event_20200917_cn/ht4.py index 8d3f223dc..45f874dfb 100644 --- a/campaign/event_20200917_cn/ht4.py +++ b/campaign/event_20200917_cn/ht4.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .ht1 import Config as ConfigBase MAP = CampaignMap('HT4') diff --git a/campaign/event_20200917_cn/ht5.py b/campaign/event_20200917_cn/ht5.py index 625cad9f2..c928c2252 100644 --- a/campaign/event_20200917_cn/ht5.py +++ b/campaign/event_20200917_cn/ht5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .ht1 import Config as ConfigBase MAP = CampaignMap('HT5') diff --git a/campaign/event_20200917_cn/ht6.py b/campaign/event_20200917_cn/ht6.py index be7239438..6e062757f 100644 --- a/campaign/event_20200917_cn/ht6.py +++ b/campaign/event_20200917_cn/ht6.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .ht1 import Config as ConfigBase MAP = CampaignMap('HT6') diff --git a/campaign/event_20200917_cn/hts1.py b/campaign/event_20200917_cn/hts1.py index 673289025..4548887d8 100644 --- a/campaign/event_20200917_cn/hts1.py +++ b/campaign/event_20200917_cn/hts1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('HTS1') MAP.shape = 'H6' diff --git a/campaign/event_20200917_cn/hts2.py b/campaign/event_20200917_cn/hts2.py index 5c544fe3c..ff676ad2f 100644 --- a/campaign/event_20200917_cn/hts2.py +++ b/campaign/event_20200917_cn/hts2.py @@ -1,9 +1,10 @@ -from .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 .hts1 import Config as ConfigBase from module.exception import CampaignEnd +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase +from .hts1 import Config as ConfigBase MAP = CampaignMap('HTS2') MAP.shape = 'H8' diff --git a/campaign/event_20200917_cn/sp.py b/campaign/event_20200917_cn/sp.py index 6a1a510c5..e05507c0c 100644 --- a/campaign/event_20200917_cn/sp.py +++ b/campaign/event_20200917_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'K9' diff --git a/campaign/event_20200917_cn/t1.py b/campaign/event_20200917_cn/t1.py index e85db2010..5acedcafa 100644 --- a/campaign/event_20200917_cn/t1.py +++ b/campaign/event_20200917_cn/t1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('T1') MAP.shape = 'K7' diff --git a/campaign/event_20200917_cn/t2.py b/campaign/event_20200917_cn/t2.py index d963de9ec..410ddba31 100644 --- a/campaign/event_20200917_cn/t2.py +++ b/campaign/event_20200917_cn/t2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T2') diff --git a/campaign/event_20200917_cn/t3.py b/campaign/event_20200917_cn/t3.py index 282716f26..95d8f398a 100644 --- a/campaign/event_20200917_cn/t3.py +++ b/campaign/event_20200917_cn/t3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T3') diff --git a/campaign/event_20200917_cn/t4.py b/campaign/event_20200917_cn/t4.py index 3f2ce98dc..feaeec87c 100644 --- a/campaign/event_20200917_cn/t4.py +++ b/campaign/event_20200917_cn/t4.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T4') diff --git a/campaign/event_20200917_cn/t5.py b/campaign/event_20200917_cn/t5.py index 03c89de32..8091b7b89 100644 --- a/campaign/event_20200917_cn/t5.py +++ b/campaign/event_20200917_cn/t5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T5') diff --git a/campaign/event_20200917_cn/t6.py b/campaign/event_20200917_cn/t6.py index f290fb4e6..67019dbfc 100644 --- a/campaign/event_20200917_cn/t6.py +++ b/campaign/event_20200917_cn/t6.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T6') diff --git a/campaign/event_20200917_cn/ts1.py b/campaign/event_20200917_cn/ts1.py index 0082b1e2e..15ac2d566 100644 --- a/campaign/event_20200917_cn/ts1.py +++ b/campaign/event_20200917_cn/ts1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('TS1') MAP.shape = 'H6' diff --git a/campaign/event_20200917_cn/ts2.py b/campaign/event_20200917_cn/ts2.py index 39db5d2ac..894afecd9 100644 --- a/campaign/event_20200917_cn/ts2.py +++ b/campaign/event_20200917_cn/ts2.py @@ -1,9 +1,10 @@ -from .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 .ts1 import Config as ConfigBase from module.exception import CampaignEnd +from module.logger import logger +from module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase +from .ts1 import Config as ConfigBase MAP = CampaignMap('TS2') MAP.shape = 'H8' diff --git a/campaign/event_20201002_en/sp1.py b/campaign/event_20201002_en/sp1.py index c197f3b5b..b964138e0 100644 --- a/campaign/event_20201002_en/sp1.py +++ b/campaign/event_20201002_en/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'K7' diff --git a/campaign/event_20201002_en/sp2.py b/campaign/event_20201002_en/sp2.py index e16f4801f..a9516b1e7 100644 --- a/campaign/event_20201002_en/sp2.py +++ b/campaign/event_20201002_en/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20201002_en/sp3.py b/campaign/event_20201002_en/sp3.py index 3796bf078..b5e374062 100644 --- a/campaign/event_20201002_en/sp3.py +++ b/campaign/event_20201002_en/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20201012_cn/sp1.py b/campaign/event_20201012_cn/sp1.py index 8a4b8c177..ec3f0042d 100644 --- a/campaign/event_20201012_cn/sp1.py +++ b/campaign/event_20201012_cn/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'I6' diff --git a/campaign/event_20201012_cn/sp2.py b/campaign/event_20201012_cn/sp2.py index 8fc24ade6..b5b5d3138 100644 --- a/campaign/event_20201012_cn/sp2.py +++ b/campaign/event_20201012_cn/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20201012_cn/sp3.py b/campaign/event_20201012_cn/sp3.py index 388d6ac4d..02a74d3a4 100644 --- a/campaign/event_20201012_cn/sp3.py +++ b/campaign/event_20201012_cn/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20201029_cn/campaign_base.py b/campaign/event_20201029_cn/campaign_base.py index e003c64a4..11a45aa9e 100644 --- a/campaign/event_20201029_cn/campaign_base.py +++ b/campaign/event_20201029_cn/campaign_base.py @@ -1,6 +1,6 @@ +from module.base.timer import Timer from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger -from module.base.timer import Timer class CampaignBase(CampaignBase_): diff --git a/campaign/event_20201029_cn/sp.py b/campaign/event_20201029_cn/sp.py index 4edc6634c..677fcaf7e 100644 --- a/campaign/event_20201029_cn/sp.py +++ b/campaign/event_20201029_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'G8' diff --git a/campaign/event_20201029_cn/sp1.py b/campaign/event_20201029_cn/sp1.py index 579216e37..9321bd3a9 100644 --- a/campaign/event_20201029_cn/sp1.py +++ b/campaign/event_20201029_cn/sp1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'G7' diff --git a/campaign/event_20201029_cn/sp2.py b/campaign/event_20201029_cn/sp2.py index 7dcb7c1dc..2a60ebe67 100644 --- a/campaign/event_20201029_cn/sp2.py +++ b/campaign/event_20201029_cn/sp2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20201029_cn/sp3.py b/campaign/event_20201029_cn/sp3.py index 1d65b5791..00c9b027f 100644 --- a/campaign/event_20201029_cn/sp3.py +++ b/campaign/event_20201029_cn/sp3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20201029_cn/sp4.py b/campaign/event_20201029_cn/sp4.py index 00a344d35..82387983d 100644 --- a/campaign/event_20201029_cn/sp4.py +++ b/campaign/event_20201029_cn/sp4.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP4') diff --git a/campaign/event_20201029_cn/sp5.py b/campaign/event_20201029_cn/sp5.py index d407097bb..791ff0369 100644 --- a/campaign/event_20201029_cn/sp5.py +++ b/campaign/event_20201029_cn/sp5.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP5') diff --git a/campaign/event_20201126_cn/sp.py b/campaign/event_20201126_cn/sp.py index e217d512d..737e02e9e 100644 --- a/campaign/event_20201126_cn/sp.py +++ b/campaign/event_20201126_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('VSP') MAP.shape = 'I6' diff --git a/campaign/event_20201126_cn/sp1.py b/campaign/event_20201126_cn/sp1.py index e168df614..35cc2e633 100644 --- a/campaign/event_20201126_cn/sp1.py +++ b/campaign/event_20201126_cn/sp1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'H7' diff --git a/campaign/event_20201126_cn/sp2.py b/campaign/event_20201126_cn/sp2.py index 4fdd0822d..1f59bbde4 100644 --- a/campaign/event_20201126_cn/sp2.py +++ b/campaign/event_20201126_cn/sp2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20201126_cn/sp3.py b/campaign/event_20201126_cn/sp3.py index afec8edee..07ad245c5 100644 --- a/campaign/event_20201126_cn/sp3.py +++ b/campaign/event_20201126_cn/sp3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20201126_cn/sp4.py b/campaign/event_20201126_cn/sp4.py index 21eecab3a..1df5b11c2 100644 --- a/campaign/event_20201126_cn/sp4.py +++ b/campaign/event_20201126_cn/sp4.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP4') diff --git a/campaign/event_20201229_cn/a1.py b/campaign/event_20201229_cn/a1.py index a7cb4634d..80dbe0d01 100644 --- a/campaign/event_20201229_cn/a1.py +++ b/campaign/event_20201229_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I7' diff --git a/campaign/event_20201229_cn/a2.py b/campaign/event_20201229_cn/a2.py index 0b6c9c2a2..cce6923ae 100644 --- a/campaign/event_20201229_cn/a2.py +++ b/campaign/event_20201229_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20201229_cn/a3.py b/campaign/event_20201229_cn/a3.py index d58a4f647..b8cc8a11f 100644 --- a/campaign/event_20201229_cn/a3.py +++ b/campaign/event_20201229_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20201229_cn/b1.py b/campaign/event_20201229_cn/b1.py index e5a7daa19..fae805cd8 100644 --- a/campaign/event_20201229_cn/b1.py +++ b/campaign/event_20201229_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'I8' diff --git a/campaign/event_20201229_cn/b2.py b/campaign/event_20201229_cn/b2.py index 9d4874c36..7acd0021d 100644 --- a/campaign/event_20201229_cn/b2.py +++ b/campaign/event_20201229_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20201229_cn/b3.py b/campaign/event_20201229_cn/b3.py index eb2c8b853..23b9c3ca3 100644 --- a/campaign/event_20201229_cn/b3.py +++ b/campaign/event_20201229_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20201229_cn/c1.py b/campaign/event_20201229_cn/c1.py index 5777b1765..0b1e39e73 100644 --- a/campaign/event_20201229_cn/c1.py +++ b/campaign/event_20201229_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I7' diff --git a/campaign/event_20201229_cn/c2.py b/campaign/event_20201229_cn/c2.py index 8939dbcbb..ac6b467ac 100644 --- a/campaign/event_20201229_cn/c2.py +++ b/campaign/event_20201229_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20201229_cn/c3.py b/campaign/event_20201229_cn/c3.py index a9a617eb4..704f2eff2 100644 --- a/campaign/event_20201229_cn/c3.py +++ b/campaign/event_20201229_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20201229_cn/d1.py b/campaign/event_20201229_cn/d1.py index ac61345a0..1bf60a368 100644 --- a/campaign/event_20201229_cn/d1.py +++ b/campaign/event_20201229_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'I8' diff --git a/campaign/event_20201229_cn/d2.py b/campaign/event_20201229_cn/d2.py index 6eaa9ded7..3c2009335 100644 --- a/campaign/event_20201229_cn/d2.py +++ b/campaign/event_20201229_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20201229_cn/d3.py b/campaign/event_20201229_cn/d3.py index e0f5f8b51..7c30ae84b 100644 --- a/campaign/event_20201229_cn/d3.py +++ b/campaign/event_20201229_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20201229_cn/sp.py b/campaign/event_20201229_cn/sp.py index 3ce969b3f..38e24771d 100644 --- a/campaign/event_20201229_cn/sp.py +++ b/campaign/event_20201229_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'M10' diff --git a/campaign/event_20210121_cn/a1.py b/campaign/event_20210121_cn/a1.py index bc752903f..041a7ba96 100644 --- a/campaign/event_20210121_cn/a1.py +++ b/campaign/event_20210121_cn/a1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/event_20210121_cn/a2.py b/campaign/event_20210121_cn/a2.py index 150f73224..f3ce2694a 100644 --- a/campaign/event_20210121_cn/a2.py +++ b/campaign/event_20210121_cn/a2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A2') MAP.shape = 'G7' diff --git a/campaign/event_20210121_cn/a3.py b/campaign/event_20210121_cn/a3.py index 41292edb5..30f1ad37f 100644 --- a/campaign/event_20210121_cn/a3.py +++ b/campaign/event_20210121_cn/a3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A3') MAP.shape = 'I7' diff --git a/campaign/event_20210121_cn/as1.py b/campaign/event_20210121_cn/as1.py index d20476fd0..dbc171c09 100644 --- a/campaign/event_20210121_cn/as1.py +++ b/campaign/event_20210121_cn/as1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('AS1') MAP.shape = 'H6' diff --git a/campaign/event_20210121_cn/as2.py b/campaign/event_20210121_cn/as2.py index 9a8c57b37..a48b58460 100644 --- a/campaign/event_20210121_cn/as2.py +++ b/campaign/event_20210121_cn/as2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .as1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('AS2') MAP.shape = 'H7' diff --git a/campaign/event_20210121_cn/b1.py b/campaign/event_20210121_cn/b1.py index 0e3de32c6..65575d7da 100644 --- a/campaign/event_20210121_cn/b1.py +++ b/campaign/event_20210121_cn/b1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20210121_cn/b2.py b/campaign/event_20210121_cn/b2.py index d7816677b..8043632f5 100644 --- a/campaign/event_20210121_cn/b2.py +++ b/campaign/event_20210121_cn/b2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B2') MAP.shape = 'I7' diff --git a/campaign/event_20210121_cn/b3.py b/campaign/event_20210121_cn/b3.py index d8ede62ff..9127a0b8b 100644 --- a/campaign/event_20210121_cn/b3.py +++ b/campaign/event_20210121_cn/b3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B3') MAP.shape = 'H7' diff --git a/campaign/event_20210121_cn/c1.py b/campaign/event_20210121_cn/c1.py index e4293662c..085a10148 100644 --- a/campaign/event_20210121_cn/c1.py +++ b/campaign/event_20210121_cn/c1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/event_20210121_cn/c2.py b/campaign/event_20210121_cn/c2.py index 3e773f619..d8e68b4f4 100644 --- a/campaign/event_20210121_cn/c2.py +++ b/campaign/event_20210121_cn/c2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C2') MAP.shape = 'G7' diff --git a/campaign/event_20210121_cn/c3.py b/campaign/event_20210121_cn/c3.py index 1634e12cb..cad5ec510 100644 --- a/campaign/event_20210121_cn/c3.py +++ b/campaign/event_20210121_cn/c3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C3') MAP.shape = 'I7' diff --git a/campaign/event_20210121_cn/campaign_base.py b/campaign/event_20210121_cn/campaign_base.py index 40231ebdf..7bc5fe4f4 100644 --- a/campaign/event_20210121_cn/campaign_base.py +++ b/campaign/event_20210121_cn/campaign_base.py @@ -1,6 +1,7 @@ from module.campaign.campaign_base import CampaignBase as CampaignBase_ -from module.logger import logger from module.exception import CampaignNameError +from module.logger import logger + class CampaignBase(CampaignBase_): def campaign_set_chapter(self, name, mode='normal'): diff --git a/campaign/event_20210121_cn/cs1.py b/campaign/event_20210121_cn/cs1.py index a2bca9aee..903bbf8b3 100644 --- a/campaign/event_20210121_cn/cs1.py +++ b/campaign/event_20210121_cn/cs1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('CS1') MAP.shape = 'H6' diff --git a/campaign/event_20210121_cn/cs2.py b/campaign/event_20210121_cn/cs2.py index f84b569ee..dc03692da 100644 --- a/campaign/event_20210121_cn/cs2.py +++ b/campaign/event_20210121_cn/cs2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .cs1 import Config as ConfigBase MAP = CampaignMap('CS2') diff --git a/campaign/event_20210121_cn/d1.py b/campaign/event_20210121_cn/d1.py index 36a594f1d..a865da91a 100644 --- a/campaign/event_20210121_cn/d1.py +++ b/campaign/event_20210121_cn/d1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20210121_cn/d2.py b/campaign/event_20210121_cn/d2.py index 6b7ae527a..f573a0808 100644 --- a/campaign/event_20210121_cn/d2.py +++ b/campaign/event_20210121_cn/d2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210121_cn/d3.py b/campaign/event_20210121_cn/d3.py index 14337a78a..8e6619a92 100644 --- a/campaign/event_20210121_cn/d3.py +++ b/campaign/event_20210121_cn/d3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210121_cn/sp.py b/campaign/event_20210121_cn/sp.py index 0cd709d79..773431585 100644 --- a/campaign/event_20210121_cn/sp.py +++ b/campaign/event_20210121_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'I7' diff --git a/campaign/event_20210225_cn/a1.py b/campaign/event_20210225_cn/a1.py index 343aef009..960403e96 100644 --- a/campaign/event_20210225_cn/a1.py +++ b/campaign/event_20210225_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I7' diff --git a/campaign/event_20210225_cn/a2.py b/campaign/event_20210225_cn/a2.py index bb95a75c2..3f622de63 100644 --- a/campaign/event_20210225_cn/a2.py +++ b/campaign/event_20210225_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210225_cn/a3.py b/campaign/event_20210225_cn/a3.py index 1a4dccbea..556bf3f02 100644 --- a/campaign/event_20210225_cn/a3.py +++ b/campaign/event_20210225_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210225_cn/b1.py b/campaign/event_20210225_cn/b1.py index 64d928dea..14f735be7 100644 --- a/campaign/event_20210225_cn/b1.py +++ b/campaign/event_20210225_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'I8' diff --git a/campaign/event_20210225_cn/b2.py b/campaign/event_20210225_cn/b2.py index 4b7a96730..e40d52101 100644 --- a/campaign/event_20210225_cn/b2.py +++ b/campaign/event_20210225_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210225_cn/b3.py b/campaign/event_20210225_cn/b3.py index 759970d68..ac5e44d55 100644 --- a/campaign/event_20210225_cn/b3.py +++ b/campaign/event_20210225_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210225_cn/c1.py b/campaign/event_20210225_cn/c1.py index ec0437a16..9c1e5953c 100644 --- a/campaign/event_20210225_cn/c1.py +++ b/campaign/event_20210225_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I7' diff --git a/campaign/event_20210225_cn/c2.py b/campaign/event_20210225_cn/c2.py index 67402fd8d..d9bfe7af7 100644 --- a/campaign/event_20210225_cn/c2.py +++ b/campaign/event_20210225_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210225_cn/c3.py b/campaign/event_20210225_cn/c3.py index 891649b7f..f5bada942 100644 --- a/campaign/event_20210225_cn/c3.py +++ b/campaign/event_20210225_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210225_cn/d1.py b/campaign/event_20210225_cn/d1.py index 62fc668be..a7143dcdf 100644 --- a/campaign/event_20210225_cn/d1.py +++ b/campaign/event_20210225_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'I8' diff --git a/campaign/event_20210225_cn/d2.py b/campaign/event_20210225_cn/d2.py index e03629b49..18f85ed24 100644 --- a/campaign/event_20210225_cn/d2.py +++ b/campaign/event_20210225_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210225_cn/d3.py b/campaign/event_20210225_cn/d3.py index 9b2d3d347..5691895dc 100644 --- a/campaign/event_20210225_cn/d3.py +++ b/campaign/event_20210225_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210225_cn/sp.py b/campaign/event_20210225_cn/sp.py index af36fee9a..efe0e7344 100644 --- a/campaign/event_20210225_cn/sp.py +++ b/campaign/event_20210225_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'G10' diff --git a/campaign/event_20210225_tw/a1.py b/campaign/event_20210225_tw/a1.py index a06a42a59..dea8c8dbc 100644 --- a/campaign/event_20210225_tw/a1.py +++ b/campaign/event_20210225_tw/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'J5' diff --git a/campaign/event_20210225_tw/a2.py b/campaign/event_20210225_tw/a2.py index 469250df9..bfb46aa91 100644 --- a/campaign/event_20210225_tw/a2.py +++ b/campaign/event_20210225_tw/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210225_tw/a3.py b/campaign/event_20210225_tw/a3.py index 97fe8c8c1..af3ebc9ae 100644 --- a/campaign/event_20210225_tw/a3.py +++ b/campaign/event_20210225_tw/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210225_tw/b1.py b/campaign/event_20210225_tw/b1.py index 79e6a5c1a..8c071ad64 100644 --- a/campaign/event_20210225_tw/b1.py +++ b/campaign/event_20210225_tw/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20210225_tw/b2.py b/campaign/event_20210225_tw/b2.py index e696892bc..844901d6a 100644 --- a/campaign/event_20210225_tw/b2.py +++ b/campaign/event_20210225_tw/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210225_tw/b3.py b/campaign/event_20210225_tw/b3.py index d022379d7..58fb6f652 100644 --- a/campaign/event_20210225_tw/b3.py +++ b/campaign/event_20210225_tw/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210225_tw/c1.py b/campaign/event_20210225_tw/c1.py index 13ce2d4ec..6fb774ecf 100644 --- a/campaign/event_20210225_tw/c1.py +++ b/campaign/event_20210225_tw/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'J5' diff --git a/campaign/event_20210225_tw/c2.py b/campaign/event_20210225_tw/c2.py index 052f93c3b..bf1e4aba9 100644 --- a/campaign/event_20210225_tw/c2.py +++ b/campaign/event_20210225_tw/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210225_tw/c3.py b/campaign/event_20210225_tw/c3.py index 17daaffa8..2b5e8c9b0 100644 --- a/campaign/event_20210225_tw/c3.py +++ b/campaign/event_20210225_tw/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210225_tw/d1.py b/campaign/event_20210225_tw/d1.py index ba8ef7760..91e10cd71 100644 --- a/campaign/event_20210225_tw/d1.py +++ b/campaign/event_20210225_tw/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20210225_tw/d2.py b/campaign/event_20210225_tw/d2.py index b49a03a65..827ae4237 100644 --- a/campaign/event_20210225_tw/d2.py +++ b/campaign/event_20210225_tw/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210225_tw/d3.py b/campaign/event_20210225_tw/d3.py index 4417bf2e9..e06cc3524 100644 --- a/campaign/event_20210225_tw/d3.py +++ b/campaign/event_20210225_tw/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210225_tw/sp.py b/campaign/event_20210225_tw/sp.py index 243bc4a38..cd2ca9ab1 100644 --- a/campaign/event_20210225_tw/sp.py +++ b/campaign/event_20210225_tw/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'I7' diff --git a/campaign/event_20210325_cn/a1.py b/campaign/event_20210325_cn/a1.py index 3ac453b75..93c6c28b6 100644 --- a/campaign/event_20210325_cn/a1.py +++ b/campaign/event_20210325_cn/a1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/event_20210325_cn/a2.py b/campaign/event_20210325_cn/a2.py index 7c1ccec02..2ff0a3d6b 100644 --- a/campaign/event_20210325_cn/a2.py +++ b/campaign/event_20210325_cn/a2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A2') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/a3.py b/campaign/event_20210325_cn/a3.py index 02d5e123e..038c1628e 100644 --- a/campaign/event_20210325_cn/a3.py +++ b/campaign/event_20210325_cn/a3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A3') MAP.shape = 'I8' diff --git a/campaign/event_20210325_cn/as1.py b/campaign/event_20210325_cn/as1.py index 4810e37e7..4e2f61ee8 100644 --- a/campaign/event_20210325_cn/as1.py +++ b/campaign/event_20210325_cn/as1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('AS1') MAP.shape = 'H6' diff --git a/campaign/event_20210325_cn/as2.py b/campaign/event_20210325_cn/as2.py index 657d4950f..89f77093e 100644 --- a/campaign/event_20210325_cn/as2.py +++ b/campaign/event_20210325_cn/as2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .as1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('AS2') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/b1.py b/campaign/event_20210325_cn/b1.py index 4dd770749..d05e9e751 100644 --- a/campaign/event_20210325_cn/b1.py +++ b/campaign/event_20210325_cn/b1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/b2.py b/campaign/event_20210325_cn/b2.py index fe44543ef..9a6ddd56a 100644 --- a/campaign/event_20210325_cn/b2.py +++ b/campaign/event_20210325_cn/b2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B2') MAP.shape = 'I7' diff --git a/campaign/event_20210325_cn/b3.py b/campaign/event_20210325_cn/b3.py index 52d788255..deb1ebd3b 100644 --- a/campaign/event_20210325_cn/b3.py +++ b/campaign/event_20210325_cn/b3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B3') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/bs1.py b/campaign/event_20210325_cn/bs1.py index 7ffd74e3a..aeaf2f355 100644 --- a/campaign/event_20210325_cn/bs1.py +++ b/campaign/event_20210325_cn/bs1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('BS1') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/bs2.py b/campaign/event_20210325_cn/bs2.py index c14f6f1d6..a6276b976 100644 --- a/campaign/event_20210325_cn/bs2.py +++ b/campaign/event_20210325_cn/bs2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .bs1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('BS2') MAP.shape = 'I7' diff --git a/campaign/event_20210325_cn/c1.py b/campaign/event_20210325_cn/c1.py index 420d10ef8..fe544c15e 100644 --- a/campaign/event_20210325_cn/c1.py +++ b/campaign/event_20210325_cn/c1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/event_20210325_cn/c2.py b/campaign/event_20210325_cn/c2.py index 0ab0061aa..aba137445 100644 --- a/campaign/event_20210325_cn/c2.py +++ b/campaign/event_20210325_cn/c2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C2') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/c3.py b/campaign/event_20210325_cn/c3.py index 85e610024..a717c7e20 100644 --- a/campaign/event_20210325_cn/c3.py +++ b/campaign/event_20210325_cn/c3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C3') MAP.shape = 'I8' diff --git a/campaign/event_20210325_cn/cs1.py b/campaign/event_20210325_cn/cs1.py index 4a708a0de..291a11250 100644 --- a/campaign/event_20210325_cn/cs1.py +++ b/campaign/event_20210325_cn/cs1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('CS1') MAP.shape = 'H6' diff --git a/campaign/event_20210325_cn/cs2.py b/campaign/event_20210325_cn/cs2.py index bdfea2728..d09658e60 100644 --- a/campaign/event_20210325_cn/cs2.py +++ b/campaign/event_20210325_cn/cs2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .cs1 import Config as ConfigBase MAP = CampaignMap('CS2') diff --git a/campaign/event_20210325_cn/d1.py b/campaign/event_20210325_cn/d1.py index bc2d4121e..fdd0063c0 100644 --- a/campaign/event_20210325_cn/d1.py +++ b/campaign/event_20210325_cn/d1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/d2.py b/campaign/event_20210325_cn/d2.py index 34dc3a720..a126456ac 100644 --- a/campaign/event_20210325_cn/d2.py +++ b/campaign/event_20210325_cn/d2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210325_cn/d3.py b/campaign/event_20210325_cn/d3.py index 3d18b5359..49a0982c9 100644 --- a/campaign/event_20210325_cn/d3.py +++ b/campaign/event_20210325_cn/d3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210325_cn/ds1.py b/campaign/event_20210325_cn/ds1.py index 98f484bf0..a7905218d 100644 --- a/campaign/event_20210325_cn/ds1.py +++ b/campaign/event_20210325_cn/ds1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('DS1') MAP.shape = 'H7' diff --git a/campaign/event_20210325_cn/ds2.py b/campaign/event_20210325_cn/ds2.py index 8c84b55eb..b814a9269 100644 --- a/campaign/event_20210325_cn/ds2.py +++ b/campaign/event_20210325_cn/ds2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .ds1 import Config as ConfigBase MAP = CampaignMap('DS2') diff --git a/campaign/event_20210415_tw/sp1.py b/campaign/event_20210415_tw/sp1.py index 5e0a4cd50..4ca7aaaf6 100644 --- a/campaign/event_20210415_tw/sp1.py +++ b/campaign/event_20210415_tw/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'H6' diff --git a/campaign/event_20210415_tw/sp2.py b/campaign/event_20210415_tw/sp2.py index c98795930..bbc6e8a38 100644 --- a/campaign/event_20210415_tw/sp2.py +++ b/campaign/event_20210415_tw/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20210415_tw/sp3.py b/campaign/event_20210415_tw/sp3.py index 081c92f7f..1123de4cc 100644 --- a/campaign/event_20210415_tw/sp3.py +++ b/campaign/event_20210415_tw/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20210422_cn/a1.py b/campaign/event_20210422_cn/a1.py index 600666b7e..c39e66038 100644 --- a/campaign/event_20210422_cn/a1.py +++ b/campaign/event_20210422_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I7' diff --git a/campaign/event_20210422_cn/a2.py b/campaign/event_20210422_cn/a2.py index bc3a1ccca..f69d82311 100644 --- a/campaign/event_20210422_cn/a2.py +++ b/campaign/event_20210422_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210422_cn/a3.py b/campaign/event_20210422_cn/a3.py index ec21adc4e..df7535581 100644 --- a/campaign/event_20210422_cn/a3.py +++ b/campaign/event_20210422_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210422_cn/b1.py b/campaign/event_20210422_cn/b1.py index c9a07c9c4..d226258d6 100644 --- a/campaign/event_20210422_cn/b1.py +++ b/campaign/event_20210422_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'J8' diff --git a/campaign/event_20210422_cn/b2.py b/campaign/event_20210422_cn/b2.py index e8c0ac711..e839b064c 100644 --- a/campaign/event_20210422_cn/b2.py +++ b/campaign/event_20210422_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210422_cn/b3.py b/campaign/event_20210422_cn/b3.py index 8517fcc16..1d10d936b 100644 --- a/campaign/event_20210422_cn/b3.py +++ b/campaign/event_20210422_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210422_cn/c1.py b/campaign/event_20210422_cn/c1.py index 16c471bbc..d0cc47148 100644 --- a/campaign/event_20210422_cn/c1.py +++ b/campaign/event_20210422_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I7' diff --git a/campaign/event_20210422_cn/c2.py b/campaign/event_20210422_cn/c2.py index 20f1d3499..86e8b078c 100644 --- a/campaign/event_20210422_cn/c2.py +++ b/campaign/event_20210422_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210422_cn/c3.py b/campaign/event_20210422_cn/c3.py index cd45160be..b5b7b3074 100644 --- a/campaign/event_20210422_cn/c3.py +++ b/campaign/event_20210422_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210422_cn/d1.py b/campaign/event_20210422_cn/d1.py index 1ed323904..931a978da 100644 --- a/campaign/event_20210422_cn/d1.py +++ b/campaign/event_20210422_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'J8' diff --git a/campaign/event_20210422_cn/d2.py b/campaign/event_20210422_cn/d2.py index d2b46d005..b0233b4c4 100644 --- a/campaign/event_20210422_cn/d2.py +++ b/campaign/event_20210422_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210422_cn/d3.py b/campaign/event_20210422_cn/d3.py index 1309d6808..e9ff7b103 100644 --- a/campaign/event_20210422_cn/d3.py +++ b/campaign/event_20210422_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210422_cn/sp.py b/campaign/event_20210422_cn/sp.py index 3a410484b..f226f5b6d 100644 --- a/campaign/event_20210422_cn/sp.py +++ b/campaign/event_20210422_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'G10' diff --git a/campaign/event_20210429_tw/a1.py b/campaign/event_20210429_tw/a1.py index 5addc62cc..280e301aa 100644 --- a/campaign/event_20210429_tw/a1.py +++ b/campaign/event_20210429_tw/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I6' diff --git a/campaign/event_20210429_tw/a2.py b/campaign/event_20210429_tw/a2.py index 8aa0d5bf2..5438c0e24 100644 --- a/campaign/event_20210429_tw/a2.py +++ b/campaign/event_20210429_tw/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210429_tw/a3.py b/campaign/event_20210429_tw/a3.py index 88db1c159..4f324400b 100644 --- a/campaign/event_20210429_tw/a3.py +++ b/campaign/event_20210429_tw/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210429_tw/a4.py b/campaign/event_20210429_tw/a4.py index 5bc192d2b..8e564ab68 100644 --- a/campaign/event_20210429_tw/a4.py +++ b/campaign/event_20210429_tw/a4.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A4') diff --git a/campaign/event_20210429_tw/b1.py b/campaign/event_20210429_tw/b1.py index 930340010..bb6bde760 100644 --- a/campaign/event_20210429_tw/b1.py +++ b/campaign/event_20210429_tw/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'J7' diff --git a/campaign/event_20210429_tw/b2.py b/campaign/event_20210429_tw/b2.py index b4201da43..64f0b287a 100644 --- a/campaign/event_20210429_tw/b2.py +++ b/campaign/event_20210429_tw/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210429_tw/c1.py b/campaign/event_20210429_tw/c1.py index 029c0c4d5..2cad48a94 100644 --- a/campaign/event_20210429_tw/c1.py +++ b/campaign/event_20210429_tw/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I6' diff --git a/campaign/event_20210429_tw/c2.py b/campaign/event_20210429_tw/c2.py index 36a32f50f..7d70d8d72 100644 --- a/campaign/event_20210429_tw/c2.py +++ b/campaign/event_20210429_tw/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210429_tw/c3.py b/campaign/event_20210429_tw/c3.py index a04dcf619..a4ac623a4 100644 --- a/campaign/event_20210429_tw/c3.py +++ b/campaign/event_20210429_tw/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210429_tw/c4.py b/campaign/event_20210429_tw/c4.py index 4dfe35bf3..30cf96b7d 100644 --- a/campaign/event_20210429_tw/c4.py +++ b/campaign/event_20210429_tw/c4.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C4') diff --git a/campaign/event_20210429_tw/d1.py b/campaign/event_20210429_tw/d1.py index d1355af14..b6de58d06 100644 --- a/campaign/event_20210429_tw/d1.py +++ b/campaign/event_20210429_tw/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'J7' diff --git a/campaign/event_20210429_tw/d2.py b/campaign/event_20210429_tw/d2.py index 2b0bf12db..cc6b701f2 100644 --- a/campaign/event_20210429_tw/d2.py +++ b/campaign/event_20210429_tw/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210527_cn/a1.py b/campaign/event_20210527_cn/a1.py index e1772e208..aefdf7d64 100644 --- a/campaign/event_20210527_cn/a1.py +++ b/campaign/event_20210527_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I7' diff --git a/campaign/event_20210527_cn/a2.py b/campaign/event_20210527_cn/a2.py index 31f6c0c26..aa3c2aca8 100644 --- a/campaign/event_20210527_cn/a2.py +++ b/campaign/event_20210527_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210527_cn/a3.py b/campaign/event_20210527_cn/a3.py index 8a5dd0e14..2350b3a6b 100644 --- a/campaign/event_20210527_cn/a3.py +++ b/campaign/event_20210527_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210527_cn/b1.py b/campaign/event_20210527_cn/b1.py index 7a8126d0c..342035bfd 100644 --- a/campaign/event_20210527_cn/b1.py +++ b/campaign/event_20210527_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'J8' diff --git a/campaign/event_20210527_cn/b2.py b/campaign/event_20210527_cn/b2.py index b4436ead5..4b0fa91a1 100644 --- a/campaign/event_20210527_cn/b2.py +++ b/campaign/event_20210527_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210527_cn/b3.py b/campaign/event_20210527_cn/b3.py index 79a18f0f7..e75cc2ca1 100644 --- a/campaign/event_20210527_cn/b3.py +++ b/campaign/event_20210527_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210527_cn/c1.py b/campaign/event_20210527_cn/c1.py index e885b7fe4..df8dc8715 100644 --- a/campaign/event_20210527_cn/c1.py +++ b/campaign/event_20210527_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I7' diff --git a/campaign/event_20210527_cn/c2.py b/campaign/event_20210527_cn/c2.py index aa7665455..ebadd70f5 100644 --- a/campaign/event_20210527_cn/c2.py +++ b/campaign/event_20210527_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210527_cn/c3.py b/campaign/event_20210527_cn/c3.py index e11e7ce80..ffbecec18 100644 --- a/campaign/event_20210527_cn/c3.py +++ b/campaign/event_20210527_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210527_cn/d1.py b/campaign/event_20210527_cn/d1.py index 97ec6427a..3063995e5 100644 --- a/campaign/event_20210527_cn/d1.py +++ b/campaign/event_20210527_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'J8' diff --git a/campaign/event_20210527_cn/d2.py b/campaign/event_20210527_cn/d2.py index b65aa9ced..baed281ad 100644 --- a/campaign/event_20210527_cn/d2.py +++ b/campaign/event_20210527_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210527_cn/d3.py b/campaign/event_20210527_cn/d3.py index 7d0939259..e39e69f89 100644 --- a/campaign/event_20210527_cn/d3.py +++ b/campaign/event_20210527_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210527_cn/sp.py b/campaign/event_20210527_cn/sp.py index a81c63a4c..3621436bc 100644 --- a/campaign/event_20210527_cn/sp.py +++ b/campaign/event_20210527_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'I8' diff --git a/campaign/event_20210527_tw/a1.py b/campaign/event_20210527_tw/a1.py index 50d9b6bda..fb03a0f1a 100644 --- a/campaign/event_20210527_tw/a1.py +++ b/campaign/event_20210527_tw/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'F7' diff --git a/campaign/event_20210527_tw/a2.py b/campaign/event_20210527_tw/a2.py index cf1706635..e4981c389 100644 --- a/campaign/event_20210527_tw/a2.py +++ b/campaign/event_20210527_tw/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210527_tw/a3.py b/campaign/event_20210527_tw/a3.py index c364a8757..8d27d0b39 100644 --- a/campaign/event_20210527_tw/a3.py +++ b/campaign/event_20210527_tw/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210527_tw/b1.py b/campaign/event_20210527_tw/b1.py index 85f6dc9ac..b068c61c6 100644 --- a/campaign/event_20210527_tw/b1.py +++ b/campaign/event_20210527_tw/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20210527_tw/b2.py b/campaign/event_20210527_tw/b2.py index 44fec7c1a..7e0c9a5ff 100644 --- a/campaign/event_20210527_tw/b2.py +++ b/campaign/event_20210527_tw/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210527_tw/b3.py b/campaign/event_20210527_tw/b3.py index 9080994bb..e5087c193 100644 --- a/campaign/event_20210527_tw/b3.py +++ b/campaign/event_20210527_tw/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210527_tw/c1.py b/campaign/event_20210527_tw/c1.py index 27a447ecc..b9e10551b 100644 --- a/campaign/event_20210527_tw/c1.py +++ b/campaign/event_20210527_tw/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'F7' diff --git a/campaign/event_20210527_tw/c2.py b/campaign/event_20210527_tw/c2.py index f4e9e57a5..609f59fbd 100644 --- a/campaign/event_20210527_tw/c2.py +++ b/campaign/event_20210527_tw/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210527_tw/c3.py b/campaign/event_20210527_tw/c3.py index d1f900f2b..710099e5f 100644 --- a/campaign/event_20210527_tw/c3.py +++ b/campaign/event_20210527_tw/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210527_tw/d1.py b/campaign/event_20210527_tw/d1.py index 8af430a1d..7a9332195 100644 --- a/campaign/event_20210527_tw/d1.py +++ b/campaign/event_20210527_tw/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20210527_tw/d2.py b/campaign/event_20210527_tw/d2.py index 2c990eb9e..bbdaeca5f 100644 --- a/campaign/event_20210527_tw/d2.py +++ b/campaign/event_20210527_tw/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210527_tw/d3.py b/campaign/event_20210527_tw/d3.py index b9ea00722..876f0eac5 100644 --- a/campaign/event_20210527_tw/d3.py +++ b/campaign/event_20210527_tw/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210527_tw/sp.py b/campaign/event_20210527_tw/sp.py index 38d36abe7..b22321563 100644 --- a/campaign/event_20210527_tw/sp.py +++ b/campaign/event_20210527_tw/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'G7' diff --git a/campaign/event_20210610_tw/sp1.py b/campaign/event_20210610_tw/sp1.py index 9441b76ef..7c43ad6a5 100644 --- a/campaign/event_20210610_tw/sp1.py +++ b/campaign/event_20210610_tw/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'H7' diff --git a/campaign/event_20210610_tw/sp2.py b/campaign/event_20210610_tw/sp2.py index 08262cdf5..d54055af8 100644 --- a/campaign/event_20210610_tw/sp2.py +++ b/campaign/event_20210610_tw/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20210610_tw/sp3.py b/campaign/event_20210610_tw/sp3.py index 9f79fa4fb..b5fcc77a9 100644 --- a/campaign/event_20210610_tw/sp3.py +++ b/campaign/event_20210610_tw/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20210624_cn/a1.py b/campaign/event_20210624_cn/a1.py index d5b2eff4b..2c94ee747 100644 --- a/campaign/event_20210624_cn/a1.py +++ b/campaign/event_20210624_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/event_20210624_cn/a2.py b/campaign/event_20210624_cn/a2.py index 772ce99a7..cebe1e490 100644 --- a/campaign/event_20210624_cn/a2.py +++ b/campaign/event_20210624_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210624_cn/a3.py b/campaign/event_20210624_cn/a3.py index bf4da83fb..23bd775fc 100644 --- a/campaign/event_20210624_cn/a3.py +++ b/campaign/event_20210624_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210624_cn/b1.py b/campaign/event_20210624_cn/b1.py index c2814165f..1ad2b96cb 100644 --- a/campaign/event_20210624_cn/b1.py +++ b/campaign/event_20210624_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20210624_cn/b2.py b/campaign/event_20210624_cn/b2.py index 1080e89b8..35c45ad4d 100644 --- a/campaign/event_20210624_cn/b2.py +++ b/campaign/event_20210624_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210624_cn/b3.py b/campaign/event_20210624_cn/b3.py index 43e05d61b..ed7a92002 100644 --- a/campaign/event_20210624_cn/b3.py +++ b/campaign/event_20210624_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210624_cn/c1.py b/campaign/event_20210624_cn/c1.py index d7ad1d9e5..b7c642682 100644 --- a/campaign/event_20210624_cn/c1.py +++ b/campaign/event_20210624_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/event_20210624_cn/c2.py b/campaign/event_20210624_cn/c2.py index 694915fbe..f25da4bda 100644 --- a/campaign/event_20210624_cn/c2.py +++ b/campaign/event_20210624_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210624_cn/c3.py b/campaign/event_20210624_cn/c3.py index b4ca734e4..ec206fe45 100644 --- a/campaign/event_20210624_cn/c3.py +++ b/campaign/event_20210624_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210624_cn/d1.py b/campaign/event_20210624_cn/d1.py index a1bfa13b6..9b0e70877 100644 --- a/campaign/event_20210624_cn/d1.py +++ b/campaign/event_20210624_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20210624_cn/d2.py b/campaign/event_20210624_cn/d2.py index 85a6861c6..e607c2f74 100644 --- a/campaign/event_20210624_cn/d2.py +++ b/campaign/event_20210624_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210624_cn/d3.py b/campaign/event_20210624_cn/d3.py index bba29a2c8..b77d5fe0c 100644 --- a/campaign/event_20210624_cn/d3.py +++ b/campaign/event_20210624_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210624_cn/sp.py b/campaign/event_20210624_cn/sp.py index 8064e9689..f065de6c8 100644 --- a/campaign/event_20210624_cn/sp.py +++ b/campaign/event_20210624_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'I7' diff --git a/campaign/event_20210624_tw/a1.py b/campaign/event_20210624_tw/a1.py index 5cd380c41..436d96e0d 100644 --- a/campaign/event_20210624_tw/a1.py +++ b/campaign/event_20210624_tw/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/event_20210624_tw/a2.py b/campaign/event_20210624_tw/a2.py index d635096b8..f255eba8b 100644 --- a/campaign/event_20210624_tw/a2.py +++ b/campaign/event_20210624_tw/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210624_tw/a3.py b/campaign/event_20210624_tw/a3.py index 2f576d254..3f281cfa4 100644 --- a/campaign/event_20210624_tw/a3.py +++ b/campaign/event_20210624_tw/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210624_tw/b1.py b/campaign/event_20210624_tw/b1.py index a39795fb9..2cd406ae0 100644 --- a/campaign/event_20210624_tw/b1.py +++ b/campaign/event_20210624_tw/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'F9' diff --git a/campaign/event_20210624_tw/b2.py b/campaign/event_20210624_tw/b2.py index 3e3085041..b7d8c4a19 100644 --- a/campaign/event_20210624_tw/b2.py +++ b/campaign/event_20210624_tw/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210624_tw/b3.py b/campaign/event_20210624_tw/b3.py index 787b51d2c..d0c66d96f 100644 --- a/campaign/event_20210624_tw/b3.py +++ b/campaign/event_20210624_tw/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210624_tw/c1.py b/campaign/event_20210624_tw/c1.py index 5d3773102..8a46a2031 100644 --- a/campaign/event_20210624_tw/c1.py +++ b/campaign/event_20210624_tw/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/event_20210624_tw/c2.py b/campaign/event_20210624_tw/c2.py index 6c2d0bfa5..2c4b7d416 100644 --- a/campaign/event_20210624_tw/c2.py +++ b/campaign/event_20210624_tw/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210624_tw/c3.py b/campaign/event_20210624_tw/c3.py index a02868f23..2878250cb 100644 --- a/campaign/event_20210624_tw/c3.py +++ b/campaign/event_20210624_tw/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210624_tw/d1.py b/campaign/event_20210624_tw/d1.py index 2c25359b4..794e5ef6a 100644 --- a/campaign/event_20210624_tw/d1.py +++ b/campaign/event_20210624_tw/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'F9' diff --git a/campaign/event_20210624_tw/d2.py b/campaign/event_20210624_tw/d2.py index 27ba773c4..18b13cb01 100644 --- a/campaign/event_20210624_tw/d2.py +++ b/campaign/event_20210624_tw/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210624_tw/d3.py b/campaign/event_20210624_tw/d3.py index ec46ecd71..823516b66 100644 --- a/campaign/event_20210624_tw/d3.py +++ b/campaign/event_20210624_tw/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210624_tw/sp.py b/campaign/event_20210624_tw/sp.py index dd59fa999..5735687fc 100644 --- a/campaign/event_20210624_tw/sp.py +++ b/campaign/event_20210624_tw/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'K9' diff --git a/campaign/event_20210722_cn/sp.py b/campaign/event_20210722_cn/sp.py index 7492d4014..ef0cb8c78 100644 --- a/campaign/event_20210722_cn/sp.py +++ b/campaign/event_20210722_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('VSP') MAP.shape = 'G8' diff --git a/campaign/event_20210722_cn/sp1.py b/campaign/event_20210722_cn/sp1.py index 12ef085a2..8820fbd1e 100644 --- a/campaign/event_20210722_cn/sp1.py +++ b/campaign/event_20210722_cn/sp1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'H7' diff --git a/campaign/event_20210722_cn/sp2.py b/campaign/event_20210722_cn/sp2.py index b58fe705f..bdfe9247f 100644 --- a/campaign/event_20210722_cn/sp2.py +++ b/campaign/event_20210722_cn/sp2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20210722_cn/sp3.py b/campaign/event_20210722_cn/sp3.py index c66ad5e14..5916e8fd6 100644 --- a/campaign/event_20210722_cn/sp3.py +++ b/campaign/event_20210722_cn/sp3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20210722_cn/sp4.py b/campaign/event_20210722_cn/sp4.py index 1fd177cd7..d45cfc656 100644 --- a/campaign/event_20210722_cn/sp4.py +++ b/campaign/event_20210722_cn/sp4.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP4') diff --git a/campaign/event_20210819_cn/a1.py b/campaign/event_20210819_cn/a1.py index ec2ddd19f..2c9ef3ea0 100644 --- a/campaign/event_20210819_cn/a1.py +++ b/campaign/event_20210819_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'F7' diff --git a/campaign/event_20210819_cn/a2.py b/campaign/event_20210819_cn/a2.py index cf1706635..e4981c389 100644 --- a/campaign/event_20210819_cn/a2.py +++ b/campaign/event_20210819_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20210819_cn/a3.py b/campaign/event_20210819_cn/a3.py index a1b516ff9..25835e146 100644 --- a/campaign/event_20210819_cn/a3.py +++ b/campaign/event_20210819_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20210819_cn/b1.py b/campaign/event_20210819_cn/b1.py index 48ed82b38..5744daa2e 100644 --- a/campaign/event_20210819_cn/b1.py +++ b/campaign/event_20210819_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20210819_cn/b2.py b/campaign/event_20210819_cn/b2.py index 44fec7c1a..7e0c9a5ff 100644 --- a/campaign/event_20210819_cn/b2.py +++ b/campaign/event_20210819_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20210819_cn/b3.py b/campaign/event_20210819_cn/b3.py index 7ed3e7eed..e44f6c7a3 100644 --- a/campaign/event_20210819_cn/b3.py +++ b/campaign/event_20210819_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20210819_cn/c1.py b/campaign/event_20210819_cn/c1.py index 4c184c777..3226f7fd3 100644 --- a/campaign/event_20210819_cn/c1.py +++ b/campaign/event_20210819_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'F7' diff --git a/campaign/event_20210819_cn/c2.py b/campaign/event_20210819_cn/c2.py index c3f50a4d5..76ff230d7 100644 --- a/campaign/event_20210819_cn/c2.py +++ b/campaign/event_20210819_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20210819_cn/c3.py b/campaign/event_20210819_cn/c3.py index cc53dcf49..aa1cfa3b2 100644 --- a/campaign/event_20210819_cn/c3.py +++ b/campaign/event_20210819_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20210819_cn/d1.py b/campaign/event_20210819_cn/d1.py index ef2ce5be2..cf9bf92b7 100644 --- a/campaign/event_20210819_cn/d1.py +++ b/campaign/event_20210819_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20210819_cn/d2.py b/campaign/event_20210819_cn/d2.py index e1b05e9fb..3d50fe157 100644 --- a/campaign/event_20210819_cn/d2.py +++ b/campaign/event_20210819_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210819_cn/d3.py b/campaign/event_20210819_cn/d3.py index bba4ec58d..15f17a261 100644 --- a/campaign/event_20210819_cn/d3.py +++ b/campaign/event_20210819_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210819_cn/sp.py b/campaign/event_20210819_cn/sp.py index 38d36abe7..b22321563 100644 --- a/campaign/event_20210819_cn/sp.py +++ b/campaign/event_20210819_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'G7' diff --git a/campaign/event_20210916_cn/a1.py b/campaign/event_20210916_cn/a1.py index 18a048543..bbc6b8aeb 100644 --- a/campaign/event_20210916_cn/a1.py +++ b/campaign/event_20210916_cn/a1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H7' diff --git a/campaign/event_20210916_cn/a2.py b/campaign/event_20210916_cn/a2.py index 64a520750..f9bc11502 100644 --- a/campaign/event_20210916_cn/a2.py +++ b/campaign/event_20210916_cn/a2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A2') MAP.shape = 'H8' diff --git a/campaign/event_20210916_cn/a3.py b/campaign/event_20210916_cn/a3.py index dd2f53dfb..64ebf3d38 100644 --- a/campaign/event_20210916_cn/a3.py +++ b/campaign/event_20210916_cn/a3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A3') MAP.shape = 'I9' diff --git a/campaign/event_20210916_cn/b1.py b/campaign/event_20210916_cn/b1.py index 3da99913a..21b493217 100644 --- a/campaign/event_20210916_cn/b1.py +++ b/campaign/event_20210916_cn/b1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'J8' diff --git a/campaign/event_20210916_cn/b2.py b/campaign/event_20210916_cn/b2.py index 315770617..1d2152ee0 100644 --- a/campaign/event_20210916_cn/b2.py +++ b/campaign/event_20210916_cn/b2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B2') MAP.shape = 'J8' diff --git a/campaign/event_20210916_cn/b3.py b/campaign/event_20210916_cn/b3.py index 0e6956d34..1e8964491 100644 --- a/campaign/event_20210916_cn/b3.py +++ b/campaign/event_20210916_cn/b3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B3') MAP.shape = 'I9' diff --git a/campaign/event_20210916_cn/c1.py b/campaign/event_20210916_cn/c1.py index da47f1e4b..1cd2ed076 100644 --- a/campaign/event_20210916_cn/c1.py +++ b/campaign/event_20210916_cn/c1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H7' diff --git a/campaign/event_20210916_cn/c2.py b/campaign/event_20210916_cn/c2.py index 81947ee94..04ef946d3 100644 --- a/campaign/event_20210916_cn/c2.py +++ b/campaign/event_20210916_cn/c2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C2') MAP.shape = 'H8' diff --git a/campaign/event_20210916_cn/c3.py b/campaign/event_20210916_cn/c3.py index f32801923..91ba347e4 100644 --- a/campaign/event_20210916_cn/c3.py +++ b/campaign/event_20210916_cn/c3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C3') MAP.shape = 'I9' diff --git a/campaign/event_20210916_cn/d1.py b/campaign/event_20210916_cn/d1.py index f9a462cb4..3fcfdf6dc 100644 --- a/campaign/event_20210916_cn/d1.py +++ b/campaign/event_20210916_cn/d1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'J8' diff --git a/campaign/event_20210916_cn/d2.py b/campaign/event_20210916_cn/d2.py index e370d18cb..e4f193547 100644 --- a/campaign/event_20210916_cn/d2.py +++ b/campaign/event_20210916_cn/d2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20210916_cn/d3.py b/campaign/event_20210916_cn/d3.py index 38e194bf3..4fe180849 100644 --- a/campaign/event_20210916_cn/d3.py +++ b/campaign/event_20210916_cn/d3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20210916_cn/sp.py b/campaign/event_20210916_cn/sp.py index cac1a96cc..653ae605f 100644 --- a/campaign/event_20210916_cn/sp.py +++ b/campaign/event_20210916_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'H8' diff --git a/campaign/event_20211028_cn/a1.py b/campaign/event_20211028_cn/a1.py index 8d02e4720..00186f7fa 100644 --- a/campaign/event_20211028_cn/a1.py +++ b/campaign/event_20211028_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/event_20211028_cn/a2.py b/campaign/event_20211028_cn/a2.py index 534c14749..9a0a6aed2 100644 --- a/campaign/event_20211028_cn/a2.py +++ b/campaign/event_20211028_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20211028_cn/a3.py b/campaign/event_20211028_cn/a3.py index cc087aeb3..95958dd1b 100644 --- a/campaign/event_20211028_cn/a3.py +++ b/campaign/event_20211028_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20211028_cn/b1.py b/campaign/event_20211028_cn/b1.py index 4900c9799..cc9ffe088 100644 --- a/campaign/event_20211028_cn/b1.py +++ b/campaign/event_20211028_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'F9' diff --git a/campaign/event_20211028_cn/b2.py b/campaign/event_20211028_cn/b2.py index 4e1133d0e..c2cef89c7 100644 --- a/campaign/event_20211028_cn/b2.py +++ b/campaign/event_20211028_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20211028_cn/b3.py b/campaign/event_20211028_cn/b3.py index b1cc08567..518fe85d3 100644 --- a/campaign/event_20211028_cn/b3.py +++ b/campaign/event_20211028_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20211028_cn/c1.py b/campaign/event_20211028_cn/c1.py index a7d5cda8e..84aa6fba8 100644 --- a/campaign/event_20211028_cn/c1.py +++ b/campaign/event_20211028_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/event_20211028_cn/c2.py b/campaign/event_20211028_cn/c2.py index 12b537b04..9a25da849 100644 --- a/campaign/event_20211028_cn/c2.py +++ b/campaign/event_20211028_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20211028_cn/c3.py b/campaign/event_20211028_cn/c3.py index ec967e719..79176489b 100644 --- a/campaign/event_20211028_cn/c3.py +++ b/campaign/event_20211028_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20211028_cn/d1.py b/campaign/event_20211028_cn/d1.py index f18064d6a..b04235eec 100644 --- a/campaign/event_20211028_cn/d1.py +++ b/campaign/event_20211028_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'F9' diff --git a/campaign/event_20211028_cn/d2.py b/campaign/event_20211028_cn/d2.py index f902f73ba..10bc89371 100644 --- a/campaign/event_20211028_cn/d2.py +++ b/campaign/event_20211028_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20211028_cn/d3.py b/campaign/event_20211028_cn/d3.py index feb33acc3..78a6ec400 100644 --- a/campaign/event_20211028_cn/d3.py +++ b/campaign/event_20211028_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20211028_cn/sp.py b/campaign/event_20211028_cn/sp.py index 9bfaa49bc..294ae8bd3 100644 --- a/campaign/event_20211028_cn/sp.py +++ b/campaign/event_20211028_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'K9' diff --git a/campaign/event_20211028_tw/a1.py b/campaign/event_20211028_tw/a1.py index 552714c21..2ba86efdd 100644 --- a/campaign/event_20211028_tw/a1.py +++ b/campaign/event_20211028_tw/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I5' diff --git a/campaign/event_20211028_tw/a2.py b/campaign/event_20211028_tw/a2.py index 6b80bee5a..4907b5454 100644 --- a/campaign/event_20211028_tw/a2.py +++ b/campaign/event_20211028_tw/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20211028_tw/a3.py b/campaign/event_20211028_tw/a3.py index 14d5b5a62..27afe467f 100644 --- a/campaign/event_20211028_tw/a3.py +++ b/campaign/event_20211028_tw/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20211028_tw/b1.py b/campaign/event_20211028_tw/b1.py index 0e63b6f89..474c63dda 100644 --- a/campaign/event_20211028_tw/b1.py +++ b/campaign/event_20211028_tw/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'H6' diff --git a/campaign/event_20211028_tw/b2.py b/campaign/event_20211028_tw/b2.py index 66f49267a..013fca776 100644 --- a/campaign/event_20211028_tw/b2.py +++ b/campaign/event_20211028_tw/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20211028_tw/b3.py b/campaign/event_20211028_tw/b3.py index f5f6b3e21..4eedd942a 100644 --- a/campaign/event_20211028_tw/b3.py +++ b/campaign/event_20211028_tw/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20211028_tw/c1.py b/campaign/event_20211028_tw/c1.py index c4e5e21f5..ef3c23a6c 100644 --- a/campaign/event_20211028_tw/c1.py +++ b/campaign/event_20211028_tw/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I5' diff --git a/campaign/event_20211028_tw/c2.py b/campaign/event_20211028_tw/c2.py index e2adaa683..4359e30d3 100644 --- a/campaign/event_20211028_tw/c2.py +++ b/campaign/event_20211028_tw/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20211028_tw/c3.py b/campaign/event_20211028_tw/c3.py index fee67d4c1..8ad60b3db 100644 --- a/campaign/event_20211028_tw/c3.py +++ b/campaign/event_20211028_tw/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20211028_tw/d1.py b/campaign/event_20211028_tw/d1.py index 82dc12313..489ce1336 100644 --- a/campaign/event_20211028_tw/d1.py +++ b/campaign/event_20211028_tw/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'H6' diff --git a/campaign/event_20211028_tw/d2.py b/campaign/event_20211028_tw/d2.py index 6d34a227d..96a3b6417 100644 --- a/campaign/event_20211028_tw/d2.py +++ b/campaign/event_20211028_tw/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20211028_tw/d3.py b/campaign/event_20211028_tw/d3.py index a0819a265..bcbc49194 100644 --- a/campaign/event_20211028_tw/d3.py +++ b/campaign/event_20211028_tw/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20211111_cn/campaign_base.py b/campaign/event_20211111_cn/campaign_base.py index 6253db8b4..0bd704eda 100644 --- a/campaign/event_20211111_cn/campaign_base.py +++ b/campaign/event_20211111_cn/campaign_base.py @@ -1,7 +1,7 @@ -from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.base.utils import color_similarity_2d -from module.template.assets import TEMPLATE_ENEMY_BOSS +from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.map_detection.grid import Grid +from module.template.assets import TEMPLATE_ENEMY_BOSS class EventGrid(Grid): diff --git a/campaign/event_20211111_cn/sp1.py b/campaign/event_20211111_cn/sp1.py index 208d9ee36..aa85d9378 100644 --- a/campaign/event_20211111_cn/sp1.py +++ b/campaign/event_20211111_cn/sp1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'H7' diff --git a/campaign/event_20211111_cn/sp2.py b/campaign/event_20211111_cn/sp2.py index 1e2ad9096..5e60fca92 100644 --- a/campaign/event_20211111_cn/sp2.py +++ b/campaign/event_20211111_cn/sp2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20211111_cn/sp3.py b/campaign/event_20211111_cn/sp3.py index ab53cfaaf..550b8c954 100644 --- a/campaign/event_20211111_cn/sp3.py +++ b/campaign/event_20211111_cn/sp3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20211125_cn/sp.py b/campaign/event_20211125_cn/sp.py index ee3e6975c..5b3dfc2f0 100644 --- a/campaign/event_20211125_cn/sp.py +++ b/campaign/event_20211125_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'H8' diff --git a/campaign/event_20211125_cn/t1.py b/campaign/event_20211125_cn/t1.py index d470800ff..91657f25e 100644 --- a/campaign/event_20211125_cn/t1.py +++ b/campaign/event_20211125_cn/t1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('T1') MAP.shape = 'H7' diff --git a/campaign/event_20211125_cn/t2.py b/campaign/event_20211125_cn/t2.py index 03437cb87..12dc75df6 100644 --- a/campaign/event_20211125_cn/t2.py +++ b/campaign/event_20211125_cn/t2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T2') diff --git a/campaign/event_20211125_cn/t3.py b/campaign/event_20211125_cn/t3.py index fd690feee..7e8d6bea6 100644 --- a/campaign/event_20211125_cn/t3.py +++ b/campaign/event_20211125_cn/t3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T3') diff --git a/campaign/event_20211125_cn/t4.py b/campaign/event_20211125_cn/t4.py index 48f65a203..5162eace0 100644 --- a/campaign/event_20211125_cn/t4.py +++ b/campaign/event_20211125_cn/t4.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .t1 import Config as ConfigBase MAP = CampaignMap('T4') diff --git a/campaign/event_20211229_cn/a1.py b/campaign/event_20211229_cn/a1.py index e77edb321..d94c53ef5 100644 --- a/campaign/event_20211229_cn/a1.py +++ b/campaign/event_20211229_cn/a1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'I6' diff --git a/campaign/event_20211229_cn/a2.py b/campaign/event_20211229_cn/a2.py index d11fa7049..0eb40d708 100644 --- a/campaign/event_20211229_cn/a2.py +++ b/campaign/event_20211229_cn/a2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A2') MAP.shape = 'I7' diff --git a/campaign/event_20211229_cn/a3.py b/campaign/event_20211229_cn/a3.py index a506e3833..0aaf159ed 100644 --- a/campaign/event_20211229_cn/a3.py +++ b/campaign/event_20211229_cn/a3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A3') MAP.shape = 'J8' diff --git a/campaign/event_20211229_cn/b1.py b/campaign/event_20211229_cn/b1.py index 5c95ba21f..115a95127 100644 --- a/campaign/event_20211229_cn/b1.py +++ b/campaign/event_20211229_cn/b1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'J8' diff --git a/campaign/event_20211229_cn/b2.py b/campaign/event_20211229_cn/b2.py index 90df9ca96..77a24b788 100644 --- a/campaign/event_20211229_cn/b2.py +++ b/campaign/event_20211229_cn/b2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B2') MAP.shape = 'I9' diff --git a/campaign/event_20211229_cn/b3.py b/campaign/event_20211229_cn/b3.py index 9577a778e..5fef0aaa9 100644 --- a/campaign/event_20211229_cn/b3.py +++ b/campaign/event_20211229_cn/b3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B3') MAP.shape = 'L6' diff --git a/campaign/event_20211229_cn/bs1.py b/campaign/event_20211229_cn/bs1.py index 834bcde8c..be4632caf 100644 --- a/campaign/event_20211229_cn/bs1.py +++ b/campaign/event_20211229_cn/bs1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('BS1') MAP.shape = 'L6' diff --git a/campaign/event_20211229_cn/c1.py b/campaign/event_20211229_cn/c1.py index 8efa457e9..a5ad60c3b 100644 --- a/campaign/event_20211229_cn/c1.py +++ b/campaign/event_20211229_cn/c1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'I6' diff --git a/campaign/event_20211229_cn/c2.py b/campaign/event_20211229_cn/c2.py index fd72f1657..29d5678eb 100644 --- a/campaign/event_20211229_cn/c2.py +++ b/campaign/event_20211229_cn/c2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C2') MAP.shape = 'I7' diff --git a/campaign/event_20211229_cn/c3.py b/campaign/event_20211229_cn/c3.py index a641409b9..20789bada 100644 --- a/campaign/event_20211229_cn/c3.py +++ b/campaign/event_20211229_cn/c3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C3') MAP.shape = 'J8' diff --git a/campaign/event_20211229_cn/d1.py b/campaign/event_20211229_cn/d1.py index 70866cae1..81fe0b3bb 100644 --- a/campaign/event_20211229_cn/d1.py +++ b/campaign/event_20211229_cn/d1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'J8' diff --git a/campaign/event_20211229_cn/d2.py b/campaign/event_20211229_cn/d2.py index b5317ed61..5b3980278 100644 --- a/campaign/event_20211229_cn/d2.py +++ b/campaign/event_20211229_cn/d2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20211229_cn/d3.py b/campaign/event_20211229_cn/d3.py index ad30302a9..42a256aa4 100644 --- a/campaign/event_20211229_cn/d3.py +++ b/campaign/event_20211229_cn/d3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20211229_cn/ds1.py b/campaign/event_20211229_cn/ds1.py index d7baca7b4..bb2815cf6 100644 --- a/campaign/event_20211229_cn/ds1.py +++ b/campaign/event_20211229_cn/ds1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('DS1') MAP.shape = 'L6' diff --git a/campaign/event_20211229_cn/sp.py b/campaign/event_20211229_cn/sp.py index 51aef5285..9aa0384d3 100644 --- a/campaign/event_20211229_cn/sp.py +++ b/campaign/event_20211229_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'I8' diff --git a/campaign/event_20220210_cn/a1.py b/campaign/event_20220210_cn/a1.py index 7dc309d18..10dc3541e 100644 --- a/campaign/event_20220210_cn/a1.py +++ b/campaign/event_20220210_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'J5' diff --git a/campaign/event_20220210_cn/a2.py b/campaign/event_20220210_cn/a2.py index 17a10b293..1851631c7 100644 --- a/campaign/event_20220210_cn/a2.py +++ b/campaign/event_20220210_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20220210_cn/a3.py b/campaign/event_20220210_cn/a3.py index 16671527a..6ab84e23b 100644 --- a/campaign/event_20220210_cn/a3.py +++ b/campaign/event_20220210_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20220210_cn/b1.py b/campaign/event_20220210_cn/b1.py index 33339874f..6e3391c09 100644 --- a/campaign/event_20220210_cn/b1.py +++ b/campaign/event_20220210_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20220210_cn/b2.py b/campaign/event_20220210_cn/b2.py index e088c6dd7..46bc13764 100644 --- a/campaign/event_20220210_cn/b2.py +++ b/campaign/event_20220210_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20220210_cn/b3.py b/campaign/event_20220210_cn/b3.py index 5da6340d8..0ee5c265a 100644 --- a/campaign/event_20220210_cn/b3.py +++ b/campaign/event_20220210_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20220210_cn/c1.py b/campaign/event_20220210_cn/c1.py index fca6dcac0..bdb94ae5d 100644 --- a/campaign/event_20220210_cn/c1.py +++ b/campaign/event_20220210_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'J5' diff --git a/campaign/event_20220210_cn/c2.py b/campaign/event_20220210_cn/c2.py index 0c1102f6c..99944588c 100644 --- a/campaign/event_20220210_cn/c2.py +++ b/campaign/event_20220210_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20220210_cn/c3.py b/campaign/event_20220210_cn/c3.py index e28391675..77b8860d0 100644 --- a/campaign/event_20220210_cn/c3.py +++ b/campaign/event_20220210_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20220210_cn/d1.py b/campaign/event_20220210_cn/d1.py index fe6724310..68c24b06b 100644 --- a/campaign/event_20220210_cn/d1.py +++ b/campaign/event_20220210_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20220210_cn/d2.py b/campaign/event_20220210_cn/d2.py index 3fff5c825..fe22c953b 100644 --- a/campaign/event_20220210_cn/d2.py +++ b/campaign/event_20220210_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20220210_cn/d3.py b/campaign/event_20220210_cn/d3.py index 4f9e773da..de24c2665 100644 --- a/campaign/event_20220210_cn/d3.py +++ b/campaign/event_20220210_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20220210_cn/sp.py b/campaign/event_20220210_cn/sp.py index 3577395c2..344e8c485 100644 --- a/campaign/event_20220210_cn/sp.py +++ b/campaign/event_20220210_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'I7' diff --git a/campaign/event_20220224_cn/a1.py b/campaign/event_20220224_cn/a1.py index 61174b3ca..0af1c0822 100644 --- a/campaign/event_20220224_cn/a1.py +++ b/campaign/event_20220224_cn/a1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'J6' diff --git a/campaign/event_20220224_cn/a2.py b/campaign/event_20220224_cn/a2.py index be9837c03..91c9984ea 100644 --- a/campaign/event_20220224_cn/a2.py +++ b/campaign/event_20220224_cn/a2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A2') MAP.shape = 'H10' diff --git a/campaign/event_20220224_cn/a3.py b/campaign/event_20220224_cn/a3.py index 371486575..f12320280 100644 --- a/campaign/event_20220224_cn/a3.py +++ b/campaign/event_20220224_cn/a3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A3') MAP.shape = 'I9' diff --git a/campaign/event_20220224_cn/b1.py b/campaign/event_20220224_cn/b1.py index 3a8d3cf8a..f20da36a7 100644 --- a/campaign/event_20220224_cn/b1.py +++ b/campaign/event_20220224_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/event_20220224_cn/b2.py b/campaign/event_20220224_cn/b2.py index 1f37d158d..553659f7c 100644 --- a/campaign/event_20220224_cn/b2.py +++ b/campaign/event_20220224_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20220224_cn/b3.py b/campaign/event_20220224_cn/b3.py index 48f8ddcd6..cedcabbf5 100644 --- a/campaign/event_20220224_cn/b3.py +++ b/campaign/event_20220224_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20220224_cn/c1.py b/campaign/event_20220224_cn/c1.py index b06cbccbe..e4141094d 100644 --- a/campaign/event_20220224_cn/c1.py +++ b/campaign/event_20220224_cn/c1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'J6' diff --git a/campaign/event_20220224_cn/c2.py b/campaign/event_20220224_cn/c2.py index e89cb9234..d08e5f6dd 100644 --- a/campaign/event_20220224_cn/c2.py +++ b/campaign/event_20220224_cn/c2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C2') MAP.shape = 'H10' diff --git a/campaign/event_20220224_cn/c3.py b/campaign/event_20220224_cn/c3.py index d6e34cf55..9eebea1e4 100644 --- a/campaign/event_20220224_cn/c3.py +++ b/campaign/event_20220224_cn/c3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C3') MAP.shape = 'I9' diff --git a/campaign/event_20220224_cn/d1.py b/campaign/event_20220224_cn/d1.py index b6b6e6081..b15a34c7b 100644 --- a/campaign/event_20220224_cn/d1.py +++ b/campaign/event_20220224_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/event_20220224_cn/d2.py b/campaign/event_20220224_cn/d2.py index 07befb51d..d1a54ca3f 100644 --- a/campaign/event_20220224_cn/d2.py +++ b/campaign/event_20220224_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20220224_cn/d3.py b/campaign/event_20220224_cn/d3.py index 467846e33..64ffecb55 100644 --- a/campaign/event_20220224_cn/d3.py +++ b/campaign/event_20220224_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20220224_cn/sp.py b/campaign/event_20220224_cn/sp.py index aaebfedbf..fe52f34aa 100644 --- a/campaign/event_20220224_cn/sp.py +++ b/campaign/event_20220224_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'J9' diff --git a/campaign/event_20220310_tw/sp1.py b/campaign/event_20220310_tw/sp1.py index d868a1041..18348c86f 100644 --- a/campaign/event_20220310_tw/sp1.py +++ b/campaign/event_20220310_tw/sp1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP1') MAP.shape = 'H5' diff --git a/campaign/event_20220310_tw/sp2.py b/campaign/event_20220310_tw/sp2.py index 0e4f85d68..1edd738b3 100644 --- a/campaign/event_20220310_tw/sp2.py +++ b/campaign/event_20220310_tw/sp2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20220310_tw/sp3.py b/campaign/event_20220310_tw/sp3.py index 59c55e86f..440a7cab4 100644 --- a/campaign/event_20220310_tw/sp3.py +++ b/campaign/event_20220310_tw/sp3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20220324_cn/sp.py b/campaign/event_20220324_cn/sp.py index 4cd52411a..58e318bf4 100644 --- a/campaign/event_20220324_cn/sp.py +++ b/campaign/event_20220324_cn/sp.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'K8' diff --git a/campaign/event_20220324_cn/sp1.py b/campaign/event_20220324_cn/sp1.py index fdd65f7e6..c6a577277 100644 --- a/campaign/event_20220324_cn/sp1.py +++ b/campaign/event_20220324_cn/sp1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'H7' diff --git a/campaign/event_20220324_cn/sp2.py b/campaign/event_20220324_cn/sp2.py index 783f18b69..a261160c6 100644 --- a/campaign/event_20220324_cn/sp2.py +++ b/campaign/event_20220324_cn/sp2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20220324_cn/sp3.py b/campaign/event_20220324_cn/sp3.py index 3859688b3..b56d425c5 100644 --- a/campaign/event_20220324_cn/sp3.py +++ b/campaign/event_20220324_cn/sp3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20220324_cn/sp4.py b/campaign/event_20220324_cn/sp4.py index 4c1ac5a2c..1bc85a5d3 100644 --- a/campaign/event_20220324_cn/sp4.py +++ b/campaign/event_20220324_cn/sp4.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP4') diff --git a/campaign/event_20220407_tw/a1.py b/campaign/event_20220407_tw/a1.py index 5fcc4da2c..8025a9c08 100644 --- a/campaign/event_20220407_tw/a1.py +++ b/campaign/event_20220407_tw/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I6' diff --git a/campaign/event_20220407_tw/a2.py b/campaign/event_20220407_tw/a2.py index dc089ddbf..d3487ce37 100644 --- a/campaign/event_20220407_tw/a2.py +++ b/campaign/event_20220407_tw/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20220407_tw/a3.py b/campaign/event_20220407_tw/a3.py index 820d19f2a..51277a6cf 100644 --- a/campaign/event_20220407_tw/a3.py +++ b/campaign/event_20220407_tw/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20220407_tw/b1.py b/campaign/event_20220407_tw/b1.py index 013adf5a7..09dbe640b 100644 --- a/campaign/event_20220407_tw/b1.py +++ b/campaign/event_20220407_tw/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'I7' diff --git a/campaign/event_20220407_tw/b2.py b/campaign/event_20220407_tw/b2.py index ee30ebd5e..020ea8e9e 100644 --- a/campaign/event_20220407_tw/b2.py +++ b/campaign/event_20220407_tw/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20220407_tw/b3.py b/campaign/event_20220407_tw/b3.py index 02335cceb..5f99fafa7 100644 --- a/campaign/event_20220407_tw/b3.py +++ b/campaign/event_20220407_tw/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20220407_tw/c1.py b/campaign/event_20220407_tw/c1.py index d54d5de1f..dda2e6bb0 100644 --- a/campaign/event_20220407_tw/c1.py +++ b/campaign/event_20220407_tw/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I6' diff --git a/campaign/event_20220407_tw/c2.py b/campaign/event_20220407_tw/c2.py index 031992900..fe7b78b7d 100644 --- a/campaign/event_20220407_tw/c2.py +++ b/campaign/event_20220407_tw/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20220407_tw/c3.py b/campaign/event_20220407_tw/c3.py index d9386c97a..60357227b 100644 --- a/campaign/event_20220407_tw/c3.py +++ b/campaign/event_20220407_tw/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20220407_tw/d1.py b/campaign/event_20220407_tw/d1.py index a285e08c3..ec6146911 100644 --- a/campaign/event_20220407_tw/d1.py +++ b/campaign/event_20220407_tw/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'I7' diff --git a/campaign/event_20220407_tw/d2.py b/campaign/event_20220407_tw/d2.py index 444cf781c..f8d728197 100644 --- a/campaign/event_20220407_tw/d2.py +++ b/campaign/event_20220407_tw/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20220407_tw/d3.py b/campaign/event_20220407_tw/d3.py index 2e42abdea..ce0f01c4f 100644 --- a/campaign/event_20220407_tw/d3.py +++ b/campaign/event_20220407_tw/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20220414_cn/a1.py b/campaign/event_20220414_cn/a1.py index 5f614a65b..f37ab4b17 100644 --- a/campaign/event_20220414_cn/a1.py +++ b/campaign/event_20220414_cn/a1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('A1') MAP.shape = 'I7' diff --git a/campaign/event_20220414_cn/a2.py b/campaign/event_20220414_cn/a2.py index f4aede1d0..1bdb4cae2 100644 --- a/campaign/event_20220414_cn/a2.py +++ b/campaign/event_20220414_cn/a2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/event_20220414_cn/a3.py b/campaign/event_20220414_cn/a3.py index 70ba85ad1..edf537987 100644 --- a/campaign/event_20220414_cn/a3.py +++ b/campaign/event_20220414_cn/a3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/event_20220414_cn/b1.py b/campaign/event_20220414_cn/b1.py index fe46abf01..70ba80d2a 100644 --- a/campaign/event_20220414_cn/b1.py +++ b/campaign/event_20220414_cn/b1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('B1') MAP.shape = 'I8' diff --git a/campaign/event_20220414_cn/b2.py b/campaign/event_20220414_cn/b2.py index 493fa024a..befe3813c 100644 --- a/campaign/event_20220414_cn/b2.py +++ b/campaign/event_20220414_cn/b2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/event_20220414_cn/b3.py b/campaign/event_20220414_cn/b3.py index a9c04e08e..aa50cd07d 100644 --- a/campaign/event_20220414_cn/b3.py +++ b/campaign/event_20220414_cn/b3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/event_20220414_cn/c1.py b/campaign/event_20220414_cn/c1.py index 5960eeeba..701e45d2e 100644 --- a/campaign/event_20220414_cn/c1.py +++ b/campaign/event_20220414_cn/c1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('C1') MAP.shape = 'I7' diff --git a/campaign/event_20220414_cn/c2.py b/campaign/event_20220414_cn/c2.py index eed1bb670..5b11504f7 100644 --- a/campaign/event_20220414_cn/c2.py +++ b/campaign/event_20220414_cn/c2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/event_20220414_cn/c3.py b/campaign/event_20220414_cn/c3.py index 8a4710f5a..c488dda3a 100644 --- a/campaign/event_20220414_cn/c3.py +++ b/campaign/event_20220414_cn/c3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/event_20220414_cn/d1.py b/campaign/event_20220414_cn/d1.py index 3ef664cb5..f97094d0b 100644 --- a/campaign/event_20220414_cn/d1.py +++ b/campaign/event_20220414_cn/d1.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('D1') MAP.shape = 'I8' diff --git a/campaign/event_20220414_cn/d2.py b/campaign/event_20220414_cn/d2.py index 6e3348395..3b225bf38 100644 --- a/campaign/event_20220414_cn/d2.py +++ b/campaign/event_20220414_cn/d2.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/event_20220414_cn/d3.py b/campaign/event_20220414_cn/d3.py index 1e5992135..9c3543a64 100644 --- a/campaign/event_20220414_cn/d3.py +++ b/campaign/event_20220414_cn/d3.py @@ -1,7 +1,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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/event_20220414_cn/sp.py b/campaign/event_20220414_cn/sp.py index 546a559c2..1ba1c4276 100644 --- a/campaign/event_20220414_cn/sp.py +++ b/campaign/event_20220414_cn/sp.py @@ -1,7 +1,7 @@ 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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids MAP = CampaignMap('SP') MAP.shape = 'M10' diff --git a/campaign/war_archives_20180607_cn/a1.py b/campaign/war_archives_20180607_cn/a1.py index 29cb5e380..3547db974 100644 --- a/campaign/war_archives_20180607_cn/a1.py +++ b/campaign/war_archives_20180607_cn/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/war_archives_20180607_cn/a2.py b/campaign/war_archives_20180607_cn/a2.py index 86dfe4545..ed56dbc36 100644 --- a/campaign/war_archives_20180607_cn/a2.py +++ b/campaign/war_archives_20180607_cn/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20180607_cn/a3.py b/campaign/war_archives_20180607_cn/a3.py index 638bb7764..ca56b6055 100644 --- a/campaign/war_archives_20180607_cn/a3.py +++ b/campaign/war_archives_20180607_cn/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20180607_cn/a4.py b/campaign/war_archives_20180607_cn/a4.py index bb4739c4a..5c50358b8 100644 --- a/campaign/war_archives_20180607_cn/a4.py +++ b/campaign/war_archives_20180607_cn/a4.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A4') diff --git a/campaign/war_archives_20180607_cn/b1.py b/campaign/war_archives_20180607_cn/b1.py index f40f2df02..3eca5c000 100644 --- a/campaign/war_archives_20180607_cn/b1.py +++ b/campaign/war_archives_20180607_cn/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/war_archives_20180607_cn/b2.py b/campaign/war_archives_20180607_cn/b2.py index 7bab105ce..0b2be36b2 100644 --- a/campaign/war_archives_20180607_cn/b2.py +++ b/campaign/war_archives_20180607_cn/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20180607_cn/c1.py b/campaign/war_archives_20180607_cn/c1.py index 641586bb3..efb62f6b9 100644 --- a/campaign/war_archives_20180607_cn/c1.py +++ b/campaign/war_archives_20180607_cn/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/war_archives_20180607_cn/c2.py b/campaign/war_archives_20180607_cn/c2.py index be39613ff..ad599ac80 100644 --- a/campaign/war_archives_20180607_cn/c2.py +++ b/campaign/war_archives_20180607_cn/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20180607_cn/c3.py b/campaign/war_archives_20180607_cn/c3.py index 8c417470d..82553803f 100644 --- a/campaign/war_archives_20180607_cn/c3.py +++ b/campaign/war_archives_20180607_cn/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20180607_cn/c4.py b/campaign/war_archives_20180607_cn/c4.py index 58737f83f..e6a14a77b 100644 --- a/campaign/war_archives_20180607_cn/c4.py +++ b/campaign/war_archives_20180607_cn/c4.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C4') diff --git a/campaign/war_archives_20180607_cn/d1.py b/campaign/war_archives_20180607_cn/d1.py index bc4ef1bfe..8933abcd0 100644 --- a/campaign/war_archives_20180607_cn/d1.py +++ b/campaign/war_archives_20180607_cn/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.camera_sight = (-4, -2, 4, 2) diff --git a/campaign/war_archives_20180607_cn/d2.py b/campaign/war_archives_20180607_cn/d2.py index 1b5386836..2476cd548 100644 --- a/campaign/war_archives_20180607_cn/d2.py +++ b/campaign/war_archives_20180607_cn/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20180726_cn/a1.py b/campaign/war_archives_20180726_cn/a1.py index 45e8db924..632ff2e41 100644 --- a/campaign/war_archives_20180726_cn/a1.py +++ b/campaign/war_archives_20180726_cn/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'I5' diff --git a/campaign/war_archives_20180726_cn/a2.py b/campaign/war_archives_20180726_cn/a2.py index ff3a0b430..76c622d96 100644 --- a/campaign/war_archives_20180726_cn/a2.py +++ b/campaign/war_archives_20180726_cn/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20180726_cn/a3.py b/campaign/war_archives_20180726_cn/a3.py index 4494e6da7..817909ecf 100644 --- a/campaign/war_archives_20180726_cn/a3.py +++ b/campaign/war_archives_20180726_cn/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20180726_cn/b1.py b/campaign/war_archives_20180726_cn/b1.py index ce2757a17..fdcdccb54 100644 --- a/campaign/war_archives_20180726_cn/b1.py +++ b/campaign/war_archives_20180726_cn/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20180726_cn/b2.py b/campaign/war_archives_20180726_cn/b2.py index 398c53dbe..8e273674c 100644 --- a/campaign/war_archives_20180726_cn/b2.py +++ b/campaign/war_archives_20180726_cn/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20180726_cn/b3.py b/campaign/war_archives_20180726_cn/b3.py index 03bb4d472..9695851e6 100644 --- a/campaign/war_archives_20180726_cn/b3.py +++ b/campaign/war_archives_20180726_cn/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20180726_cn/c1.py b/campaign/war_archives_20180726_cn/c1.py index f8eeaa6fd..006cbbee0 100644 --- a/campaign/war_archives_20180726_cn/c1.py +++ b/campaign/war_archives_20180726_cn/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'I5' diff --git a/campaign/war_archives_20180726_cn/c2.py b/campaign/war_archives_20180726_cn/c2.py index d93cf903b..0d2b976bc 100644 --- a/campaign/war_archives_20180726_cn/c2.py +++ b/campaign/war_archives_20180726_cn/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20180726_cn/c3.py b/campaign/war_archives_20180726_cn/c3.py index a0d13c1c5..d991ddd2b 100644 --- a/campaign/war_archives_20180726_cn/c3.py +++ b/campaign/war_archives_20180726_cn/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20180726_cn/d1.py b/campaign/war_archives_20180726_cn/d1.py index 85b815055..56c41071d 100644 --- a/campaign/war_archives_20180726_cn/d1.py +++ b/campaign/war_archives_20180726_cn/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20180726_cn/d2.py b/campaign/war_archives_20180726_cn/d2.py index f5f63c48d..2cd98e278 100644 --- a/campaign/war_archives_20180726_cn/d2.py +++ b/campaign/war_archives_20180726_cn/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20180726_cn/d3.py b/campaign/war_archives_20180726_cn/d3.py index 6ea792c55..dcc403c0b 100644 --- a/campaign/war_archives_20180726_cn/d3.py +++ b/campaign/war_archives_20180726_cn/d3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20181020_en/sp1.py b/campaign/war_archives_20181020_en/sp1.py index b062e7374..024d66b20 100644 --- a/campaign/war_archives_20181020_en/sp1.py +++ b/campaign/war_archives_20181020_en/sp1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('SP.1') MAP.shape = 'G3' diff --git a/campaign/war_archives_20181020_en/sp2.py b/campaign/war_archives_20181020_en/sp2.py index a53cf1fcf..6d747a080 100644 --- a/campaign/war_archives_20181020_en/sp2.py +++ b/campaign/war_archives_20181020_en/sp2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP.2') diff --git a/campaign/war_archives_20181020_en/sp3.py b/campaign/war_archives_20181020_en/sp3.py index 2e639fb66..e11b3f906 100644 --- a/campaign/war_archives_20181020_en/sp3.py +++ b/campaign/war_archives_20181020_en/sp3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP.3') diff --git a/campaign/war_archives_20181026_en/a1.py b/campaign/war_archives_20181026_en/a1.py index 56c4b8070..e8c254e8c 100644 --- a/campaign/war_archives_20181026_en/a1.py +++ b/campaign/war_archives_20181026_en/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20181026_en/a2.py b/campaign/war_archives_20181026_en/a2.py index 99db90eb6..887e33722 100644 --- a/campaign/war_archives_20181026_en/a2.py +++ b/campaign/war_archives_20181026_en/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20181026_en/a3.py b/campaign/war_archives_20181026_en/a3.py index 3c022278b..2c11c2dc6 100644 --- a/campaign/war_archives_20181026_en/a3.py +++ b/campaign/war_archives_20181026_en/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20181026_en/b1.py b/campaign/war_archives_20181026_en/b1.py index e3e0061ec..a6204f2b5 100644 --- a/campaign/war_archives_20181026_en/b1.py +++ b/campaign/war_archives_20181026_en/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'J6' diff --git a/campaign/war_archives_20181026_en/b2.py b/campaign/war_archives_20181026_en/b2.py index ee5516a4b..0fa3bbbbd 100644 --- a/campaign/war_archives_20181026_en/b2.py +++ b/campaign/war_archives_20181026_en/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20181026_en/b3.py b/campaign/war_archives_20181026_en/b3.py index 4b97ed103..a7bef12c2 100644 --- a/campaign/war_archives_20181026_en/b3.py +++ b/campaign/war_archives_20181026_en/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20181026_en/c1.py b/campaign/war_archives_20181026_en/c1.py index e5c859474..7e6524203 100644 --- a/campaign/war_archives_20181026_en/c1.py +++ b/campaign/war_archives_20181026_en/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20181026_en/c2.py b/campaign/war_archives_20181026_en/c2.py index 3561da1f3..0ef49b950 100644 --- a/campaign/war_archives_20181026_en/c2.py +++ b/campaign/war_archives_20181026_en/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20181026_en/c3.py b/campaign/war_archives_20181026_en/c3.py index 4ef783847..4d6bf023f 100644 --- a/campaign/war_archives_20181026_en/c3.py +++ b/campaign/war_archives_20181026_en/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20181026_en/d1.py b/campaign/war_archives_20181026_en/d1.py index aee0bc77c..bb4a28837 100644 --- a/campaign/war_archives_20181026_en/d1.py +++ b/campaign/war_archives_20181026_en/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'J6' diff --git a/campaign/war_archives_20181026_en/d2.py b/campaign/war_archives_20181026_en/d2.py index 0bab201f8..68ce0a1dc 100644 --- a/campaign/war_archives_20181026_en/d2.py +++ b/campaign/war_archives_20181026_en/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20181026_en/d3.py b/campaign/war_archives_20181026_en/d3.py index ba9759bb9..104ed1987 100644 --- a/campaign/war_archives_20181026_en/d3.py +++ b/campaign/war_archives_20181026_en/d3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20181227_cn/a1.py b/campaign/war_archives_20181227_cn/a1.py index f4f4daac0..4ec5bb3d1 100644 --- a/campaign/war_archives_20181227_cn/a1.py +++ b/campaign/war_archives_20181227_cn/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'I6' diff --git a/campaign/war_archives_20181227_cn/a2.py b/campaign/war_archives_20181227_cn/a2.py index 2073329c2..888a1fe03 100644 --- a/campaign/war_archives_20181227_cn/a2.py +++ b/campaign/war_archives_20181227_cn/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20181227_cn/a3.py b/campaign/war_archives_20181227_cn/a3.py index f787a7a8a..1b1bdd2a8 100644 --- a/campaign/war_archives_20181227_cn/a3.py +++ b/campaign/war_archives_20181227_cn/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20181227_cn/b1.py b/campaign/war_archives_20181227_cn/b1.py index 0fc01fd33..d9faf5a48 100644 --- a/campaign/war_archives_20181227_cn/b1.py +++ b/campaign/war_archives_20181227_cn/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'I7' diff --git a/campaign/war_archives_20181227_cn/b2.py b/campaign/war_archives_20181227_cn/b2.py index 2e82c6dab..76cee81c3 100644 --- a/campaign/war_archives_20181227_cn/b2.py +++ b/campaign/war_archives_20181227_cn/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20181227_cn/b3.py b/campaign/war_archives_20181227_cn/b3.py index a6305bff4..712010d49 100644 --- a/campaign/war_archives_20181227_cn/b3.py +++ b/campaign/war_archives_20181227_cn/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20181227_cn/c1.py b/campaign/war_archives_20181227_cn/c1.py index 57e8e3e2a..814c79eac 100644 --- a/campaign/war_archives_20181227_cn/c1.py +++ b/campaign/war_archives_20181227_cn/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'I6' diff --git a/campaign/war_archives_20181227_cn/c2.py b/campaign/war_archives_20181227_cn/c2.py index cedac487d..f1baa9beb 100644 --- a/campaign/war_archives_20181227_cn/c2.py +++ b/campaign/war_archives_20181227_cn/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20181227_cn/c3.py b/campaign/war_archives_20181227_cn/c3.py index 38af3f957..a05a812fe 100644 --- a/campaign/war_archives_20181227_cn/c3.py +++ b/campaign/war_archives_20181227_cn/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20181227_cn/d1.py b/campaign/war_archives_20181227_cn/d1.py index 321baf2f8..258ad558e 100644 --- a/campaign/war_archives_20181227_cn/d1.py +++ b/campaign/war_archives_20181227_cn/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'I7' diff --git a/campaign/war_archives_20181227_cn/d2.py b/campaign/war_archives_20181227_cn/d2.py index 1145f09e0..cd8cbf925 100644 --- a/campaign/war_archives_20181227_cn/d2.py +++ b/campaign/war_archives_20181227_cn/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20181227_cn/d3.py b/campaign/war_archives_20181227_cn/d3.py index ac0b2b83c..36ef1ef72 100644 --- a/campaign/war_archives_20181227_cn/d3.py +++ b/campaign/war_archives_20181227_cn/d3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20190221_en/a1.py b/campaign/war_archives_20190221_en/a1.py index 9665584e4..edb5ebfb7 100644 --- a/campaign/war_archives_20190221_en/a1.py +++ b/campaign/war_archives_20190221_en/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'G5' diff --git a/campaign/war_archives_20190221_en/a2.py b/campaign/war_archives_20190221_en/a2.py index 18115b132..27702e269 100644 --- a/campaign/war_archives_20190221_en/a2.py +++ b/campaign/war_archives_20190221_en/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20190221_en/a3.py b/campaign/war_archives_20190221_en/a3.py index 87fa0a45f..b587e008b 100644 --- a/campaign/war_archives_20190221_en/a3.py +++ b/campaign/war_archives_20190221_en/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20190221_en/b1.py b/campaign/war_archives_20190221_en/b1.py index 5f4f004df..b08e8c28a 100644 --- a/campaign/war_archives_20190221_en/b1.py +++ b/campaign/war_archives_20190221_en/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'J6' diff --git a/campaign/war_archives_20190221_en/b2.py b/campaign/war_archives_20190221_en/b2.py index b12d5c57b..28a5714c2 100644 --- a/campaign/war_archives_20190221_en/b2.py +++ b/campaign/war_archives_20190221_en/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20190221_en/b3.py b/campaign/war_archives_20190221_en/b3.py index 0b08ab6c6..cd52ea4e1 100644 --- a/campaign/war_archives_20190221_en/b3.py +++ b/campaign/war_archives_20190221_en/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20190221_en/c1.py b/campaign/war_archives_20190221_en/c1.py index 93525b3ae..9d86ec079 100644 --- a/campaign/war_archives_20190221_en/c1.py +++ b/campaign/war_archives_20190221_en/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'G5' diff --git a/campaign/war_archives_20190221_en/c2.py b/campaign/war_archives_20190221_en/c2.py index ea2884dfc..28a71ae3a 100644 --- a/campaign/war_archives_20190221_en/c2.py +++ b/campaign/war_archives_20190221_en/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20190221_en/c3.py b/campaign/war_archives_20190221_en/c3.py index 93c4ae231..c2e3d9967 100644 --- a/campaign/war_archives_20190221_en/c3.py +++ b/campaign/war_archives_20190221_en/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20190221_en/d1.py b/campaign/war_archives_20190221_en/d1.py index ca4131521..230d0e123 100644 --- a/campaign/war_archives_20190221_en/d1.py +++ b/campaign/war_archives_20190221_en/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'J6' diff --git a/campaign/war_archives_20190221_en/d2.py b/campaign/war_archives_20190221_en/d2.py index 3add8232c..3e7e40323 100644 --- a/campaign/war_archives_20190221_en/d2.py +++ b/campaign/war_archives_20190221_en/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20190221_en/d3.py b/campaign/war_archives_20190221_en/d3.py index 99e88f00b..926487c8e 100644 --- a/campaign/war_archives_20190221_en/d3.py +++ b/campaign/war_archives_20190221_en/d3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20190321_en/a1.py b/campaign/war_archives_20190321_en/a1.py index 30d0f94f1..0f550405c 100644 --- a/campaign/war_archives_20190321_en/a1.py +++ b/campaign/war_archives_20190321_en/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H5' diff --git a/campaign/war_archives_20190321_en/a2.py b/campaign/war_archives_20190321_en/a2.py index 26eac7e04..461dbcb63 100644 --- a/campaign/war_archives_20190321_en/a2.py +++ b/campaign/war_archives_20190321_en/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20190321_en/a3.py b/campaign/war_archives_20190321_en/a3.py index ae16860a1..5a355204e 100644 --- a/campaign/war_archives_20190321_en/a3.py +++ b/campaign/war_archives_20190321_en/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20190321_en/b1.py b/campaign/war_archives_20190321_en/b1.py index d97314b42..332ccc017 100644 --- a/campaign/war_archives_20190321_en/b1.py +++ b/campaign/war_archives_20190321_en/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'J5' diff --git a/campaign/war_archives_20190321_en/b2.py b/campaign/war_archives_20190321_en/b2.py index c11a48b57..7b5597086 100644 --- a/campaign/war_archives_20190321_en/b2.py +++ b/campaign/war_archives_20190321_en/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20190321_en/b3.py b/campaign/war_archives_20190321_en/b3.py index e94625752..53ac0f6c7 100644 --- a/campaign/war_archives_20190321_en/b3.py +++ b/campaign/war_archives_20190321_en/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20190321_en/c1.py b/campaign/war_archives_20190321_en/c1.py index ab1366b91..b456537b1 100644 --- a/campaign/war_archives_20190321_en/c1.py +++ b/campaign/war_archives_20190321_en/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H5' diff --git a/campaign/war_archives_20190321_en/c2.py b/campaign/war_archives_20190321_en/c2.py index de9a16785..be4b1b2ec 100644 --- a/campaign/war_archives_20190321_en/c2.py +++ b/campaign/war_archives_20190321_en/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20190321_en/c3.py b/campaign/war_archives_20190321_en/c3.py index 28bcc5586..3acca8c2f 100644 --- a/campaign/war_archives_20190321_en/c3.py +++ b/campaign/war_archives_20190321_en/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20190321_en/d1.py b/campaign/war_archives_20190321_en/d1.py index ae2c6e4a9..b07c1e10b 100644 --- a/campaign/war_archives_20190321_en/d1.py +++ b/campaign/war_archives_20190321_en/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'J5' diff --git a/campaign/war_archives_20190321_en/d2.py b/campaign/war_archives_20190321_en/d2.py index 2a8f5dc31..b11b4e4d1 100644 --- a/campaign/war_archives_20190321_en/d2.py +++ b/campaign/war_archives_20190321_en/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20190321_en/d3.py b/campaign/war_archives_20190321_en/d3.py index 1f9137c7f..76ba079a5 100644 --- a/campaign/war_archives_20190321_en/d3.py +++ b/campaign/war_archives_20190321_en/d3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20190620_en/sp1.py b/campaign/war_archives_20190620_en/sp1.py index fcee62aa5..2885839c2 100644 --- a/campaign/war_archives_20190620_en/sp1.py +++ b/campaign/war_archives_20190620_en/sp1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'I7' diff --git a/campaign/war_archives_20190620_en/sp2.py b/campaign/war_archives_20190620_en/sp2.py index ac7fb0db0..28475945a 100644 --- a/campaign/war_archives_20190620_en/sp2.py +++ b/campaign/war_archives_20190620_en/sp2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/war_archives_20190620_en/sp3.py b/campaign/war_archives_20190620_en/sp3.py index 9744d5175..c8b7987bd 100644 --- a/campaign/war_archives_20190620_en/sp3.py +++ b/campaign/war_archives_20190620_en/sp3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/war_archives_20190911_cn/a1.py b/campaign/war_archives_20190911_cn/a1.py index c9d764972..6fa997eb3 100644 --- a/campaign/war_archives_20190911_cn/a1.py +++ b/campaign/war_archives_20190911_cn/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20190911_cn/a2.py b/campaign/war_archives_20190911_cn/a2.py index de59da863..5864e0a9e 100644 --- a/campaign/war_archives_20190911_cn/a2.py +++ b/campaign/war_archives_20190911_cn/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20190911_cn/a3.py b/campaign/war_archives_20190911_cn/a3.py index 25e9b2e4b..8622e7ac1 100644 --- a/campaign/war_archives_20190911_cn/a3.py +++ b/campaign/war_archives_20190911_cn/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20190911_cn/as1.py b/campaign/war_archives_20190911_cn/as1.py index f97e15977..e2fd0923a 100644 --- a/campaign/war_archives_20190911_cn/as1.py +++ b/campaign/war_archives_20190911_cn/as1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('AS1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20190911_cn/as2.py b/campaign/war_archives_20190911_cn/as2.py index e198d8bd2..bb123346c 100644 --- a/campaign/war_archives_20190911_cn/as2.py +++ b/campaign/war_archives_20190911_cn/as2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .as1 import Config as ConfigBase MAP = CampaignMap('AS2') diff --git a/campaign/war_archives_20190911_cn/b1.py b/campaign/war_archives_20190911_cn/b1.py index fbc47123a..c5a374eb0 100644 --- a/campaign/war_archives_20190911_cn/b1.py +++ b/campaign/war_archives_20190911_cn/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/war_archives_20190911_cn/b2.py b/campaign/war_archives_20190911_cn/b2.py index 93949e6f7..b0efd569c 100644 --- a/campaign/war_archives_20190911_cn/b2.py +++ b/campaign/war_archives_20190911_cn/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20190911_cn/b3.py b/campaign/war_archives_20190911_cn/b3.py index 6277a1bd1..75a802aad 100644 --- a/campaign/war_archives_20190911_cn/b3.py +++ b/campaign/war_archives_20190911_cn/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20190911_cn/c1.py b/campaign/war_archives_20190911_cn/c1.py index f77d2fae2..f9cfd9aa5 100644 --- a/campaign/war_archives_20190911_cn/c1.py +++ b/campaign/war_archives_20190911_cn/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20190911_cn/c2.py b/campaign/war_archives_20190911_cn/c2.py index 5eb026da6..ccdfd4f7d 100644 --- a/campaign/war_archives_20190911_cn/c2.py +++ b/campaign/war_archives_20190911_cn/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20190911_cn/c3.py b/campaign/war_archives_20190911_cn/c3.py index e731fb79c..c7364bf3c 100644 --- a/campaign/war_archives_20190911_cn/c3.py +++ b/campaign/war_archives_20190911_cn/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20190911_cn/campaign_base.py b/campaign/war_archives_20190911_cn/campaign_base.py index 4ac14b429..0007c5839 100644 --- a/campaign/war_archives_20190911_cn/campaign_base.py +++ b/campaign/war_archives_20190911_cn/campaign_base.py @@ -1,6 +1,8 @@ -from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ -from module.logger import logger from module.exception import CampaignNameError +from module.logger import logger + +from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ + class CampaignBase(CampaignBase_): STAGE_INCREASE = [ diff --git a/campaign/war_archives_20190911_cn/cs1.py b/campaign/war_archives_20190911_cn/cs1.py index 5a9a9de41..e7ce6a68d 100644 --- a/campaign/war_archives_20190911_cn/cs1.py +++ b/campaign/war_archives_20190911_cn/cs1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('CS1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20190911_cn/cs2.py b/campaign/war_archives_20190911_cn/cs2.py index f6101c184..0ecd70697 100644 --- a/campaign/war_archives_20190911_cn/cs2.py +++ b/campaign/war_archives_20190911_cn/cs2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .cs1 import Config as ConfigBase MAP = CampaignMap('CS2') diff --git a/campaign/war_archives_20190911_cn/d1.py b/campaign/war_archives_20190911_cn/d1.py index d1c939e6e..e062f1022 100644 --- a/campaign/war_archives_20190911_cn/d1.py +++ b/campaign/war_archives_20190911_cn/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/war_archives_20190911_cn/d2.py b/campaign/war_archives_20190911_cn/d2.py index 9f4678831..02729a419 100644 --- a/campaign/war_archives_20190911_cn/d2.py +++ b/campaign/war_archives_20190911_cn/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20190911_cn/d3.py b/campaign/war_archives_20190911_cn/d3.py index 14337a78a..8e6619a92 100644 --- a/campaign/war_archives_20190911_cn/d3.py +++ b/campaign/war_archives_20190911_cn/d3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20191010_en/sp1.py b/campaign/war_archives_20191010_en/sp1.py index dc4a5c925..81a28a984 100644 --- a/campaign/war_archives_20191010_en/sp1.py +++ b/campaign/war_archives_20191010_en/sp1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20191010_en/sp2.py b/campaign/war_archives_20191010_en/sp2.py index b9a0640b2..76c1159a7 100644 --- a/campaign/war_archives_20191010_en/sp2.py +++ b/campaign/war_archives_20191010_en/sp2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/war_archives_20191010_en/sp3.py b/campaign/war_archives_20191010_en/sp3.py index bc2bab05f..28eab54ed 100644 --- a/campaign/war_archives_20191010_en/sp3.py +++ b/campaign/war_archives_20191010_en/sp3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/war_archives_20191031_en/a1.py b/campaign/war_archives_20191031_en/a1.py index 10f5fd293..ba9d84d2f 100644 --- a/campaign/war_archives_20191031_en/a1.py +++ b/campaign/war_archives_20191031_en/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'I5' diff --git a/campaign/war_archives_20191031_en/a2.py b/campaign/war_archives_20191031_en/a2.py index 0c25347e6..354218f2e 100644 --- a/campaign/war_archives_20191031_en/a2.py +++ b/campaign/war_archives_20191031_en/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20191031_en/a3.py b/campaign/war_archives_20191031_en/a3.py index 23ecdba76..c510492d3 100644 --- a/campaign/war_archives_20191031_en/a3.py +++ b/campaign/war_archives_20191031_en/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20191031_en/a4.py b/campaign/war_archives_20191031_en/a4.py index 97a1428d0..83da502e4 100644 --- a/campaign/war_archives_20191031_en/a4.py +++ b/campaign/war_archives_20191031_en/a4.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A4') diff --git a/campaign/war_archives_20191031_en/b1.py b/campaign/war_archives_20191031_en/b1.py index 730fa7bc0..8cf5f7590 100644 --- a/campaign/war_archives_20191031_en/b1.py +++ b/campaign/war_archives_20191031_en/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20191031_en/b2.py b/campaign/war_archives_20191031_en/b2.py index 7acf435da..99710918a 100644 --- a/campaign/war_archives_20191031_en/b2.py +++ b/campaign/war_archives_20191031_en/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20191031_en/b3.py b/campaign/war_archives_20191031_en/b3.py index 4e7ce2183..3a4151fd0 100644 --- a/campaign/war_archives_20191031_en/b3.py +++ b/campaign/war_archives_20191031_en/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20191031_en/b4.py b/campaign/war_archives_20191031_en/b4.py index 80ded4623..bb04914ab 100644 --- a/campaign/war_archives_20191031_en/b4.py +++ b/campaign/war_archives_20191031_en/b4.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B4') diff --git a/campaign/war_archives_20191031_en/c1.py b/campaign/war_archives_20191031_en/c1.py index afb607fcc..1224b15bc 100644 --- a/campaign/war_archives_20191031_en/c1.py +++ b/campaign/war_archives_20191031_en/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'I5' diff --git a/campaign/war_archives_20191031_en/c2.py b/campaign/war_archives_20191031_en/c2.py index 32e49e7e8..96071483e 100644 --- a/campaign/war_archives_20191031_en/c2.py +++ b/campaign/war_archives_20191031_en/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20191031_en/c3.py b/campaign/war_archives_20191031_en/c3.py index d93ca4ab7..eb009a23f 100644 --- a/campaign/war_archives_20191031_en/c3.py +++ b/campaign/war_archives_20191031_en/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20191031_en/c4.py b/campaign/war_archives_20191031_en/c4.py index 94eeef42f..365f40bdf 100644 --- a/campaign/war_archives_20191031_en/c4.py +++ b/campaign/war_archives_20191031_en/c4.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C4') diff --git a/campaign/war_archives_20191031_en/d1.py b/campaign/war_archives_20191031_en/d1.py index 57397bbbd..942f7c5da 100644 --- a/campaign/war_archives_20191031_en/d1.py +++ b/campaign/war_archives_20191031_en/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20191031_en/d2.py b/campaign/war_archives_20191031_en/d2.py index ae5a0c1c9..5ab9f2114 100644 --- a/campaign/war_archives_20191031_en/d2.py +++ b/campaign/war_archives_20191031_en/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20191031_en/d3.py b/campaign/war_archives_20191031_en/d3.py index b207d28db..f67b81787 100644 --- a/campaign/war_archives_20191031_en/d3.py +++ b/campaign/war_archives_20191031_en/d3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20191031_en/d4.py b/campaign/war_archives_20191031_en/d4.py index 3280ef556..01258a03a 100644 --- a/campaign/war_archives_20191031_en/d4.py +++ b/campaign/war_archives_20191031_en/d4.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D4') diff --git a/campaign/war_archives_20200820_cn/a1.py b/campaign/war_archives_20200820_cn/a1.py index ea37376e5..0841edf72 100644 --- a/campaign/war_archives_20200820_cn/a1.py +++ b/campaign/war_archives_20200820_cn/a1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20200820_cn/a2.py b/campaign/war_archives_20200820_cn/a2.py index 15cc29115..e07f451e4 100644 --- a/campaign/war_archives_20200820_cn/a2.py +++ b/campaign/war_archives_20200820_cn/a2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A2') diff --git a/campaign/war_archives_20200820_cn/a3.py b/campaign/war_archives_20200820_cn/a3.py index 7312d6ce9..466bdd732 100644 --- a/campaign/war_archives_20200820_cn/a3.py +++ b/campaign/war_archives_20200820_cn/a3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .a1 import Config as ConfigBase MAP = CampaignMap('A3') diff --git a/campaign/war_archives_20200820_cn/b1.py b/campaign/war_archives_20200820_cn/b1.py index 08b3f8b8c..b33f3f39e 100644 --- a/campaign/war_archives_20200820_cn/b1.py +++ b/campaign/war_archives_20200820_cn/b1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'I7' diff --git a/campaign/war_archives_20200820_cn/b2.py b/campaign/war_archives_20200820_cn/b2.py index 78b597439..885b44b67 100644 --- a/campaign/war_archives_20200820_cn/b2.py +++ b/campaign/war_archives_20200820_cn/b2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B2') diff --git a/campaign/war_archives_20200820_cn/b3.py b/campaign/war_archives_20200820_cn/b3.py index 8c16f689e..702506f87 100644 --- a/campaign/war_archives_20200820_cn/b3.py +++ b/campaign/war_archives_20200820_cn/b3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .b1 import Config as ConfigBase MAP = CampaignMap('B3') diff --git a/campaign/war_archives_20200820_cn/c1.py b/campaign/war_archives_20200820_cn/c1.py index b98cbce40..c12b7e911 100644 --- a/campaign/war_archives_20200820_cn/c1.py +++ b/campaign/war_archives_20200820_cn/c1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20200820_cn/c2.py b/campaign/war_archives_20200820_cn/c2.py index 8a705ec7f..eb33d58ee 100644 --- a/campaign/war_archives_20200820_cn/c2.py +++ b/campaign/war_archives_20200820_cn/c2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C2') diff --git a/campaign/war_archives_20200820_cn/c3.py b/campaign/war_archives_20200820_cn/c3.py index 9a3af6fd4..a7a66ad05 100644 --- a/campaign/war_archives_20200820_cn/c3.py +++ b/campaign/war_archives_20200820_cn/c3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .c1 import Config as ConfigBase MAP = CampaignMap('C3') diff --git a/campaign/war_archives_20200820_cn/d1.py b/campaign/war_archives_20200820_cn/d1.py index 7ada5b326..22c681409 100644 --- a/campaign/war_archives_20200820_cn/d1.py +++ b/campaign/war_archives_20200820_cn/d1.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'I7' diff --git a/campaign/war_archives_20200820_cn/d2.py b/campaign/war_archives_20200820_cn/d2.py index 1d1fe19be..695657d18 100644 --- a/campaign/war_archives_20200820_cn/d2.py +++ b/campaign/war_archives_20200820_cn/d2.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20200820_cn/d3.py b/campaign/war_archives_20200820_cn/d3.py index d85cca5ac..385dbaceb 100644 --- a/campaign/war_archives_20200820_cn/d3.py +++ b/campaign/war_archives_20200820_cn/d3.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20200820_cn/sp.py b/campaign/war_archives_20200820_cn/sp.py index 74a4d249c..c72ce2c87 100644 --- a/campaign/war_archives_20200820_cn/sp.py +++ b/campaign/war_archives_20200820_cn/sp.py @@ -1,7 +1,8 @@ -from ..campaign_war_archives.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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('SP') MAP.shape = 'I7' diff --git a/campaign/war_archives_20210325_cn/a1.py b/campaign/war_archives_20210325_cn/a1.py index 3ac453b75..93c6c28b6 100644 --- a/campaign/war_archives_20210325_cn/a1.py +++ b/campaign/war_archives_20210325_cn/a1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('A1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20210325_cn/a2.py b/campaign/war_archives_20210325_cn/a2.py index 7c1ccec02..2ff0a3d6b 100644 --- a/campaign/war_archives_20210325_cn/a2.py +++ b/campaign/war_archives_20210325_cn/a2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A2') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/a3.py b/campaign/war_archives_20210325_cn/a3.py index 02d5e123e..038c1628e 100644 --- a/campaign/war_archives_20210325_cn/a3.py +++ b/campaign/war_archives_20210325_cn/a3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .a1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('A3') MAP.shape = 'I8' diff --git a/campaign/war_archives_20210325_cn/as1.py b/campaign/war_archives_20210325_cn/as1.py index 4810e37e7..4e2f61ee8 100644 --- a/campaign/war_archives_20210325_cn/as1.py +++ b/campaign/war_archives_20210325_cn/as1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('AS1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20210325_cn/as2.py b/campaign/war_archives_20210325_cn/as2.py index 657d4950f..89f77093e 100644 --- a/campaign/war_archives_20210325_cn/as2.py +++ b/campaign/war_archives_20210325_cn/as2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .as1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('AS2') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/b1.py b/campaign/war_archives_20210325_cn/b1.py index 4dd770749..d05e9e751 100644 --- a/campaign/war_archives_20210325_cn/b1.py +++ b/campaign/war_archives_20210325_cn/b1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('B1') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/b2.py b/campaign/war_archives_20210325_cn/b2.py index fe44543ef..9a6ddd56a 100644 --- a/campaign/war_archives_20210325_cn/b2.py +++ b/campaign/war_archives_20210325_cn/b2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B2') MAP.shape = 'I7' diff --git a/campaign/war_archives_20210325_cn/b3.py b/campaign/war_archives_20210325_cn/b3.py index 52d788255..deb1ebd3b 100644 --- a/campaign/war_archives_20210325_cn/b3.py +++ b/campaign/war_archives_20210325_cn/b3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .b1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('B3') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/bs1.py b/campaign/war_archives_20210325_cn/bs1.py index 7ffd74e3a..aeaf2f355 100644 --- a/campaign/war_archives_20210325_cn/bs1.py +++ b/campaign/war_archives_20210325_cn/bs1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('BS1') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/bs2.py b/campaign/war_archives_20210325_cn/bs2.py index c14f6f1d6..a6276b976 100644 --- a/campaign/war_archives_20210325_cn/bs2.py +++ b/campaign/war_archives_20210325_cn/bs2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .bs1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('BS2') MAP.shape = 'I7' diff --git a/campaign/war_archives_20210325_cn/c1.py b/campaign/war_archives_20210325_cn/c1.py index 420d10ef8..fe544c15e 100644 --- a/campaign/war_archives_20210325_cn/c1.py +++ b/campaign/war_archives_20210325_cn/c1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('C1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20210325_cn/c2.py b/campaign/war_archives_20210325_cn/c2.py index 0ab0061aa..aba137445 100644 --- a/campaign/war_archives_20210325_cn/c2.py +++ b/campaign/war_archives_20210325_cn/c2.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C2') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/c3.py b/campaign/war_archives_20210325_cn/c3.py index 85e610024..a717c7e20 100644 --- a/campaign/war_archives_20210325_cn/c3.py +++ b/campaign/war_archives_20210325_cn/c3.py @@ -1,8 +1,9 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + from .c1 import Config as ConfigBase +from .campaign_base import CampaignBase MAP = CampaignMap('C3') MAP.shape = 'I8' diff --git a/campaign/war_archives_20210325_cn/campaign_base.py b/campaign/war_archives_20210325_cn/campaign_base.py index c27905c48..c1fcc0993 100644 --- a/campaign/war_archives_20210325_cn/campaign_base.py +++ b/campaign/war_archives_20210325_cn/campaign_base.py @@ -1,6 +1,7 @@ -from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger +from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ + class CampaignBase(CampaignBase_): STAGE_INCREASE = [ diff --git a/campaign/war_archives_20210325_cn/cs1.py b/campaign/war_archives_20210325_cn/cs1.py index 4a708a0de..291a11250 100644 --- a/campaign/war_archives_20210325_cn/cs1.py +++ b/campaign/war_archives_20210325_cn/cs1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('CS1') MAP.shape = 'H6' diff --git a/campaign/war_archives_20210325_cn/cs2.py b/campaign/war_archives_20210325_cn/cs2.py index bdfea2728..d09658e60 100644 --- a/campaign/war_archives_20210325_cn/cs2.py +++ b/campaign/war_archives_20210325_cn/cs2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .cs1 import Config as ConfigBase MAP = CampaignMap('CS2') diff --git a/campaign/war_archives_20210325_cn/d1.py b/campaign/war_archives_20210325_cn/d1.py index bc2d4121e..fdd0063c0 100644 --- a/campaign/war_archives_20210325_cn/d1.py +++ b/campaign/war_archives_20210325_cn/d1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('D1') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/d2.py b/campaign/war_archives_20210325_cn/d2.py index 34dc3a720..a126456ac 100644 --- a/campaign/war_archives_20210325_cn/d2.py +++ b/campaign/war_archives_20210325_cn/d2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D2') diff --git a/campaign/war_archives_20210325_cn/d3.py b/campaign/war_archives_20210325_cn/d3.py index 3d18b5359..49a0982c9 100644 --- a/campaign/war_archives_20210325_cn/d3.py +++ b/campaign/war_archives_20210325_cn/d3.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .d1 import Config as ConfigBase MAP = CampaignMap('D3') diff --git a/campaign/war_archives_20210325_cn/ds1.py b/campaign/war_archives_20210325_cn/ds1.py index 98f484bf0..a7905218d 100644 --- a/campaign/war_archives_20210325_cn/ds1.py +++ b/campaign/war_archives_20210325_cn/ds1.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase MAP = CampaignMap('DS1') MAP.shape = 'H7' diff --git a/campaign/war_archives_20210325_cn/ds2.py b/campaign/war_archives_20210325_cn/ds2.py index 8c84b55eb..b814a9269 100644 --- a/campaign/war_archives_20210325_cn/ds2.py +++ b/campaign/war_archives_20210325_cn/ds2.py @@ -1,7 +1,8 @@ -from .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 module.map.map_base import CampaignMap +from module.map.map_grids import RoadGrids, SelectedGrids + +from .campaign_base import CampaignBase from .ds1 import Config as ConfigBase MAP = CampaignMap('DS2') diff --git a/deploy/adb.py b/deploy/adb.py index 47555da09..f2c418931 100644 --- a/deploy/adb.py +++ b/deploy/adb.py @@ -23,8 +23,8 @@ class AdbManager(DeployConfig): if self.bool('InstallUiautomator2'): hr1('Uiautomator2 Init') - from uiautomator2.init import Initer import adbutils + from uiautomator2.init import Initer for device in adbutils.adb.iter_device(): init = Initer(device, loglevel=logging.DEBUG) init.set_atx_agent_addr('127.0.0.1:7912') diff --git a/deploy/emulator.py b/deploy/emulator.py index b24a7e952..47f8da6ea 100644 --- a/deploy/emulator.py +++ b/deploy/emulator.py @@ -1,10 +1,10 @@ import asyncio +import filecmp import os import re +import shutil import subprocess import winreg -import shutil -import filecmp from deploy.utils import cached_property diff --git a/dev_tools/button_extract.py b/dev_tools/button_extract.py index 5909b7e2a..b253033b8 100644 --- a/dev_tools/button_extract.py +++ b/dev_tools/button_extract.py @@ -4,7 +4,7 @@ import imageio import numpy as np from tqdm.contrib.concurrent import process_map -from module.base.utils import get_color, load_image, get_bbox, image_size +from module.base.utils import get_bbox, get_color, image_size, load_image from module.config.config_manual import ManualConfig as AzurLaneConfig from module.logger import logger diff --git a/dev_tools/grids_debug.py b/dev_tools/grids_debug.py index cd68a01ee..c662d79be 100644 --- a/dev_tools/grids_debug.py +++ b/dev_tools/grids_debug.py @@ -2,10 +2,11 @@ import module.config.server as server server.server = 'cn' # Don't need to edit, it's used to avoid error. -from module.map_detection.view import View -from module.config.config import AzurLaneConfig -from PIL import Image import numpy as np +from PIL import Image + +from module.config.config import AzurLaneConfig +from module.map_detection.view import View """ This file is use to debug a perspective error. diff --git a/dev_tools/map_extractor.py b/dev_tools/map_extractor.py index e096d1de4..da3116209 100644 --- a/dev_tools/map_extractor.py +++ b/dev_tools/map_extractor.py @@ -2,10 +2,10 @@ import os import re from dev_tools.slpp import slpp -from module.base.utils import location2node -from module.map.utils import * from dev_tools.utils import LuaLoader +from module.base.utils import location2node from module.logger import logger +from module.map.utils import * """ This an auto-tool to extract map files used in Alas. diff --git a/dev_tools/os_extract.py b/dev_tools/os_extract.py index ba504ac93..b2a942629 100644 --- a/dev_tools/os_extract.py +++ b/dev_tools/os_extract.py @@ -1,7 +1,6 @@ -from module.logger import logger # Change folder automatically - from dev_tools.utils import LuaLoader from module.base.utils import location2node +from module.logger import logger # Change folder automatically from module.os.map_data import DIC_OS_MAP diff --git a/dev_tools/relative_crop.py b/dev_tools/relative_crop.py index 053e4e1fa..3c95b5fe8 100644 --- a/dev_tools/relative_crop.py +++ b/dev_tools/relative_crop.py @@ -8,8 +8,8 @@ from module.base.utils import * server.server = 'cn' # Don't need to edit, it's used to avoid error. -from module.map_detection.view import View from module.config.config import AzurLaneConfig +from module.map_detection.view import View class Config: diff --git a/dev_tools/relative_record.py b/dev_tools/relative_record.py index 22aa394ec..e101dde4a 100644 --- a/dev_tools/relative_record.py +++ b/dev_tools/relative_record.py @@ -7,10 +7,10 @@ import module.config.server as server server.server = 'cn' # Don't need to edit, it's used to avoid error. -from module.map_detection.view import View from module.base.base import ModuleBase -from module.config.config import AzurLaneConfig from module.base.utils import * +from module.config.config import AzurLaneConfig +from module.map_detection.view import View class Config: diff --git a/dev_tools/relative_record_gif.py b/dev_tools/relative_record_gif.py index 4162c531d..1b7cc15ac 100644 --- a/dev_tools/relative_record_gif.py +++ b/dev_tools/relative_record_gif.py @@ -7,9 +7,9 @@ import module.config.server as server server.server = 'cn' # Don't need to edit, it's used to avoid error. +from dev_tools.relative_record import FOLDER, NAME from module.base.utils import * from module.map_detection.utils import * -from dev_tools.relative_record import FOLDER, NAME """ Usage: diff --git a/dev_tools/relative_record_gif2.py b/dev_tools/relative_record_gif2.py index e351f720d..6b8797396 100644 --- a/dev_tools/relative_record_gif2.py +++ b/dev_tools/relative_record_gif2.py @@ -8,9 +8,9 @@ import module.config.server as server server.server = 'cn' # Don't need to edit, it's used to avoid error. +from dev_tools.relative_record import FOLDER, NAME from module.base.utils import * from module.map_detection.utils import * -from dev_tools.relative_record import FOLDER, NAME """ Generate better siren template with brute-force. diff --git a/dev_tools/slpp.py b/dev_tools/slpp.py index a282b6cee..bf8eec8ec 100644 --- a/dev_tools/slpp.py +++ b/dev_tools/slpp.py @@ -4,7 +4,6 @@ from numbers import Number import six - """ SLPP is a simple lua-python data structures parser. diff --git a/dev_tools/uiautomator2_screenshot.py b/dev_tools/uiautomator2_screenshot.py index 3cf4cf3d3..45ada911c 100644 --- a/dev_tools/uiautomator2_screenshot.py +++ b/dev_tools/uiautomator2_screenshot.py @@ -1,8 +1,8 @@ -from module.device.screenshot import Screenshot -from module.config.config import AzurLaneConfig from datetime import datetime import module.config.server as server +from module.config.config import AzurLaneConfig +from module.device.screenshot import Screenshot server.server = 'cn' # Don't need to edit, it's used to avoid error. diff --git a/dev_tools/utils.py b/dev_tools/utils.py index 556853f58..61910314a 100644 --- a/dev_tools/utils.py +++ b/dev_tools/utils.py @@ -2,6 +2,7 @@ import os import re from tqdm import tqdm + from dev_tools.slpp import slpp diff --git a/module/base/mask.py b/module/base/mask.py index 3d4e95e6b..5795810b5 100644 --- a/module/base/mask.py +++ b/module/base/mask.py @@ -2,7 +2,7 @@ import cv2 import numpy as np from module.base.template import Template -from module.base.utils import load_image, rgb2gray, image_channel +from module.base.utils import image_channel, load_image, rgb2gray class Mask(Template): diff --git a/module/base/resource.py b/module/base/resource.py index d18a13429..2ead18625 100644 --- a/module/base/resource.py +++ b/module/base/resource.py @@ -1,6 +1,5 @@ -import re - import gc +import re from module.base.decorator import cached_property from module.logger import logger diff --git a/module/battle_pass/battle_pass.py b/module/battle_pass/battle_pass.py index f930b6568..dc9e5bae0 100644 --- a/module/battle_pass/battle_pass.py +++ b/module/battle_pass/battle_pass.py @@ -3,7 +3,7 @@ from module.base.utils import get_color from module.battle_pass.assets import * from module.combat.combat import Combat from module.logger import logger -from module.ui.assets import REWARD_GOTO_BATTLE_PASS, BATTLE_PASS_CHECK +from module.ui.assets import BATTLE_PASS_CHECK, REWARD_GOTO_BATTLE_PASS from module.ui.page import page_reward from module.ui.ui import UI diff --git a/module/campaign/campaign_base.py b/module/campaign/campaign_base.py index 9f3ba0670..4a5191c25 100644 --- a/module/campaign/campaign_base.py +++ b/module/campaign/campaign_base.py @@ -1,7 +1,7 @@ from module.base.decorator import Config, cached_property from module.campaign.campaign_ui import CampaignUI from module.combat.auto_search_combat import AutoSearchCombat -from module.exception import CampaignEnd, ScriptError, MapEnemyMoved +from module.exception import CampaignEnd, MapEnemyMoved, ScriptError from module.logger import logger from module.map.map import Map from module.map.map_base import CampaignMap diff --git a/module/campaign/campaign_event.py b/module/campaign/campaign_event.py index 4052064a4..6368f7bb0 100644 --- a/module/campaign/campaign_event.py +++ b/module/campaign/campaign_event.py @@ -6,10 +6,10 @@ import numpy as np from module.base.decorator import cached_property from module.campaign.assets import OCR_EVENT_PT +from module.config.utils import deep_get from module.logger import logger from module.ocr.ocr import Ocr from module.ui.ui import UI -from module.config.utils import deep_get class PtOcr(Ocr): diff --git a/module/campaign/run.py b/module/campaign/run.py index 98e94cdf0..7d9f65523 100644 --- a/module/campaign/run.py +++ b/module/campaign/run.py @@ -6,7 +6,7 @@ from module.campaign.assets import * from module.campaign.campaign_base import CampaignBase from module.config.config import AzurLaneConfig from module.config.utils import deep_get -from module.exception import RequestHumanTakeover, ScriptEnd, CampaignEnd +from module.exception import CampaignEnd, RequestHumanTakeover, ScriptEnd from module.logger import logger from module.ocr.ocr import Digit from module.ui.ui import UI diff --git a/module/combat/emotion.py b/module/combat/emotion.py index 482027eb2..a426a3edc 100644 --- a/module/combat/emotion.py +++ b/module/combat/emotion.py @@ -6,7 +6,7 @@ import numpy as np from module.base.decorator import cached_property from module.base.utils import random_normal_distribution_int from module.config.config import AzurLaneConfig -from module.exception import ScriptError, ScriptEnd +from module.exception import ScriptEnd, ScriptError from module.logger import logger DIC_LIMIT = { diff --git a/module/combat/submarine.py b/module/combat/submarine.py index e92853f26..4606fb574 100644 --- a/module/combat/submarine.py +++ b/module/combat/submarine.py @@ -1,6 +1,6 @@ from module.base.base import ModuleBase -from module.combat.assets import * from module.base.timer import Timer +from module.combat.assets import * from module.logger import logger diff --git a/module/commission/commission.py b/module/commission/commission.py index 903603491..584f75c9d 100644 --- a/module/commission/commission.py +++ b/module/commission/commission.py @@ -6,7 +6,8 @@ from module.base.timer import Timer from module.base.utils import * from module.combat.assets import * from module.commission.assets import * -from module.commission.project import Commission, COMMISSION_FILTER, SHORTEST_FILTER +from module.commission.project import (COMMISSION_FILTER, SHORTEST_FILTER, + Commission) from module.exception import GameStuckError from module.handler.info_handler import InfoHandler from module.logger import logger diff --git a/module/commission/project.py b/module/commission/project.py index 5d0938fd6..2780851a7 100644 --- a/module/commission/project.py +++ b/module/commission/project.py @@ -6,7 +6,7 @@ from module.base.filter import Filter from module.base.utils import * from module.commission.project_data import * from module.logger import logger -from module.ocr.ocr import Ocr, Duration +from module.ocr.ocr import Duration, Ocr from module.reward.assets import * COMMISSION_FILTER = Filter( diff --git a/module/daemon/daemon.py b/module/daemon/daemon.py index c578f3c5e..fd4b3f4bd 100644 --- a/module/daemon/daemon.py +++ b/module/daemon/daemon.py @@ -2,7 +2,7 @@ from module.campaign.campaign_base import CampaignBase from module.daemon.daemon_base import DaemonBase from module.exception import CampaignEnd from module.handler.ambush import MAP_AMBUSH_EVADE -from module.map.map_operation import MAP_PREPARATION, FLEET_PREPARATION +from module.map.map_operation import FLEET_PREPARATION, MAP_PREPARATION class AzurLaneDaemon(DaemonBase, CampaignBase): diff --git a/module/daemon/os_daemon.py b/module/daemon/os_daemon.py index 97be71cf6..c2c8f7467 100644 --- a/module/daemon/os_daemon.py +++ b/module/daemon/os_daemon.py @@ -4,7 +4,7 @@ from module.exception import CampaignEnd from module.logger import logger from module.os_combat.combat import Combat, ContinuousCombat from module.os_handler.assets import AUTO_SEARCH_REWARD -from module.os_handler.port import PortHandler, PORT_ENTER +from module.os_handler.port import PORT_ENTER, PortHandler class AzurLaneDaemon(DaemonBase, Combat, PortHandler): diff --git a/module/daily/daily.py b/module/daily/daily.py index c031df93d..1243d9bb9 100644 --- a/module/daily/daily.py +++ b/module/daily/daily.py @@ -7,7 +7,8 @@ from module.daily.assets import * from module.equipment.fleet_equipment import DailyEquipment from module.logger import logger from module.ocr.ocr import Digit -from module.ui.ui import page_daily, page_campaign_menu, BACK_ARROW, DAILY_CHECK +from module.ui.ui import (BACK_ARROW, DAILY_CHECK, page_campaign_menu, + page_daily) DAILY_MISSION_LIST = [DAILY_MISSION_1, DAILY_MISSION_2, DAILY_MISSION_3] OCR_REMAIN = Digit(OCR_REMAIN, threshold=128, alphabet='0123') diff --git a/module/data_key/data_key.py b/module/data_key/data_key.py index e2123d5d8..9f03c759a 100644 --- a/module/data_key/data_key.py +++ b/module/data_key/data_key.py @@ -2,7 +2,8 @@ from module.combat.assets import GET_ITEMS_1 from module.data_key.assets import * from module.logger import logger from module.ocr.ocr import DigitCounter -from module.ui.assets import WAR_ARCHIVES_CHECK, CAMPAIGN_MENU_GOTO_WAR_ARCHIVES +from module.ui.assets import (CAMPAIGN_MENU_GOTO_WAR_ARCHIVES, + WAR_ARCHIVES_CHECK) from module.ui.ui import UI, page_archives DATA_KEY = DigitCounter(OCR_DATA_KEY, letter=(255, 247, 247), threshold=64) diff --git a/module/device/app_control.py b/module/device/app_control.py index b62d10a07..b564a0041 100644 --- a/module/device/app_control.py +++ b/module/device/app_control.py @@ -1,9 +1,9 @@ from lxml import etree from module.device.method.adb import Adb -from module.device.method.wsa import WSA from module.device.method.uiautomator_2 import Uiautomator2 from module.device.method.utils import HierarchyButton +from module.device.method.wsa import WSA from module.logger import logger diff --git a/module/device/connection.py b/module/device/connection.py index 81a9b3213..91e57a5be 100644 --- a/module/device/connection.py +++ b/module/device/connection.py @@ -7,13 +7,14 @@ import time import adbutils import uiautomator2 as u2 -from adbutils import AdbClient, AdbDevice, ForwardItem, ReverseItem, AdbTimeout +from adbutils import AdbClient, AdbDevice, AdbTimeout, ForwardItem, ReverseItem -from deploy.utils import poor_yaml_read, DEPLOY_CONFIG +from deploy.utils import DEPLOY_CONFIG, poor_yaml_read from module.base.decorator import cached_property from module.base.utils import ensure_time from module.config.config import AzurLaneConfig -from module.device.method.utils import recv_all, possible_reasons, random_port, del_cached_property +from module.device.method.utils import (del_cached_property, possible_reasons, + random_port, recv_all) from module.exception import RequestHumanTakeover from module.logger import logger @@ -82,7 +83,8 @@ class Connection: Returns: str: 127.0.0.1:{port} """ - from winreg import ConnectRegistry, OpenKey, QueryInfoKey, EnumValue, CloseKey, HKEY_LOCAL_MACHINE + from winreg import (HKEY_LOCAL_MACHINE, CloseKey, ConnectRegistry, + EnumValue, OpenKey, QueryInfoKey) logger.info("Use Bluestacks4 Hyper-v Beta") if serial == "bluestacks4-hyperv": @@ -117,7 +119,8 @@ class Connection: Returns: str: 127.0.0.1:{port} """ - from winreg import ConnectRegistry, OpenKey, QueryInfoKey, EnumValue, CloseKey, HKEY_LOCAL_MACHINE + from winreg import (HKEY_LOCAL_MACHINE, CloseKey, ConnectRegistry, + EnumValue, OpenKey, QueryInfoKey) logger.info("Use Bluestacks5 Hyper-v") logger.info("Reading Realtime adb port") diff --git a/module/device/device.py b/module/device/device.py index 4bb3cb82a..b45b40866 100644 --- a/module/device/device.py +++ b/module/device/device.py @@ -6,7 +6,8 @@ from module.config.utils import get_server_next_update from module.device.app_control import AppControl from module.device.control import Control from module.device.screenshot import Screenshot -from module.exception import GameStuckError, GameTooManyClickError, RequestHumanTakeover +from module.exception import (GameStuckError, GameTooManyClickError, + RequestHumanTakeover) from module.handler.assets import GET_MISSION from module.logger import logger diff --git a/module/device/method/adb.py b/module/device/method/adb.py index 4f87a1e26..ebf276e6f 100644 --- a/module/device/method/adb.py +++ b/module/device/method/adb.py @@ -7,8 +7,10 @@ from adbutils.errors import AdbError from lxml import etree from module.device.connection import Connection -from module.device.method.utils import recv_all, possible_reasons, handle_adb_error, RETRY_TRIES, RETRY_DELAY -from module.exception import ScriptError, RequestHumanTakeover +from module.device.method.utils import (RETRY_DELAY, RETRY_TRIES, + handle_adb_error, possible_reasons, + recv_all) +from module.exception import RequestHumanTakeover, ScriptError from module.logger import logger diff --git a/module/device/method/ascreencap.py b/module/device/method/ascreencap.py index 62d4c5a8c..dafe8b740 100644 --- a/module/device/method/ascreencap.py +++ b/module/device/method/ascreencap.py @@ -6,8 +6,9 @@ from adbutils.errors import AdbError from module.base.utils import * from module.device.connection import Connection -from module.device.method.utils import recv_all, handle_adb_error, RETRY_TRIES, RETRY_DELAY -from module.exception import ScriptError, RequestHumanTakeover +from module.device.method.utils import (RETRY_DELAY, RETRY_TRIES, + handle_adb_error, recv_all) +from module.exception import RequestHumanTakeover, ScriptError from module.logger import logger diff --git a/module/device/method/hermit.py b/module/device/method/hermit.py index 60f713af7..903ace597 100644 --- a/module/device/method/hermit.py +++ b/module/device/method/hermit.py @@ -6,9 +6,10 @@ from adbutils.errors import AdbError from module.base.decorator import cached_property from module.base.timer import Timer -from module.base.utils import random_rectangle_point, point2str +from module.base.utils import point2str, random_rectangle_point from module.device.method.adb import Adb -from module.device.method.utils import HierarchyButton, handle_adb_error, RETRY_TRIES, RETRY_DELAY +from module.device.method.utils import (RETRY_DELAY, RETRY_TRIES, + HierarchyButton, handle_adb_error) from module.exception import RequestHumanTakeover from module.logger import logger diff --git a/module/device/method/minitouch.py b/module/device/method/minitouch.py index 99414edd4..90d88b8f2 100644 --- a/module/device/method/minitouch.py +++ b/module/device/method/minitouch.py @@ -7,8 +7,9 @@ from adbutils.errors import AdbError from module.base.decorator import cached_property from module.base.utils import * from module.device.connection import Connection -from module.device.method.utils import handle_adb_error, del_cached_property, RETRY_TRIES, RETRY_DELAY -from module.exception import ScriptError, RequestHumanTakeover +from module.device.method.utils import (RETRY_DELAY, RETRY_TRIES, + del_cached_property, handle_adb_error) +from module.exception import RequestHumanTakeover, ScriptError from module.logger import logger diff --git a/module/device/method/uiautomator_2.py b/module/device/method/uiautomator_2.py index e181b25b7..842a4da2b 100644 --- a/module/device/method/uiautomator_2.py +++ b/module/device/method/uiautomator_2.py @@ -8,7 +8,8 @@ from lxml import etree from module.base.decorator import cached_property from module.base.utils import * from module.device.connection import Connection -from module.device.method.utils import possible_reasons, handle_adb_error, RETRY_TRIES, RETRY_DELAY +from module.device.method.utils import (RETRY_DELAY, RETRY_TRIES, + handle_adb_error, possible_reasons) from module.exception import RequestHumanTakeover from module.logger import logger diff --git a/module/device/method/utils.py b/module/device/method/utils.py index 51ebfd52f..825916b78 100644 --- a/module/device/method/utils.py +++ b/module/device/method/utils.py @@ -3,8 +3,8 @@ import re import socket import uiautomator2 as u2 +from adbutils import AdbTimeout, _AdbStreamConnection from lxml import etree -from adbutils import _AdbStreamConnection, AdbTimeout from module.base.decorator import cached_property from module.logger import logger diff --git a/module/device/method/wsa.py b/module/device/method/wsa.py index 81c3e6061..5d3208fea 100644 --- a/module/device/method/wsa.py +++ b/module/device/method/wsa.py @@ -4,7 +4,8 @@ from functools import wraps from adbutils.errors import AdbError from module.device.connection import Connection -from module.device.method.utils import possible_reasons, handle_adb_error, RETRY_TRIES, RETRY_DELAY +from module.device.method.utils import (RETRY_DELAY, RETRY_TRIES, + handle_adb_error, possible_reasons) from module.exception import RequestHumanTakeover from module.logger import logger diff --git a/module/device/screenshot.py b/module/device/screenshot.py index 598a18060..a5bc31d9b 100644 --- a/module/device/screenshot.py +++ b/module/device/screenshot.py @@ -9,11 +9,11 @@ from PIL import Image from module.base.decorator import cached_property from module.base.timer import Timer, timer -from module.base.utils import get_color, save_image, limit_in, image_size +from module.base.utils import get_color, image_size, limit_in, save_image from module.device.method.adb import Adb -from module.device.method.wsa import WSA from module.device.method.ascreencap import AScreenCap from module.device.method.uiautomator_2 import Uiautomator2 +from module.device.method.wsa import WSA from module.exception import RequestHumanTakeover, ScriptError from module.logger import logger diff --git a/module/equipment/equipment.py b/module/equipment/equipment.py index d7dba5fd6..1c0af1279 100644 --- a/module/equipment/equipment.py +++ b/module/equipment/equipment.py @@ -4,9 +4,8 @@ from module.base.timer import Timer from module.equipment.assets import * from module.logger import logger from module.ui.navbar import Navbar -from module.ui.ui import UI from module.ui.switch import Switch - +from module.ui.ui import UI equipping_filter = Switch('Equiping_filter') equipping_filter.add_status('on', check_button=EQUIPPING_ON) diff --git a/module/event/campaign_ab.py b/module/event/campaign_ab.py index e3cd3b2b9..26459c970 100644 --- a/module/event/campaign_ab.py +++ b/module/event/campaign_ab.py @@ -2,7 +2,7 @@ import os from module.config.config import TaskEnd from module.config.utils import get_server_last_update -from module.event.base import EventBase, EventStage, STAGE_FILTER +from module.event.base import STAGE_FILTER, EventBase, EventStage from module.logger import logger diff --git a/module/event/campaign_cd.py b/module/event/campaign_cd.py index 8069fd423..c71c2035a 100644 --- a/module/event/campaign_cd.py +++ b/module/event/campaign_cd.py @@ -2,7 +2,7 @@ import os from module.config.config import TaskEnd from module.config.utils import get_server_last_update -from module.event.base import EventBase, EventStage, STAGE_FILTER +from module.event.base import STAGE_FILTER, EventBase, EventStage from module.logger import logger diff --git a/module/exercise/combat.py b/module/exercise/combat.py index ef47b43ec..aa84e6171 100644 --- a/module/exercise/combat.py +++ b/module/exercise/combat.py @@ -2,7 +2,7 @@ from module.combat.combat import * from module.exercise.assets import * from module.exercise.equipment import ExerciseEquipment from module.exercise.hp_daemon import HpDaemon -from module.exercise.opponent import OpponentChoose, OPPONENT +from module.exercise.opponent import OPPONENT, OpponentChoose from module.ui.assets import EXERCISE_CHECK diff --git a/module/gacha/gacha_reward.py b/module/gacha/gacha_reward.py index 64545f6c8..f7ea38bcd 100644 --- a/module/gacha/gacha_reward.py +++ b/module/gacha/gacha_reward.py @@ -2,7 +2,7 @@ from module.base.timer import Timer from module.combat.assets import GET_SHIP from module.gacha.assets import * from module.gacha.ui import GachaUI -from module.handler.assets import STORY_SKIP, POPUP_CONFIRM +from module.handler.assets import POPUP_CONFIRM, STORY_SKIP from module.logger import logger from module.ocr.ocr import Digit from module.retire.retirement import Retirement diff --git a/module/guild/lobby.py b/module/guild/lobby.py index db04de1e1..306947e62 100644 --- a/module/guild/lobby.py +++ b/module/guild/lobby.py @@ -2,7 +2,7 @@ import numpy as np from module.base.button import Button from module.base.timer import Timer -from module.base.utils import color_similarity_2d, area_offset +from module.base.utils import area_offset, color_similarity_2d from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_ITEMS_3 from module.guild.assets import * from module.guild.base import GuildBase diff --git a/module/guild/logistics.py b/module/guild/logistics.py index e7f12c41c..dab082077 100644 --- a/module/guild/logistics.py +++ b/module/guild/logistics.py @@ -1,7 +1,7 @@ import re from module.base.button import ButtonGrid -from module.base.decorator import cached_property, Config +from module.base.decorator import Config, cached_property from module.base.filter import Filter from module.base.timer import Timer from module.base.utils import * diff --git a/module/handler/ambush.py b/module/handler/ambush.py index afdd01267..96ffa8275 100644 --- a/module/handler/ambush.py +++ b/module/handler/ambush.py @@ -1,7 +1,7 @@ import numpy as np from module.base.timer import Timer -from module.base.utils import red_overlay_transparency, get_color +from module.base.utils import get_color, red_overlay_transparency from module.combat.combat import Combat from module.handler.assets import * from module.handler.info_handler import info_letter_preprocess diff --git a/module/handler/enemy_searching.py b/module/handler/enemy_searching.py index 42fc362e0..8a1ed3bb0 100644 --- a/module/handler/enemy_searching.py +++ b/module/handler/enemy_searching.py @@ -1,12 +1,12 @@ from module.base.resource import del_cached_property from module.base.timer import Timer -from module.base.utils import red_overlay_transparency, get_color +from module.base.utils import get_color, red_overlay_transparency from module.exception import CampaignEnd from module.handler.assets import * from module.handler.info_handler import InfoHandler from module.logger import logger from module.map.assets import * -from module.ui.assets import EVENT_CHECK, SP_CHECK, CAMPAIGN_CHECK +from module.ui.assets import CAMPAIGN_CHECK, EVENT_CHECK, SP_CHECK class EnemySearchingHandler(InfoHandler): diff --git a/module/handler/login.py b/module/handler/login.py index b9158954d..f3383f667 100644 --- a/module/handler/login.py +++ b/module/handler/login.py @@ -5,18 +5,19 @@ import numpy as np from scipy.signal import find_peaks from uiautomator2 import UiObject from uiautomator2.exceptions import XPathElementNotFoundError -from uiautomator2.xpath import XPathSelector, XPath +from uiautomator2.xpath import XPath, XPathSelector import module.config.server as server from module.base.timer import Timer -from module.base.utils import crop, random_rectangle_point, color_similarity_2d +from module.base.utils import color_similarity_2d, crop, random_rectangle_point from module.combat.combat import Combat -from module.exception import GameTooManyClickError, GameStuckError, RequestHumanTakeover +from module.exception import (GameStuckError, GameTooManyClickError, + RequestHumanTakeover) from module.handler.assets import * from module.logger import logger from module.map.assets import * from module.ui.assets import * -from module.ui.ui import MAIN_CHECK +from module.ui.page import MAIN_CHECK class LoginHandler(Combat): diff --git a/module/handler/strategy.py b/module/handler/strategy.py index 83f5090d4..ba28f137f 100644 --- a/module/handler/strategy.py +++ b/module/handler/strategy.py @@ -3,7 +3,8 @@ import numpy as np from module.handler.assets import * from module.handler.info_handler import InfoHandler from module.logger import logger -from module.template.assets import TEMPLATE_FORMATION_1, TEMPLATE_FORMATION_2, TEMPLATE_FORMATION_3 +from module.template.assets import (TEMPLATE_FORMATION_1, TEMPLATE_FORMATION_2, + TEMPLATE_FORMATION_3) from module.ui.switch import Switch formation = Switch('Formation', offset=120) diff --git a/module/map/camera.py b/module/map/camera.py index 04aec36b7..c6532bcd8 100644 --- a/module/map/camera.py +++ b/module/map/camera.py @@ -4,15 +4,14 @@ import numpy as np from module.base.utils import area_offset from module.combat.assets import GET_ITEMS_1 -from module.exception import MapDetectionError, CampaignEnd -from module.handler.assets import AUTO_SEARCH_MENU_CONTINUE -from module.handler.assets import GAME_TIPS +from module.exception import CampaignEnd, MapDetectionError +from module.handler.assets import AUTO_SEARCH_MENU_CONTINUE, GAME_TIPS from module.logger import logger from module.map.map_base import CampaignMap, location2node from module.map.map_operation import MapOperation from module.map.utils import location_ensure, random_direction from module.map_detection.grid import Grid -from module.map_detection.utils import trapezoid2area, area2corner +from module.map_detection.utils import area2corner, trapezoid2area from module.map_detection.view import View diff --git a/module/map/fleet.py b/module/map/fleet.py index 41aaeb22e..77b66a5a0 100644 --- a/module/map/fleet.py +++ b/module/map/fleet.py @@ -3,12 +3,11 @@ import itertools import numpy as np from module.base.timer import Timer -from module.exception import MapWalkError, MapEnemyMoved, MapDetectionError +from module.exception import MapDetectionError, MapEnemyMoved, MapWalkError from module.handler.ambush import AmbushHandler from module.logger import logger from module.map.camera import Camera -from module.map.map_base import SelectedGrids -from module.map.map_base import location2node, location_ensure +from module.map.map_base import SelectedGrids, location2node, location_ensure from module.map.utils import match_movable diff --git a/module/map/map.py b/module/map/map.py index f72acbce7..603394fa3 100644 --- a/module/map/map.py +++ b/module/map/map.py @@ -5,7 +5,7 @@ from module.base.filter import Filter from module.exception import MapEnemyMoved from module.logger import logger from module.map.fleet import Fleet -from module.map.map_grids import SelectedGrids, RoadGrids +from module.map.map_grids import RoadGrids, SelectedGrids from module.map_detection.grid_info import GridInfo ENEMY_FILTER = Filter(regex=re.compile('^(.*?)$'), attr=('str',)) diff --git a/module/map/map_operation.py b/module/map/map_operation.py index bf8c78a35..d93e748ca 100644 --- a/module/map/map_operation.py +++ b/module/map/map_operation.py @@ -1,6 +1,5 @@ from module.base.timer import Timer -from module.exception import CampaignEnd -from module.exception import ScriptEnd, RequestHumanTakeover +from module.exception import CampaignEnd, RequestHumanTakeover, ScriptEnd from module.handler.fast_forward import FastForwardHandler from module.handler.mystery import MysteryHandler from module.logger import logger diff --git a/module/map_detection/perspective.py b/module/map_detection/perspective.py index b1fad966f..7966539ab 100644 --- a/module/map_detection/perspective.py +++ b/module/map_detection/perspective.py @@ -2,7 +2,7 @@ import time import warnings import numpy as np -from PIL import Image, ImageOps, ImageDraw +from PIL import Image, ImageDraw, ImageOps from scipy import signal from module.base.utils import * diff --git a/module/meowfficer/base.py b/module/meowfficer/base.py index 20da81f7b..861e41cb5 100644 --- a/module/meowfficer/base.py +++ b/module/meowfficer/base.py @@ -1,10 +1,10 @@ from module.base.timer import Timer from module.combat.assets import GET_ITEMS_1 from module.config.utils import get_server_next_update +from module.logger import logger from module.meowfficer.assets import * from module.ui.assets import MEOWFFICER_CHECK, MEOWFFICER_INFO from module.ui.ui import UI -from module.logger import logger class MeowfficerBase(UI): diff --git a/module/ocr/al_ocr.py b/module/ocr/al_ocr.py index 949aa72a4..092ffb7db 100644 --- a/module/ocr/al_ocr.py +++ b/module/ocr/al_ocr.py @@ -2,11 +2,12 @@ import os import cv2 import numpy as np -from PIL import Image from cnocr import CnOcr -from cnocr.cn_ocr import data_dir, read_charset, check_model_name, load_module, gen_network +from cnocr.cn_ocr import (check_model_name, data_dir, gen_network, load_module, + read_charset) from cnocr.fit.ctc_metrics import CtcMetrics from cnocr.hyperparams.cn_hyperparams import CnHyperparams as Hyperparams +from PIL import Image from module.exception import RequestHumanTakeover from module.logger import logger diff --git a/module/ocr/rpc.py b/module/ocr/rpc.py index c5231b48c..238d22844 100644 --- a/module/ocr/rpc.py +++ b/module/ocr/rpc.py @@ -6,6 +6,7 @@ from typing import List import numpy as np import zerorpc import zmq + from deploy.config import DeployConfig from module.logger import logger diff --git a/module/os/camera.py b/module/os/camera.py index 38d570044..d190e2ea5 100644 --- a/module/os/camera.py +++ b/module/os/camera.py @@ -5,7 +5,7 @@ from module.base.decorator import cached_property from module.exception import MapDetectionError from module.logger import logger from module.map.camera import Camera -from module.map.map_base import location_ensure, location2node +from module.map.map_base import location2node, location_ensure from module.map_detection.os_grid import OSGrid from module.map_detection.view import View from module.os.map_operation import OSMapOperation diff --git a/module/os/fleet.py b/module/os/fleet.py index 5f1275b15..f0e1c89c3 100644 --- a/module/os/fleet.py +++ b/module/os/fleet.py @@ -12,9 +12,9 @@ from module.logger import logger from module.map.fleet import Fleet from module.map.map_grids import SelectedGrids from module.map.utils import location_ensure -from module.map_detection.utils import corner2inner, area2corner +from module.map_detection.utils import area2corner, corner2inner from module.ocr.ocr import Ocr -from module.os.assets import TEMPLATE_EMPTY_HP, STRONGHOLD_PERCENTAGE +from module.os.assets import STRONGHOLD_PERCENTAGE, TEMPLATE_EMPTY_HP from module.os.camera import OSCamera from module.os.map_base import OSCampaignMap from module.os_ash.ash import OSAsh diff --git a/module/os/globe_camera.py b/module/os/globe_camera.py index 4ac9806d3..5f589e8c1 100644 --- a/module/os/globe_camera.py +++ b/module/os/globe_camera.py @@ -2,7 +2,7 @@ from module.base.timer import Timer from module.base.utils import * from module.logger import logger from module.os.assets import * -from module.os.globe_detection import GlobeDetection, GLOBE_MAP_SHAPE +from module.os.globe_detection import GLOBE_MAP_SHAPE, GlobeDetection from module.os.globe_operation import GlobeOperation from module.os.globe_zone import Zone, ZoneManager diff --git a/module/os/map.py b/module/os/map.py index a4eb46312..9910004d0 100644 --- a/module/os/map.py +++ b/module/os/map.py @@ -1,8 +1,7 @@ import inflection from module.base.timer import Timer -from module.exception import CampaignEnd -from module.exception import RequestHumanTakeover +from module.exception import CampaignEnd, RequestHumanTakeover from module.logger import logger from module.map.map import Map from module.map.map_grids import SelectedGrids diff --git a/module/os/map_operation.py b/module/os/map_operation.py index 0fe6861e4..b5151a6a8 100644 --- a/module/os/map_operation.py +++ b/module/os/map_operation.py @@ -1,7 +1,7 @@ from module.base.decorator import Config from module.base.timer import Timer from module.base.utils import * -from module.exception import ScriptError, MapDetectionError +from module.exception import MapDetectionError, ScriptError from module.logger import logger from module.ocr.ocr import Ocr from module.os.assets import * diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py index cf45bb19c..7f8b37d0d 100644 --- a/module/os/operation_siren.py +++ b/module/os/operation_siren.py @@ -2,8 +2,9 @@ from datetime import datetime import numpy as np -from module.config.utils import deep_get, get_os_next_reset, get_os_reset_remain -from module.exception import ScriptError, RequestHumanTakeover +from module.config.utils import (deep_get, get_os_next_reset, + get_os_reset_remain) +from module.exception import RequestHumanTakeover, ScriptError from module.logger import logger from module.map.map_grids import SelectedGrids from module.os.fleet import BossFleet diff --git a/module/os_ash/ash.py b/module/os_ash/ash.py index 57cf6b429..ba64af898 100644 --- a/module/os_ash/ash.py +++ b/module/os_ash/ash.py @@ -1,6 +1,6 @@ from module.base.timer import Timer from module.base.utils import color_bar_percentage -from module.combat.combat import Combat, BATTLE_PREPARATION, GET_ITEMS_1 +from module.combat.combat import BATTLE_PREPARATION, GET_ITEMS_1, Combat from module.logger import logger from module.ocr.ocr import Digit, DigitCounter from module.os.assets import MAP_GOTO_GLOBE diff --git a/module/os_handler/action_point.py b/module/os_handler/action_point.py index c9cd3375c..2dbb64cfe 100644 --- a/module/os_handler/action_point.py +++ b/module/os_handler/action_point.py @@ -1,6 +1,6 @@ +import module.config.server as server from module.base.button import ButtonGrid from module.base.utils import * -import module.config.server as server from module.logger import logger from module.ocr.ocr import Digit, DigitCounter from module.os_handler.assets import * diff --git a/module/os_handler/enemy_searching.py b/module/os_handler/enemy_searching.py index f27f50cec..e851b7a7f 100644 --- a/module/os_handler/enemy_searching.py +++ b/module/os_handler/enemy_searching.py @@ -1,4 +1,5 @@ -from module.handler.enemy_searching import EnemySearchingHandler as EnemySearchingHandler_ +from module.handler.enemy_searching import \ + EnemySearchingHandler as EnemySearchingHandler_ from module.os_handler.assets import * diff --git a/module/os_handler/shop.py b/module/os_handler/shop.py index a091bd29a..135a4104d 100644 --- a/module/os_handler/shop.py +++ b/module/os_handler/shop.py @@ -4,7 +4,7 @@ from module.logger import logger from module.ocr.ocr import Digit from module.os_handler.assets import * from module.os_handler.map_event import MapEventHandler -from module.statistics.item import ItemGrid, Item +from module.statistics.item import Item, ItemGrid from module.ui.ui import UI OCR_SHOP_YELLOW_COINS = Digit(SHOP_YELLOW_COINS, letter=(239, 239, 239), name='OCR_SHOP_YELLOW_COINS') diff --git a/module/raid/run.py b/module/raid/run.py index cd13a7b6c..deedfb17e 100644 --- a/module/raid/run.py +++ b/module/raid/run.py @@ -1,7 +1,7 @@ from module.campaign.campaign_event import CampaignEvent from module.exception import ScriptEnd, ScriptError from module.logger import logger -from module.raid.raid import Raid, OilExhausted +from module.raid.raid import OilExhausted, Raid from module.ui.page import page_raid diff --git a/module/research/research.py b/module/research/research.py index 089db0e8a..e7f2b6225 100644 --- a/module/research/research.py +++ b/module/research/research.py @@ -4,10 +4,11 @@ from module.base.timer import Timer from module.base.utils import rgb2gray from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_ITEMS_3 from module.logger import logger -from module.research.assets import * -from module.research.project import ResearchSelector, RESEARCH_ENTRANCE, get_research_finished, ResearchProject -from module.ui.page import * from module.ocr.ocr import Duration +from module.research.assets import * +from module.research.project import (RESEARCH_ENTRANCE, ResearchProject, + ResearchSelector, get_research_finished) +from module.ui.page import * OCR_DURATION = Duration(RESEARCH_LAB_DURATION_REMAIN, letter=(255, 255, 255), threshold=64, name='RESEARCH_LAB_DURATION_REMAIN') diff --git a/module/retire/enhancement.py b/module/retire/enhancement.py index de72a9372..8ee6c3887 100644 --- a/module/retire/enhancement.py +++ b/module/retire/enhancement.py @@ -6,8 +6,10 @@ from module.handler.assets import INFO_BAR_DETECT from module.handler.info_handler import info_letter_preprocess from module.logger import logger from module.retire.assets import * -from module.retire.dock import Dock, CARD_GRIDS -from module.template.assets import TEMPLATE_ENHANCE_SUCCESS, TEMPLATE_ENHANCE_FAILED, TEMPLATE_ENHANCE_IN_BATTLE +from module.retire.dock import CARD_GRIDS, Dock +from module.template.assets import (TEMPLATE_ENHANCE_FAILED, + TEMPLATE_ENHANCE_IN_BATTLE, + TEMPLATE_ENHANCE_SUCCESS) VALID_SHIP_TYPES = ['dd', 'ss', 'cl', 'ca', 'bb', 'cv', 'repair', 'others'] TEMPLATE_ENHANCE_SUCCESS.pre_process = info_letter_preprocess diff --git a/module/retire/retirement.py b/module/retire/retirement.py index 86d13aaa8..112079b0e 100644 --- a/module/retire/retirement.py +++ b/module/retire/retirement.py @@ -1,6 +1,6 @@ from module.base.button import ButtonGrid from module.base.timer import Timer -from module.base.utils import get_color, color_similar, resize +from module.base.utils import color_similar, get_color, resize from module.combat.assets import GET_ITEMS_1 from module.exception import RequestHumanTakeover, ScriptError from module.logger import logger diff --git a/module/shipyard/ui_globals.py b/module/shipyard/ui_globals.py index 7cec57c01..6cf684c8f 100644 --- a/module/shipyard/ui_globals.py +++ b/module/shipyard/ui_globals.py @@ -1,5 +1,5 @@ from module.base.button import ButtonGrid -from module.ocr.ocr import Ocr, Digit, DigitCounter +from module.ocr.ocr import Digit, DigitCounter, Ocr from module.shipyard.assets import * SHIPYARD_FACE_GRID = ButtonGrid(origin=(188, 607), delta=(181, 0), diff --git a/module/shop/shop_guild.py b/module/shop/shop_guild.py index 4fb7536f2..58534fb03 100644 --- a/module/shop/shop_guild.py +++ b/module/shop/shop_guild.py @@ -1,4 +1,4 @@ -from module.base.decorator import cached_property, Config +from module.base.decorator import Config, cached_property from module.base.timer import Timer from module.exception import ScriptError from module.logger import logger diff --git a/module/shop/shop_medal.py b/module/shop/shop_medal.py index a1451f449..50a7ce11b 100644 --- a/module/shop/shop_medal.py +++ b/module/shop/shop_medal.py @@ -1,5 +1,5 @@ from module.base.button import ButtonGrid -from module.base.decorator import cached_property, Config +from module.base.decorator import Config, cached_property from module.logger import logger from module.ocr.ocr import Digit from module.shop.assets import * diff --git a/module/shop/ui.py b/module/shop/ui.py index f40491594..506610118 100644 --- a/module/shop/ui.py +++ b/module/shop/ui.py @@ -5,7 +5,7 @@ from module.shop.assets import * from module.ui.assets import BACK_ARROW from module.ui.navbar import Navbar from module.ui.page import page_munitions -from module.ui.ui import UI, POPUP_CONFIRM +from module.ui.ui import POPUP_CONFIRM, UI class ShopUI(UI): diff --git a/module/sos/sos.py b/module/sos/sos.py index 6167e222f..ac0c65af9 100644 --- a/module/sos/sos.py +++ b/module/sos/sos.py @@ -1,6 +1,5 @@ from campaign.campaign_sos.campaign_base import CampaignBase -from module.base.decorator import Config -from module.base.decorator import cached_property +from module.base.decorator import Config, cached_property from module.base.utils import area_pad, random_rectangle_vector from module.campaign.run import CampaignRun from module.logger import logger diff --git a/module/statistics/campaign_bonus.py b/module/statistics/campaign_bonus.py index 54e0b7217..f228c6100 100644 --- a/module/statistics/campaign_bonus.py +++ b/module/statistics/campaign_bonus.py @@ -2,7 +2,7 @@ from module.base.button import ButtonGrid from module.base.utils import * from module.handler.assets import AUTO_SEARCH_MENU_EXIT from module.statistics.assets import CAMPAIGN_BONUS -from module.statistics.get_items import GetItemsStatistics, ITEM_GROUP +from module.statistics.get_items import ITEM_GROUP, GetItemsStatistics from module.statistics.item import Item from module.statistics.utils import * diff --git a/module/tactical/tactical_class.py b/module/tactical/tactical_class.py index f1f532d96..5803f8767 100644 --- a/module/tactical/tactical_class.py +++ b/module/tactical/tactical_class.py @@ -8,9 +8,10 @@ from module.base.utils import * from module.exception import ScriptError from module.logger import logger from module.map.map_grids import SelectedGrids -from module.ocr.ocr import Duration, DigitCounter +from module.ocr.ocr import DigitCounter, Duration from module.tactical.assets import * -from module.ui.assets import TACTICAL_CHECK, REWARD_GOTO_TACTICAL, REWARD_CHECK, BACK_ARROW +from module.ui.assets import (BACK_ARROW, REWARD_CHECK, REWARD_GOTO_TACTICAL, + TACTICAL_CHECK) from module.ui.ui import UI, page_reward diff --git a/module/ui/navbar.py b/module/ui/navbar.py index 8bef0c941..3e2ffdd0d 100644 --- a/module/ui/navbar.py +++ b/module/ui/navbar.py @@ -1,7 +1,7 @@ -from module.base.button import ButtonGrid from module.base.base import ModuleBase -from module.logger import logger +from module.base.button import ButtonGrid from module.base.timer import Timer +from module.logger import logger class Navbar: diff --git a/module/ui/ui.py b/module/ui/ui.py index 6d8791407..ec2a71d3c 100644 --- a/module/ui/ui.py +++ b/module/ui/ui.py @@ -1,29 +1,71 @@ from module.base.button import Button from module.base.decorator import run_once from module.base.timer import Timer -from module.combat.assets import * -from module.exception import GameNotRunningError, GamePageUnknownError, RequestHumanTakeover -from module.handler.assets import * +from module.combat.assets import GET_ITEMS_1, GET_SHIP +from module.exception import (GameNotRunningError, GamePageUnknownError, + RequestHumanTakeover) +from module.handler.assets import (AUTO_SEARCH_MENU_EXIT, BATTLE_PASS_NOTICE, + GAME_TIPS, LOGIN_ANNOUNCE, LOGIN_CHECK, + LOGIN_RETURN_SIGN, MONTHLY_PASS_NOTICE) from module.handler.info_handler import InfoHandler from module.logger import logger -from module.map.assets import * +from module.map.assets import (FLEET_PREPARATION, MAP_PREPARATION, + MAP_PREPARATION_CANCEL, WITHDRAW) from module.ocr.ocr import Ocr -from module.os_handler.assets import RESET_FLEET_PREPARATION, RESET_TICKET_POPUP, EXCHANGE_CHECK -from module.ui.page import * +from module.os_handler.assets import (EXCHANGE_CHECK, RESET_FLEET_PREPARATION, + RESET_TICKET_POPUP) +from module.ui.assets import (BACK_ARROW, DORM_FEED_CANCEL, DORM_INFO, + DORM_TROPHY_CONFIRM, EVENT_LIST_CHECK, GOTO_MAIN, + MEOWFFICER_INFO, META_CHECK, PLAYER_CHECK, + SHIPYARD_CHECK) +from module.ui.page import (Page, page_academy, page_archives, + page_battle_pass, page_build, page_campaign, + page_campaign_menu, page_commission, page_daily, + page_dorm, page_dormmenu, page_event, + page_event_list, page_exercise, page_fleet, + page_guild, page_main, page_meowfficer, page_meta, + page_mission, page_munitions, page_os, page_raid, + page_research, page_reshmenu, page_reward, + page_shipyard, page_shop, page_sp, + page_supply_pack, page_tactical, page_unknown) + +# from module.ui.page import * class UI(InfoHandler): # All pages defined. ui_pages = [ page_unknown, - page_main, page_fleet, page_guild, page_mission, page_event_list, - page_campaign_menu, page_campaign, page_exercise, page_daily, - page_event, page_sp, page_raid, page_archives, - page_reward, page_commission, page_tactical, page_battle_pass, - page_reshmenu, page_research, page_shipyard, page_meta, - page_dormmenu, page_dorm, page_meowfficer, - page_academy, page_shop, page_munitions, page_supply_pack, page_build, - page_os + page_main, + page_fleet, + page_guild, + page_mission, + page_event_list, + page_campaign_menu, + page_campaign, + page_exercise, + page_daily, + page_event, + page_sp, + page_raid, + page_archives, + page_reward, + page_commission, + page_tactical, + page_battle_pass, + page_reshmenu, + page_research, + page_shipyard, + page_meta, + page_dormmenu, + page_dorm, + page_meowfficer, + page_academy, + page_shop, + page_munitions, + page_supply_pack, + page_build, + page_os, ] ui_current: Page @@ -42,8 +84,17 @@ class UI(InfoHandler): else: return False - def ui_click(self, click_button, check_button, appear_button=None, additional=None, confirm_wait=1, - offset=(30, 30), retry_wait=10, skip_first_screenshot=False): + def ui_click( + self, + click_button, + check_button, + appear_button=None, + additional=None, + confirm_wait=1, + offset=(30, 30), + retry_wait=10, + skip_first_screenshot=False, + ): """ Args: click_button (Button): @@ -55,7 +106,7 @@ class UI(InfoHandler): retry_wait (int, float): skip_first_screenshot (bool): """ - logger.hr('UI click') + logger.hr("UI click") if appear_button is None: appear_button = click_button @@ -68,16 +119,18 @@ class UI(InfoHandler): else: self.device.screenshot() - if (isinstance(check_button, Button) and self.appear(check_button, offset=offset)) \ - or (callable(check_button) and check_button()): + if (isinstance(check_button, Button) and self.appear(check_button, offset=offset)) or ( + callable(check_button) and check_button() + ): if confirm_timer.reached(): break else: confirm_timer.reset() if click_timer.reached(): - if (isinstance(appear_button, Button) and self.appear(appear_button, offset=offset)) \ - or (callable(appear_button) and appear_button()): + if (isinstance(appear_button, Button) and self.appear(appear_button, offset=offset)) or ( + callable(appear_button) and appear_button() + ): self.device.click(click_button) click_timer.reset() continue @@ -94,23 +147,23 @@ class UI(InfoHandler): Returns: Page: """ - logger.info('UI get current page') + logger.info("UI get current page") @run_once def app_check(): if not self.device.app_is_running(): - raise GameNotRunningError('Game not running') + raise GameNotRunningError("Game not running") @run_once def minicap_check(): - if self.config.Emulator_ControlMethod == 'uiautomator2': + if self.config.Emulator_ControlMethod == "uiautomator2": self.device.uninstall_minicap() timeout = Timer(5, count=10).start() while 1: if skip_first_screenshot: skip_first_screenshot = False - if not hasattr(self.device, 'image') or self.device.image is None: + if not hasattr(self.device, "image") or self.device.image is None: self.device.screenshot() else: self.device.screenshot() @@ -124,12 +177,12 @@ class UI(InfoHandler): if page.check_button is None: continue if self.ui_page_appear(page=page): - logger.attr('UI', page.name) + logger.attr("UI", page.name) self.ui_current = page return page # Unknown page but able to handle - logger.info('Unknown ui page') + logger.info("Unknown ui page") if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=2) or self.ui_additional(): timeout.reset() continue @@ -138,14 +191,14 @@ class UI(InfoHandler): minicap_check() # Unknown page, need manual switching - logger.warning('Unknown ui page') - logger.attr('EMULATOR__SCREENSHOT_METHOD', self.config.Emulator_ScreenshotMethod) - logger.attr('EMULATOR__CONTROL_METHOD', self.config.Emulator_ControlMethod) - logger.attr('SERVER', self.config.SERVER) - logger.warning('Starting from current page is not supported') - logger.warning(f'Supported page: {[str(page) for page in self.ui_pages]}') - logger.warning(f'Supported page: Any page with a "HOME" button on the upper-right') - logger.critical('Please switch to a supported page before starting Alas') + logger.warning("Unknown ui page") + logger.attr("EMULATOR__SCREENSHOT_METHOD", self.config.Emulator_ScreenshotMethod) + logger.attr("EMULATOR__CONTROL_METHOD", self.config.Emulator_ControlMethod) + logger.attr("SERVER", self.config.SERVER) + logger.warning("Starting from current page is not supported") + logger.warning(f"Supported page: {[str(page) for page in self.ui_pages]}") + logger.warning('Supported page: Any page with a "HOME" button on the upper-right') + logger.critical("Please switch to a supported page before starting Alas") raise GamePageUnknownError def ui_goto(self, destination, offset=(30, 30), confirm_wait=0, skip_first_screenshot=True): @@ -176,7 +229,7 @@ class UI(InfoHandler): break visited = new - logger.hr(f'UI goto {destination}') + logger.hr(f"UI goto {destination}") confirm_timer = Timer(confirm_wait, count=int(confirm_wait // 0.5)).start() while 1: GOTO_MAIN.clear_offset() @@ -222,13 +275,13 @@ class UI(InfoHandler): Returns: bool: If UI switched. """ - logger.hr('UI ensure') + logger.hr("UI ensure") self.ui_get_current_page(skip_first_screenshot=skip_first_screenshot) if self.ui_current == destination: - logger.info('Already at %s' % destination) + logger.info("Already at %s" % destination) return False else: - logger.info('Goto %s' % destination) + logger.info("Goto %s" % destination) self.ui_goto(destination, skip_first_screenshot=True) return True @@ -244,8 +297,18 @@ class UI(InfoHandler): def ui_goto_sp(self): return self.ui_ensure(destination=page_sp) - def ui_ensure_index(self, index, letter, next_button, prev_button, skip_first_screenshot=False, fast=True, - interval=(0.2, 0.3), step_sleep=(0.2, 0.3), finish_sleep=(0.5, 0.8)): + def ui_ensure_index( + self, + index, + letter, + next_button, + prev_button, + skip_first_screenshot=False, + fast=True, + interval=(0.2, 0.3), + step_sleep=(0.2, 0.3), + finish_sleep=(0.5, 0.8), + ): """ Args: index (int): @@ -258,7 +321,7 @@ class UI(InfoHandler): step_sleep (tuple, int, float): Seconds between two step. finish_sleep (tuple, int, float): Second to wait when arrive. """ - logger.hr('UI ensure index') + logger.hr("UI ensure index") while 1: if skip_first_screenshot: skip_first_screenshot = False @@ -270,7 +333,7 @@ class UI(InfoHandler): else: current = letter(self.device.image) - logger.attr('Index', current) + logger.attr("Index", current) diff = index - current if diff == 0: break @@ -285,8 +348,14 @@ class UI(InfoHandler): self.device.sleep(finish_sleep) def ui_back(self, check_button, appear_button=None, offset=(30, 30), retry_wait=10, skip_first_screenshot=False): - return self.ui_click(click_button=BACK_ARROW, check_button=check_button, appear_button=appear_button, - offset=offset, retry_wait=retry_wait, skip_first_screenshot=skip_first_screenshot) + return self.ui_click( + click_button=BACK_ARROW, + check_button=check_button, + appear_button=appear_button, + offset=offset, + retry_wait=retry_wait, + skip_first_screenshot=skip_first_screenshot, + ) _opsi_reset_fleet_preparation_click = 0 @@ -295,7 +364,7 @@ class UI(InfoHandler): Handle all annoying popups during UI switching. """ # Research popup, lost connection popup - if self.handle_popup_confirm('UI_ADDITIONAL'): + if self.handle_popup_confirm("UI_ADDITIONAL"): return True if self.handle_urgent_commission(): return True @@ -369,10 +438,8 @@ class UI(InfoHandler): # - EXCHANGE_CHECK, click BACK_ARROW if self._opsi_reset_fleet_preparation_click >= 5: logger.critical("Failed to confirm OpSi fleets, too many click on RESET_FLEET_PREPARATION") - logger.critical("Possible reason #1: " - "You haven't set any fleets in operation siren") - logger.critical("Possible reason #1: " - "Your fleets haven't satisfied the level restrictions in operation siren") + logger.critical("Possible reason #1: " "You haven't set any fleets in operation siren") + logger.critical("Possible reason #1: " "Your fleets haven't satisfied the level restrictions in operation siren") raise RequestHumanTakeover if self.appear_then_click(RESET_TICKET_POPUP, offset=(30, 30), interval=3): return True @@ -386,8 +453,7 @@ class UI(InfoHandler): return True # Campaign preparation - if self.appear(MAP_PREPARATION, offset=(30, 30), interval=3) \ - or self.appear(FLEET_PREPARATION, offset=(30, 30), interval=3): + if self.appear(MAP_PREPARATION, offset=(30, 30), interval=3) or self.appear(FLEET_PREPARATION, offset=(30, 30), interval=3): self.device.click(MAP_PREPARATION_CANCEL) return True if self.appear_then_click(AUTO_SEARCH_MENU_EXIT, offset=(200, 30), interval=3): @@ -401,13 +467,13 @@ class UI(InfoHandler): # - Alas switches to page_campaign and retreat from an existing stage # - Game client freezes at page_campaign W12, clicking anywhere on the screen doesn't get responses # - Restart game client again fix the issue - logger.info('WITHDRAW button found, wait until map loaded to prevent bugs in game client') + logger.info("WITHDRAW button found, wait until map loaded to prevent bugs in game client") self.device.sleep(3) if self.appear_then_click(WITHDRAW, offset=(30, 30)): self.interval_reset(WITHDRAW) return True else: - logger.warning('WITHDRAW button does not exist anymore') + logger.warning("WITHDRAW button does not exist anymore") self.interval_reset(WITHDRAW) # Login diff --git a/module/war_archives/war_archives.py b/module/war_archives/war_archives.py index eb8a486d5..3676c3516 100644 --- a/module/war_archives/war_archives.py +++ b/module/war_archives/war_archives.py @@ -2,7 +2,8 @@ from campaign.campaign_war_archives.campaign_base import CampaignBase from module.campaign.run import CampaignRun from module.logger import logger from module.ocr.ocr import DigitCounter -from module.war_archives.assets import OCR_DATA_KEY_CAMPAIGN, WAR_ARCHIVES_CAMPAIGN_CHECK +from module.war_archives.assets import (OCR_DATA_KEY_CAMPAIGN, + WAR_ARCHIVES_CAMPAIGN_CHECK) DATA_KEY_CAMPAIGN = DigitCounter(OCR_DATA_KEY_CAMPAIGN, letter=(255, 247, 247), threshold=64) diff --git a/module/webui/app.py b/module/webui/app.py index 5341c5c3f..6032db6f6 100644 --- a/module/webui/app.py +++ b/module/webui/app.py @@ -5,19 +5,20 @@ import time from datetime import datetime from typing import Dict, List +from pywebio import config as webconfig +from pywebio.exceptions import SessionClosedException +from pywebio.output import (clear, close_popup, popup, put_button, put_buttons, + put_collapse, put_column, put_error, put_html, + put_loading, put_markdown, put_row, put_scope, + put_table, put_text, put_warning, toast, use_scope) +from pywebio.pin import pin, pin_wait_change +from pywebio.session import go_app, info, register_thread, run_js, set_env + import module.webui.lang as lang from module.config.config import AzurLaneConfig, Function -from module.config.utils import ( - alas_instance, - deep_get, - deep_iter, - deep_set, - dict_to_kv, - filepath_args, - filepath_config, - read_file, - write_file, -) +from module.config.utils import (alas_instance, deep_get, deep_iter, deep_set, + dict_to_kv, filepath_args, filepath_config, + read_file, write_file) from module.logger import logger from module.ocr.rpc import start_ocr_server_process, stop_ocr_server_process from module.webui.base import Frame @@ -29,50 +30,12 @@ from module.webui.process_manager import ProcessManager from module.webui.setting import Setting from module.webui.translate import translate from module.webui.updater import updater -from module.webui.utils import ( - Icon, - Switch, - TaskHandler, - add_css, - filepath_css, - get_localstorage, - get_window_visibility_state, - login, - parse_pin_value, - raise_exception, - re_fullmatch, -) -from module.webui.widgets import ( - BinarySwitchButton, - RichLog, - get_output, - put_icon_buttons, - put_none, -) -from pywebio import config as webconfig -from pywebio.exceptions import SessionClosedException -from pywebio.output import ( - clear, - close_popup, - popup, - put_button, - put_buttons, - put_collapse, - put_column, - put_error, - put_html, - put_loading, - put_markdown, - put_row, - put_scope, - put_table, - put_text, - put_warning, - toast, - use_scope, -) -from pywebio.pin import pin, pin_wait_change -from pywebio.session import go_app, info, register_thread, run_js, set_env +from module.webui.utils import (Icon, Switch, TaskHandler, add_css, + filepath_css, get_localstorage, + get_window_visibility_state, login, + parse_pin_value, raise_exception, re_fullmatch) +from module.webui.widgets import (BinarySwitchButton, RichLog, get_output, + put_icon_buttons, put_none) task_handler = TaskHandler() diff --git a/module/webui/base.py b/module/webui/base.py index 6fa77c750..34059ac6f 100644 --- a/module/webui/base.py +++ b/module/webui/base.py @@ -1,7 +1,8 @@ -from module.webui.utils import Icon, WebIOTaskHandler, set_localstorage from pywebio.output import clear, put_html, put_scope, put_text, use_scope from pywebio.session import defer_call, info, run_js +from module.webui.utils import Icon, WebIOTaskHandler, set_localstorage + class Base: def __init__(self) -> None: diff --git a/module/webui/fastapi.py b/module/webui/fastapi.py index 864642a86..689846dfe 100644 --- a/module/webui/fastapi.py +++ b/module/webui/fastapi.py @@ -5,15 +5,11 @@ import asyncio import os import uvicorn -from pywebio.platform.fastapi import ( - STATIC_PATH, - Session, - cdn_validation, - get_free_port, - open_webbrowser_on_server_started, - start_remote_access_service, - webio_routes, -) +from pywebio.platform.fastapi import (STATIC_PATH, Session, cdn_validation, + get_free_port, + open_webbrowser_on_server_started, + start_remote_access_service, + webio_routes) from starlette.applications import Starlette from starlette.middleware import Middleware from starlette.middleware.base import BaseHTTPMiddleware diff --git a/module/webui/pin.py b/module/webui/pin.py index c3f0fcf91..ce4f924aa 100644 --- a/module/webui/pin.py +++ b/module/webui/pin.py @@ -5,7 +5,8 @@ Add **other_html_attrs to put_xxx() from pywebio.io_ctrl import Output from pywebio.output import OutputPosition -from pywebio.pin import check_name, _pin_output +from pywebio.pin import _pin_output, check_name + def put_input(name, type='text', *, label='', value=None, placeholder=None, readonly=None, datalist=None, help_text=None, scope=None, position=OutputPosition.BOTTOM, **other_html_attrs) -> Output: diff --git a/module/webui/process_manager.py b/module/webui/process_manager.py index a5c64db83..5253f4704 100644 --- a/module/webui/process_manager.py +++ b/module/webui/process_manager.py @@ -5,10 +5,11 @@ from multiprocessing import Process from typing import Dict, List from filelock import FileLock +from rich.console import ConsoleRenderable + from module.config.utils import deep_get, filepath_config from module.logger import logger, set_file_logger, set_func_logger from module.webui.setting import Setting -from rich.console import ConsoleRenderable class ProcessManager: diff --git a/module/webui/setting.py b/module/webui/setting.py index 70480f791..1da582099 100644 --- a/module/webui/setting.py +++ b/module/webui/setting.py @@ -1,7 +1,8 @@ import multiprocessing +from multiprocessing.managers import SyncManager + from module.config.config_updater import ConfigUpdater from module.webui.config import WebuiConfig -from multiprocessing.managers import SyncManager class Setting: diff --git a/module/webui/translate.py b/module/webui/translate.py index e30568472..a2de1d712 100644 --- a/module/webui/translate.py +++ b/module/webui/translate.py @@ -1,13 +1,14 @@ # This module is a ton of shit # you'd better close right now -from module.config.utils import (LANGUAGES, deep_get, deep_iter, deep_set, - filepath_i18n, read_file, write_file) -import module.webui.lang as lang from pywebio.input import (actions, checkbox, input, input_group, input_update, select) from pywebio.output import put_buttons, put_markdown from pywebio.session import defer_call, hold, run_js, set_env +import module.webui.lang as lang +from module.config.utils import (LANGUAGES, deep_get, deep_iter, deep_set, + filepath_i18n, read_file, write_file) + def translate(): """ diff --git a/module/webui/utils.py b/module/webui/utils.py index 8b244ecd5..fdd204c6e 100644 --- a/module/webui/utils.py +++ b/module/webui/utils.py @@ -9,8 +9,6 @@ from queue import Queue from typing import Callable, Generator, List import pywebio -from module.logger import logger -from module.webui.setting import Setting from pywebio.input import PASSWORD, input from pywebio.output import PopupSize, popup, put_html, toast from pywebio.session import eval_js @@ -19,6 +17,9 @@ from pywebio.session import register_thread, run_js from rich.console import Console, ConsoleOptions from rich.terminal_theme import TerminalTheme +from module.logger import logger +from module.webui.setting import Setting + RE_DATETIME = ( r"(\d{2}|\d{4})(?:\-)?([0]{1}\d{1}|[1]{1}[0-2]{1})(?:\-)?" + r"([0-2]{1}\d{1}|[3]{1}[0-1]{1})(?:\s)?([0-1]{1}\d{1}|[2]" diff --git a/module/webui/widgets.py b/module/webui/widgets.py index bad218b49..9ae401142 100644 --- a/module/webui/widgets.py +++ b/module/webui/widgets.py @@ -2,20 +2,17 @@ import random import string from typing import Callable, Dict, Generator, List, Union +from pywebio.exceptions import SessionException +from pywebio.output import * +from pywebio.session import eval_js, run_js +from rich.console import ConsoleRenderable + from module.logger import WEB_THEME, Highlighter, HTMLConsole from module.webui.pin import put_checkbox, put_input, put_select, put_textarea from module.webui.process_manager import ProcessManager from module.webui.setting import Setting -from module.webui.utils import ( - DARK_TERMINAL_THEME, - LIGHT_TERMINAL_THEME, - LOG_CODE_FORMAT, - Switch, -) -from pywebio.exceptions import SessionException -from pywebio.output import * -from pywebio.session import eval_js, run_js -from rich.console import ConsoleRenderable +from module.webui.utils import (DARK_TERMINAL_THEME, LIGHT_TERMINAL_THEME, + LOG_CODE_FORMAT, Switch) class ScrollableCode: