Add: Entrance of auto search, but not fully supported yet

- Add: Option ENABLE_FLEET_REVERSE_IN_HARD
2026-03-16 17:27:22 +08:00 · 2021-01-22 23:50:44 +08:00
parent 237c871d7d
commit 8e9e62bb27
11 changed files with 212 additions and 5 deletions
--- a/module/config/argparser.py
+++ b/module/config/argparser.py
@@ -152,6 +152,9 @@ def main(ini_name=''):
    # 出击舰队
    fleet = setting_parser.add_argument_group('出击舰队', '非活动图或周回模式会忽略步长设置', gooey_options={'label_color': '#931D03'})
    fleet.add_argument('--启用阵容锁定', default=default('--启用阵容锁定'), choices=['是', '否'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--启用困难图舰队反转', default=default('--启用困难图舰队反转'), choices=['是', '否'], help='使用二队打道中, 一队打BOSS, 仅困难图和活动困难图生效', gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--启用自律寻敌', default=default('--启用自律寻敌'), choices=['是', '否'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--自律寻敌设置', default=default('--自律寻敌设置'), choices=['一队道中二队BOSS', '一队BOSS二队道中', '一队全部二队待机', '一队待机二队全部'], gooey_options={'label_color': '#4B5F83'})

    f1 = fleet.add_argument_group('道中队', gooey_options={'label_color': '#931D03'})
    f1.add_argument('--舰队编号1', default=default('--舰队编号1'), choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})
--- a/module/config/argparser_en.py
+++ b/module/config/argparser_en.py
@@ -153,6 +153,9 @@ def main(ini_name=''):
    # 出击舰队
    fleet = setting_parser.add_argument_group('Attack fleet', 'Fleet step enables only in event maps without clear mode', gooey_options={'label_color': '#931D03'})
    fleet.add_argument('--enable_map_fleet_lock', default=default('--enable_map_fleet_lock'), choices=['yes', 'no'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--enable_fleet_reverse_in_hard', default=default('--enable_fleet_reverse_in_hard'), choices=['yes', 'no'], help='Use fleet 2 for mobs, fleet 1 for boss, only enabled in hard mode and event hard', gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--enable_auto_search', default=default('--enable_auto_search'), choices=['yes', 'no'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--auto_search_setting', default=default('--auto_search_setting'), choices=['fleet1_mob_fleet2_boss', 'fleet1_boss_fleet2_mob', 'fleet1_all_fleet2_standby', 'fleet1_standby_fleet2_all'], gooey_options={'label_color': '#4B5F83'})

    f1 = fleet.add_argument_group('Mob Fleet', 'Players can choose a formation before battle. Though it has no effect appearance-wise, the formations applies buffs to certain stats.\nLine Ahead: Increases Firepower and Torpedo by 15%, but reduces Evasion by 10% (Applies only to Vanguard fleet)\nDouble Line: Increases Evasion by 30%, but decreases Firepower and Torpedo by 5% (Applies only to Vanguard fleet)\nDiamond: Increases Anti-Air by 20% (no penalties, applies to entire fleet)', gooey_options={'label_color': '#4B5F83'})
    f1.add_argument('--fleet_index_1', default=default('--fleet_index_1'), choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})
--- a/module/config/argparser_jp.py
+++ b/module/config/argparser_jp.py
@@ -153,6 +153,9 @@ def main(ini_name=''):
    # 出击舰队
    fleet = setting_parser.add_argument_group('Attack fleet', 'Fleet step enables only in event maps without clear mode', gooey_options={'label_color': '#931D03'})
    fleet.add_argument('--enable_map_fleet_lock', default=default('--enable_map_fleet_lock'), choices=['yes', 'no'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--enable_fleet_reverse_in_hard', default=default('--enable_fleet_reverse_in_hard'), choices=['yes', 'no'], help='Use fleet 2 for mobs, fleet 1 for boss, only enabled in hard mode and event hard', gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--enable_auto_search', default=default('--enable_auto_search'), choices=['yes', 'no'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--auto_search_setting', default=default('--auto_search_setting'), choices=['fleet1_mob_fleet2_boss', 'fleet1_boss_fleet2_mob', 'fleet1_all_fleet2_standby', 'fleet1_standby_fleet2_all'], gooey_options={'label_color': '#4B5F83'})

    f1 = fleet.add_argument_group('Mob Fleet', 'Players can choose a formation before battle. Though it has no effect appearance-wise, the formations applies buffs to certain stats.\nLine Ahead: Increases Firepower and Torpedo by 15%, but reduces Evasion by 10% (Applies only to Vanguard fleet)\nDouble Line: Increases Evasion by 30%, but decreases Firepower and Torpedo by 5% (Applies only to Vanguard fleet)\nDiamond: Increases Anti-Air by 20% (no penalties, applies to entire fleet)', gooey_options={'label_color': '#4B5F83'})
    f1.add_argument('--fleet_index_1', default=default('--fleet_index_1'), choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})
--- a/module/config/argparser_tw.py
+++ b/module/config/argparser_tw.py
@@ -152,6 +152,9 @@ def main(ini_name=''):
    # 出擊艦隊
    fleet = setting_parser.add_argument_group('出擊艦隊', '非活動圖或周回模式會忽略步長設定', gooey_options={'label_color': '#931D03'})
    fleet.add_argument('--啟用陣容鎖定', default=default('--啟用陣容鎖定'), choices=['是', '否'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--啟用困難圖艦隊反轉', default=default('--啟用困難圖艦隊反轉'), choices=['是', '否'], help='使用二隊打道中, 一隊打BOSS, 僅困難圖和活動困難圖生效', gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--啟用自律尋敵', default=default('--啟用自律尋敵'), choices=['是', '否'], gooey_options={'label_color': '#4B5F83'})
+    fleet.add_argument('--自律尋敵設置', default=default('--自律尋敵設置'), choices=['一隊道中二隊BOSS', '一隊BOSS二隊道中', '一隊全部二隊待機', '一隊待機二隊全部'], gooey_options={'label_color': '#4B5F83'})

    f1 = fleet.add_argument_group('道中隊', gooey_options={'label_color': '#931D03'})
    f1.add_argument('--艦隊編號1', default=default('--艦隊編號1'), choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})
--- a/module/config/config.py
+++ b/module/config/config.py
@@ -31,7 +31,12 @@ class AzurLaneConfig:
    """
    Fleet
    """
-    ENABLE_FLEET_CONTROL = True
+    ENABLE_FLEET_CONTROL = True  # Deprecated, must enable
+    ENABLE_MAP_FLEET_LOCK = True
+    ENABLE_FLEET_REVERSE_IN_HARD = False
+    ENABLE_AUTO_SEARCH = False
+    # fleet1_mob_fleet2_boss, fleet1_boss_fleet2_mob, fleet1_all_fleet2_standby, fleet1_standby_fleet2_all
+    AUTO_SEARCH_SETTING = 'fleet1_mob_fleet2_boss'
    # Fleet 1-6, if empty use 0.
    FLEET_1 = 1
    FLEET_2 = 2
@@ -68,7 +73,6 @@ class AzurLaneConfig:
    module.combat
    """
    ENABLE_SAVE_GET_ITEMS = True
-    ENABLE_MAP_FLEET_LOCK = True
    SUBMARINE_MODE = ''
    SUBMARINE_CALL_AT_BOSS = False
    COMBAT_SCREENSHOT_INTERVAL = 2
@@ -100,7 +104,6 @@ class AzurLaneConfig:

    ENABLE_STOP_CONDITION = True
    ENABLE_FAST_FORWARD = True
-    ENABLE_AUTO_SEARCH = False
    STOP_IF_OIL_LOWER_THAN = 5000
    STOP_IF_COUNT_GREATER_THAN = 0
    STOP_IF_TIME_REACH = 0
@@ -565,6 +568,9 @@ class AzurLaneConfig:
        self.STOP_IF_GET_SHIP = to_bool(option['if_get_ship'])
        # Fleet
        self.ENABLE_MAP_FLEET_LOCK = to_bool(option['enable_map_fleet_lock'])
+        self.ENABLE_FLEET_REVERSE_IN_HARD = to_bool(option['enable_fleet_reverse_in_hard'])
+        self.ENABLE_AUTO_SEARCH = to_bool(option['enable_auto_search'])
+        self.AUTO_SEARCH_SETTING = option['auto_search_setting']
        for n in ['1', '2']:
            self.__setattr__(f'FLEET_{n}', int(option[f'fleet_index_{n}']) if to_bool(option[f'fleet_index_{n}']) else 0)
            self.__setattr__(f'FLEET_{n}_FORMATION', int(option[f'fleet_formation_{n}'].split('_')[1]))
--- a/module/config/dictionary.py
+++ b/module/config/dictionary.py
@@ -60,6 +60,9 @@ dic_true_eng_to_eng = {
    'if_map_reach': 'if_map_reach',
    'if_get_ship': 'if_get_ship',
    'enable_map_fleet_lock': 'enable_map_fleet_lock',
+    'enable_fleet_reverse_in_hard': 'enable_fleet_reverse_in_hard',
+    'enable_auto_search': 'enable_auto_search',
+    'auto_search_setting': 'auto_search_setting',
    'fleet_index_1': 'fleet_index_1',
    'fleet_formation_1': 'fleet_formation_1',
    'fleet_auto_mode_1': 'fleet_auto_mode_1',
@@ -231,6 +234,10 @@ dic_true_eng_to_eng = {
    # Option
    'yes': 'yes',
    'no': 'no',
+    'fleet1_mob_fleet2_boss': 'fleet1_mob_fleet2_boss',
+    'fleet1_boss_fleet2_mob': 'fleet1_boss_fleet2_mob',
+    'fleet1_all_fleet2_standby': 'fleet1_all_fleet2_standby',
+    'fleet1_standby_fleet2_all': 'fleet1_standby_fleet2_all',
    'Line Ahead': 'formation_1',
    'Double Line': 'formation_2',
    'Diamond': 'formation_3',
@@ -327,6 +334,9 @@ dic_chi_to_eng = {
    '如果地图开荒': 'if_map_reach',
    '如果获得新船': 'if_get_ship',
    '启用阵容锁定': 'enable_map_fleet_lock',
+    '启用困难图舰队反转': 'enable_fleet_reverse_in_hard',
+    '启用自律寻敌': 'enable_auto_search',
+    '自律寻敌设置': 'auto_search_setting',
    '舰队编号1': 'fleet_index_1',
    '舰队阵型1': 'fleet_formation_1',
    '自律模式1': 'fleet_auto_mode_1',
@@ -498,6 +508,10 @@ dic_chi_to_eng = {
    # Option
    '是': 'yes',
    '否': 'no',
+    '一队道中二队BOSS': 'fleet1_mob_fleet2_boss',
+    '一队BOSS二队道中': 'fleet1_boss_fleet2_mob',
+    '一队全部二队待机': 'fleet1_all_fleet2_standby',
+    '一队待机二队全部': 'fleet1_standby_fleet2_all',
    '单纵阵': 'formation_1',
    '复纵阵': 'formation_2',
    '轮形阵': 'formation_3',
@@ -594,6 +608,9 @@ dic_tchi_to_eng = {
    '如果地圖開荒': 'if_map_reach',
    '如果獲得新船': 'if_get_ship',
    '啟用陣容鎖定': 'enable_map_fleet_lock',
+    '啟用困難圖艦隊反轉': 'enable_fleet_reverse_in_hard',
+    '啟用自律尋敵': 'enable_auto_search',
+    '自律尋敵設置': 'auto_search_setting',
    '艦隊編號1': 'fleet_index_1',
    '艦隊陣型1': 'fleet_formation_1',
    '自律模式1': 'fleet_auto_mode_1',
@@ -765,6 +782,10 @@ dic_tchi_to_eng = {
    # Option
    '是': 'yes',
    '否': 'no',
+    '一隊道中二隊BOSS': 'fleet1_mob_fleet2_boss',
+    '一隊BOSS二隊道中': 'fleet1_boss_fleet2_mob',
+    '一隊全部二隊待機': 'fleet1_all_fleet2_standby',
+    '一隊待機二隊全部': 'fleet1_standby_fleet2_all',
    '單縱陣': 'formation_1',
    '復縱陣': 'formation_2',
    '輪型陣': 'formation_3',