sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-13 11:27:01 +08:00
Code Activity

Add: Capability for Config decorator to replace func pointer based on options

Browse Source 
Add: [EN] HP check within OS map after zone clear for os_world_clear module
Retreat for repair if any one ship below configured threshold
This commit is contained in:
nEEtdo0d
2021-05-14 21:15:57 -04:00
parent 43ee1f35fe
commit 4d1f31f4ba
7 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
module/config/argparser_en.py
View File

@@ -581,14 +581,22 @@ def main(ini_name=''):
# ==========OS clear world==========
os_world_parser = subs.add_parser('os_world_clear')
os_world = os_world_parser.add_argument_group('os_world_clear', 'Explore all unsafe zones and turn into safe', gooey_options={'label_color': '#931D03'})
os_world.add_argument('--os_world_max_level', default=default('--os_world_max_level'),
help='Stop unsafe exploration after completing all zones of at '
'least the configured hazard level. '
'Recommended 4 or lower for single fleet clear, 5 and higher '
'tend to be more difficult depending on adaptibility numbers',
os_world = os_world_parser.add_argument_group('OS world clear', 'Explore all unsafe zones between configured range inclusive and turn into safe\n'
'Captains should configure approriately based on current adaptibility numbers and needs',
gooey_options={'label_color': '#931D03'})
os_world.add_argument('--os_world_min_level', default=default('--os_world_min_level'),
help='No less than 1\n'
'Use same number in both fields for exactly 1 range',
gooey_options={'label_color': '#4B5F83'})
os_world.add_argument('--os_world_repair_after_clear', default=default('--os_world_repair_after_clear'), help='Number of zone clears before retreating to port for repair', gooey_options={'label_color': '#4B5F83'})
os_world.add_argument('--os_world_max_level', default=default('--os_world_max_level'),
help='No higher than 7\n'
'Recommend 4 or lower for single fleet clear, 5 and higher '
'can be difficult with low adaptibility',
gooey_options={'label_color': '#4B5F83'})
os_world.add_argument('--enable_os_world_repair', default=default('--enable_os_world_repair'), choices=['yes', 'no'],
help='Enable retreat to nearest azur port for repair if any one ship in fleet below configured threshold',
gooey_options={'label_color': '#4B5F83'})
os_world.add_argument('--os_world_repair_threshold', default=default('--os_world_repair_threshold'), help='Limit between 0 and 1', gooey_options={'label_color': '#4B5F83'})
# ==========OS fully auto==========
os_parser = subs.add_parser('os_fully_auto')

8
module/config/config.py
View File

@@ -513,8 +513,10 @@ class AzurLaneConfig:
"""
Os_world_clear
"""
OS_WORLD_MIN_LEVEL = 1
OS_WORLD_MAX_LEVEL = 4
OS_WORLD_REPAIR_AFTER_CLEAR = 3
ENABLE_OS_WORLD_REPAIR = True
OS_WORLD_REPAIR_THRESHOLD = 0.4
"""
module.os
@@ -813,8 +815,10 @@ class AzurLaneConfig:
# OS clear world
option = config['Os_world_clear']
self.OS_WORLD_MIN_LEVEL = int(option['os_world_min_level'])
self.OS_WORLD_MAX_LEVEL = int(option['os_world_max_level']) + 1
self.OS_WORLD_REPAIR_AFTER_CLEAR = int(option['os_world_repair_after_clear'])
self.ENABLE_OS_WORLD_REPAIR = to_bool(option['enable_os_world_repair'])
self.OS_WORLD_REPAIR_THRESHOLD = float(option['os_world_repair_threshold'])
# OS fully auto
option = config['Os_fully_auto']

4
module/config/dictionary.py
View File

@@ -237,8 +237,10 @@ dic_true_eng_to_eng = {
'ammo_pick_up_124': 'ammo_pick_up_124',
'default_serial_list': 'default_serial_list',
'enable_os_semi_story_skip': 'enable_os_semi_story_skip',
'os_world_min_level': 'os_world_min_level',
'os_world_max_level': 'os_world_max_level',
'os_world_repair_after_clear': 'os_world_repair_after_clear',
'enable_os_world_repair': 'enable_os_world_repair',
'os_world_repair_threshold': 'os_world_repair_threshold',
'do_os_in_daily': 'do_os_in_daily',
'enable_os_mission_accept': 'enable_os_mission_accept',
'enable_os_mission_finish': 'enable_os_mission_finish',