1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-17 04:41:40 +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

@@ -3,30 +3,30 @@ from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
MAP = CampaignMap('12-4')
MAP.shape = 'K8'
MAP.camera_data = ['D2', 'D6', 'H2', 'H6']
MAP.camera_data_spawn_point = []
MAP.map_data = """
MAP.map_data = '''
MB MB ME -- ME ++ ++ ++ MB MB ++
ME ++ -- ME -- MA ++ ++ ME Me ++
-- ME __ Me Me -- Me Me -- Me --
++ -- ME ++ ++ Me ME __ ++ ++ ME
ME ++ -- ME -- MA ++ ++ ME ME ++
-- ME -- ME ME -- ME ME -- ME --
++ -- ME ++ ++ ME ME -- ++ ++ ME
++ ME ME -- ME ME -- ME -- ++ --
++ __ Me Me -- Me ME ++ __ -- ME
ME -- Me -- Me -- Me -- -- ME --
++ -- ME ME -- ME ME ++ -- -- ME
ME -- ME -- ME -- ME -- -- ME --
-- -- -- ME SP SP ++ ++ ++ ME --
"""
MAP.weight_data = """
'''
MAP.weight_data = '''
10 10 10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10 10 20
10 10 10 10 10 10 10 10 10 10 20
10 10 10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10 10 10
"""
'''
MAP.camera_data = ['D3', 'D6', 'H3', 'H6']
MAP.spawn_data = [
{'battle': 0, 'enemy': 2},
{'battle': 1, 'enemy': 2},
@@ -36,6 +36,8 @@ MAP.spawn_data = [
{'battle': 5},
{'battle': 6, 'boss': 1},
]
# MAP.in_map_swipe_preset_data = (2, 1)
A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, K3, \
@@ -46,7 +48,9 @@ A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
= MAP.flatten()
road_main = RoadGrids([[H3, B6, C5]])
# ROAD_MAIN = RoadGrids([[B6, C5]])
road_main = RoadGrids([[B6, C5]])
class Config:
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
@@ -61,9 +65,6 @@ class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.battle_count > 3:
self.pick_up_ammo()
if self.clear_roadblocks([road_main]):
return True
if self.clear_potential_roadblocks([road_main]):
@@ -75,8 +76,8 @@ class Campaign(CampaignBase):
self.pick_up_ammo()
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0], fleet='boss'):
if not self.check_accessibility(boss[0], fleet=1):
if self.clear_roadblocks([road_main]):
return True
return self.fleet_boss.clear_boss()
return self.fleet_1.clear_boss()