1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-18 16:07:18 +08:00

Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"

This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
This commit is contained in:
whoamikyo
2020-08-18 20:47:27 -03:00
parent bdc5aa0720
commit ac9303012c
741 changed files with 8380 additions and 18943 deletions

View File

@@ -5,16 +5,14 @@ from module.logger import logger
MAP = CampaignMap('10-4')
MAP.shape = 'I6'
MAP.camera_data = ['D2', 'D4', 'F2', 'F4']
MAP.camera_data_spawn_point = []
MAP.map_data = """
MAP.map_data = '''
MB ME ME -- ++ MB -- ++ ++
ME ME ++ ME ++ -- Me -- ++
-- __ ME Me ME ++ ME ME --
++ ++ ++ -- ME -- Me ++ ME
SP -- -- Me -- ++ __ ME --
SP -- -- -- Me ++ ME -- MB
"""
ME ME ++ ME ++ -- ME -- ++
-- -- ME ME ME ++ ME ME --
++ ++ ++ -- ME -- ME ++ ME
SP -- -- ME -- ++ -- ME --
SP -- -- -- ME ++ ME -- MB
'''
MAP.weight_data = '''
10 30 30 10 10 10 10 10 10
5 30 10 30 10 10 5 10 10
@@ -25,14 +23,15 @@ MAP.weight_data = '''
'''
MAP.spawn_data = [
{'battle': 0, 'enemy': 4},
{'battle': 1, 'enemy': 2},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 1},
{'battle': 5},
{'battle': 6, 'boss': 1},
]
{'battle': 0, 'enemy': 4},
{'battle': 1, 'enemy': 2},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 1},
{'battle': 5,},
{'battle': 6, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
@@ -42,10 +41,9 @@ A6, B6, C6, D6, E6, F6, G6, H6, I6, \
= MAP.flatten()
step_on = SelectedGrids([E4, D3, G4, C3])
road_main = RoadGrids([D5, E4, D3, C3, A2, G4, H5, G3, G2])
road_main = RoadGrids([[D5, D3], [C3, A2], [E4, G4], [G2, G3, G6]])
roadblocks_d4 = RoadGrids([[D5, E6], E4, D3])
class Config:
INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40
EDGE_LINES_HOUGHLINES_THRESHOLD = 40
@@ -82,8 +80,8 @@ class Campaign(CampaignBase):
def battle_6(self):
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0], fleet='boss'):
if self.clear_potential_roadblocks([road_main]):
if not self.check_accessibility(boss[0], fleet=2):
if self.clear_roadblocks([road_main]):
return True
return self.fleet_2.clear_boss()
return self.fleet_2.clear_boss()