diff --git a/config/template.json b/config/template.json index 7499d60d1..021f421cd 100644 --- a/config/template.json +++ b/config/template.json @@ -124,7 +124,8 @@ "RetireMode": "one_click_retire" }, "OneClickRetire": { - "KeepLimitBreak": "keep_limit_break" + "KeepLimitBreak": "keep_limit_break", + "modify_one_click_retire": "do_not_modify" }, "Enhance": { "ShipToEnhance": "all", diff --git a/module/config/argument/args.json b/module/config/argument/args.json index a22000380..25016cf1f 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -567,6 +567,14 @@ "keep_limit_break", "do_not_keep" ] + }, + "modify_one_click_retire": { + "type": "select", + "value": "do_not_modify", + "option": [ + "do_not_modify", + "modify" + ] } }, "Enhance": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 80f50f396..5dcef7841 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -200,6 +200,9 @@ OneClickRetire: KeepLimitBreak: value: keep_limit_break option: [ keep_limit_break, do_not_keep ] + modify_one_click_retire: + value: do_not_modify + option: [ do_not_modify, modify ] Enhance: ShipToEnhance: value: all diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 54fb9f9a9..3023965eb 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -132,6 +132,7 @@ class GeneratedConfig: # Group `OneClickRetire` OneClickRetire_KeepLimitBreak = 'keep_limit_break' # keep_limit_break, do_not_keep + OneClickRetire_modify_one_click_retire = 'do_not_modify' # do_not_modify, modify # Group `Enhance` Enhance_ShipToEnhance = 'all' # all, favourite diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index f75ed0a8e..894359be1 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -895,6 +895,12 @@ "help": "If you own multiple copies of a ship that has not been fully Limit Broken, this option determines what you want to do with those copies.\nIf one-click retire cannot retire ships, please set to \"Don't Keep\"", "keep_limit_break": "Keep Enough to Max LB", "do_not_keep": "Don't Keep" + }, + "modify_one_click_retire": { + "name": "Try to modify one-click retire settings", + "help": "If one-click retire cannot retire ships, it will try to modify its settings", + "do_not_modify": "Do not modify", + "modify": "Try to modify" } }, "Enhance": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index e07d0227a..347e17b26 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -895,6 +895,12 @@ "help": "OneClickRetire.KeepLimitBreak.help", "keep_limit_break": "keep_limit_break", "do_not_keep": "do_not_keep" + }, + "modify_one_click_retire": { + "name": "一括退役設定の修正を試みる", + "help": "一括退役が実行できない場合、設定の修正を試みます", + "do_not_modify": "修正しない", + "modify": "修正を試みる" } }, "Enhance": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index dcba10540..10f8958df 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -895,6 +895,12 @@ "help": "没有满星的同名舰船时,保留几艘符合退役条件的同名舰船\n如果一键退役无法退役,请设置为 \"不保留\"", "keep_limit_break": "保留满星所需", "do_not_keep": "不保留" + }, + "modify_one_click_retire": { + "name": "尝试矫正一键退役设置", + "help": "如果一键退役无法退役,则会尝试修改其设置", + "do_not_modify": "不修改", + "modify": "尝试矫正" } }, "Enhance": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 9b1141219..da3e28d9b 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -895,6 +895,12 @@ "help": "沒有滿星的同名艦船時,保留幾艘符合退役條件的同名艦船\n如果一鍵退役無法退役,請設定為 \"不保留\"", "keep_limit_break": "保留滿星所需", "do_not_keep": "不保留" + }, + "modify_one_click_retire": { + "name": "嘗試矯正一鍵退役設定", + "help": "如果一鍵退役無法退役,則會嘗試修改其設定", + "do_not_modify": "不修改", + "modify": "嘗試矯正" } }, "Enhance": { diff --git a/module/retire/setting.py b/module/retire/setting.py index 48eea60df..805763bbd 100644 --- a/module/retire/setting.py +++ b/module/retire/setting.py @@ -95,4 +95,4 @@ class QuickRetireSettingHandler(UI): """ Fallback to the correct quick retire settings if user has wrong set. """ - return self.config.SERVER in ['cn', 'en', 'jp'] + return self.config.SERVER in ['cn', 'en', 'jp'] and self.config.OneClickRetire_modify_one_click_retire == 'modify'