Add: Added some icons to GUI

Assets: [EN] updated some templates assets using relative_crop.py
Campaign: Added 12-4 support
Fix: Added camera_data_spawn_point on 7-2 mystery to avoid dont detected a fleet when camera focus on H1
This commit is contained in:
whoamikyo 2020-06-16 00:04:16 -03:00
parent 1ea28dfc86
commit d2d64ee487
12 changed files with 89 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -0,0 +1,83 @@
from module.campaign.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('12-4')
MAP.shape = 'K8'
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 -- ME ME -- ME -- ++ --
++ -- ME ME -- ME ME ++ -- -- ME
ME -- ME -- ME -- ME -- -- ME --
-- -- -- ME SP SP ++ ++ ++ ME --
'''
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
'''
MAP.camera_data = ['D3', 'D6', 'H3', 'H6']
MAP.spawn_data = [
{'battle': 0, 'enemy': 2},
{'battle': 1, 'enemy': 2},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 1},
{'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, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, K4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
= MAP.flatten()
# ROAD_MAIN = RoadGrids([[B6, C5]])
road_main = RoadGrids([[B6, C5]])
class Config:
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (120, 255 - 40),
'width': 2,
'prominence': 10,
'distance': 35,
}
class Campaign(CampaignBase):
MAP = MAP
def battle_0(self):
if self.clear_roadblocks([road_main]):
return True
if self.clear_potential_roadblocks([road_main]):
return True
return self.battle_default()
def battle_6(self):
self.pick_up_ammo()
boss = self.map.select(is_boss=True)
if boss:
if not self.check_accessibility(boss[0], fleet=1):
if self.clear_roadblocks([road_main]):
return True
return self.fleet_1.clear_boss()

View File

@ -15,6 +15,7 @@ A5, B5, C5, D5, E5, F5, G5, H5 = MAP.flatten()
ROAD_MAIN = RoadGrids([A3, [C3, B4, C5], [F1, G2, G3]])
GRIDS_FOR_FASTER = SelectedGrids([A3, C3, E3, G3])
FLEET_2_STEP_ON = SelectedGrids([A3, G3, C3, E3])
MAP.camera_data_spawn_point = ['A1']
class Campaign(CampaignBase):

View File

@ -9,9 +9,9 @@
* The use of a virtual environment (venv) in python is highly recommended
* ADB debugging enabled and emulator with 1280x720 resolution
* **Read the entire guide before asking any questions.**
*
# New installation method
# New installation method (Recommended)
* Just download the file [EasyALAS_CLICK_INSTALL.bat](https://raw.githubusercontent.com/whoamikyo/AzurLaneAutoScript/master/EasyALAS_CLICK_INSTALL.bat), put in some folder and run as administrator (`Right click> Run as administrator`)
* Then it will install everything and download ALAS

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -52,7 +52,7 @@ def update_config_from_template(config, file):
@Gooey(
optional_cols=2,
program_name=pyw_name.capitalize(),
program_name=pyw_name.capitalize(), image_dir='doc/misc.assets',
sidebar_title='功能',
terminal_font_family='Consolas',
language='chinese',

View File

@ -50,7 +50,7 @@ def update_config_from_template(config, file):
@Gooey(
optional_cols=2,
program_name=pyw_name.capitalize(),
program_name=pyw_name.capitalize(), image_dir='doc/misc.assets',
sidebar_title='Function',
terminal_font_family='Consolas',
language='english',

View File

@ -49,7 +49,7 @@ def update_config_from_template(config, file):
@Gooey(
optional_cols=2,
program_name=pyw_name.capitalize(),
program_name=pyw_name.capitalize(), image_dir='doc/misc.assets',
sidebar_title='Function',
terminal_font_family='Consolas',
language='english',