diff --git a/campaign/event_20200603_en/sp1.py b/campaign/event_20200603_en/sp1.py index fc2b4020a..37626d25f 100644 --- a/campaign/event_20200603_en/sp1.py +++ b/campaign/event_20200603_en/sp1.py @@ -26,7 +26,7 @@ MAP.spawn_data = [ class Config: SUBMARINE = 0 - FLEET_BOSS = 1 + FLEET_BOSS = 0 MAP_HAS_AMBUSH = False diff --git a/campaign/event_20200603_en/sp2.py b/campaign/event_20200603_en/sp2.py new file mode 100644 index 000000000..20784d645 --- /dev/null +++ b/campaign/event_20200603_en/sp2.py @@ -0,0 +1,52 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + + +MAP = CampaignMap('sp2') +MAP.shape = 'g7' +MAP.camera_data = ['D3', 'D5'] +MAP.map_data = ''' + ++ ++ -- ME -- ME MB + MS ++ -- -- ME -- MB + ME -- ME -- ++ ++ ++ + -- -- -- ME -- ME MB + -- -- ++ -- ++ ME -- + SP SP -- -- ++ -- ME + ++ SP -- ME -- ME -- +''' + +A1, B1, C1, D1, E1, F1, G1, \ +A2, B2, C2, D2, E2, F2, G2, \ +A3, B3, C3, D3, E3, F3, G3, \ +A4, B4, C4, D4, E4, F4, G4, \ +A5, B5, C5, D5, E5, F5, G5, \ +A6, B6, C6, D6, E6, F6, G6, \ +A7, B7, C7, D7, E7, F7, G7, \ + = MAP.flatten() + +MAP.spawn_data = [ + {'battle': 0, 'enemy': 3}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 1}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'boss': 1}, +] + + +class Config: + SUBMARINE = 0 + FLEET_BOSS = 0 + MAP_HAS_AMBUSH = False + + +class Campaign(CampaignBase): + MAP = MAP + + def battle_0(self): + return self.battle_default() + + + def battle_4(self): + return self.brute_clear_boss() diff --git a/dev_tools/Flatten_generator.py b/dev_tools/Flatten_generator.py index 1c736f220..378014500 100644 --- a/dev_tools/Flatten_generator.py +++ b/dev_tools/Flatten_generator.py @@ -1,4 +1,4 @@ -shape = 'K7' +shape = 'G7' def location2node(location): return chr(location[0] + 64 + 1) + str(location[1] + 1) def node2location(node):