From 4f60aecd586035c12711bdb514be51d9761bae12 Mon Sep 17 00:00:00 2001 From: sui-feng-cb <2518179942@qq.com> Date: Mon, 27 Jul 2026 04:20:51 +0800 Subject: [PATCH] Upd: scuttle settings --- config/template.json | 4 ++-- module/coalition/scuttle.py | 4 ++-- module/config/argument/args.json | 4 ++-- module/config/argument/argument.yaml | 6 +----- module/config/argument/task.yaml | 4 ++-- module/config/config_generated.py | 7 ++----- module/config/i18n/en-US.json | 16 ++-------------- module/config/i18n/ja-JP.json | 22 +++++----------------- module/config/i18n/zh-CN.json | 16 ++-------------- module/config/i18n/zh-TW.json | 16 ++-------------- module/raid/scuttle.py | 4 ++-- 11 files changed, 24 insertions(+), 79 deletions(-) diff --git a/config/template.json b/config/template.json index eb35aa79f..a876a6b15 100644 --- a/config/template.json +++ b/config/template.json @@ -769,7 +769,7 @@ "FailureInterval": 120, "ServerUpdate": "00:00" }, - "RaidScuttle": { + "Scuttle": { "Sacrifice": "vanguard" }, "Raid": { @@ -843,7 +843,7 @@ "FailureInterval": 30, "ServerUpdate": "00:00" }, - "CoalitionScuttle": { + "Scuttle": { "Sacrifice": "vanguard" }, "Campaign": { diff --git a/module/coalition/scuttle.py b/module/coalition/scuttle.py index 8eb64571c..63625b72b 100644 --- a/module/coalition/scuttle.py +++ b/module/coalition/scuttle.py @@ -90,11 +90,11 @@ class CoalitionScuttleRun(Coalition, CoalitionScuttleCombat, Dock): @property def change_vanguard(self): - return 'vanguard' in self.config.CoalitionScuttle_Sacrifice + return 'vanguard' in self.config.Scuttle_Sacrifice @property def change_flagship(self): - return 'flagship' in self.config.CoalitionScuttle_Sacrifice + return 'flagship' in self.config.Scuttle_Sacrifice def triggered_stop_condition(self, pt_check=False, oil_check=False, coin_check=False): if self.triggered_normal_end: diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 7f22a3740..5dd286a87 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3853,7 +3853,7 @@ "display": "hide" } }, - "RaidScuttle": { + "Scuttle": { "Sacrifice": { "type": "select", "value": "vanguard", @@ -4291,7 +4291,7 @@ "display": "hide" } }, - "CoalitionScuttle": { + "Scuttle": { "Sacrifice": { "type": "select", "value": "vanguard", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 334e72a75..4404e21a1 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -348,10 +348,6 @@ Raid: value: hard option: [ easy, normal, hard, ex ] UseTicket: false -RaidScuttle: - Sacrifice: - value: vanguard - option: [ vanguard, flagship ] RaidDaily: StageFilter: |- hard > normal > easy @@ -366,7 +362,7 @@ HospitalEvent: option: [ T1, T2, T3, T4, ESP ] MaritimeEscort: Enable: true -CoalitionScuttle: +Scuttle: Sacrifice: value: vanguard option: [ vanguard, flagship ] diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 16fb69ab8..d0c6e80b7 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -108,7 +108,7 @@ Event: - Emotion RaidScuttle: - Scheduler - - RaidScuttle + - Scuttle - Raid - Campaign - StopCondition @@ -117,7 +117,7 @@ Event: - Emotion CoalitionScuttle: - Scheduler - - CoalitionScuttle + - Scuttle - Campaign - Coalition - StopCondition diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 2e87b2398..ea568c995 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -200,9 +200,6 @@ class GeneratedConfig: Raid_Mode = 'hard' # easy, normal, hard, ex Raid_UseTicket = False - # Group `RaidScuttle` - RaidScuttle_Sacrifice = 'vanguard' # vanguard, flagship - # Group `RaidDaily` RaidDaily_StageFilter = 'hard > normal > easy' @@ -216,8 +213,8 @@ class GeneratedConfig: # Group `MaritimeEscort` MaritimeEscort_Enable = True - # Group `CoalitionScuttle` - CoalitionScuttle_Sacrifice = 'vanguard' # vanguard, flagship + # Group `Scuttle` + Scuttle_Sacrifice = 'vanguard' # vanguard, flagship # Group `Coalition` Coalition_Mode = 'hard' # easy, normal, hard, sp diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index d021db4e8..84546927c 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1445,18 +1445,6 @@ "help": "" } }, - "RaidScuttle": { - "_info": { - "name": "Raid Scuttle", - "help": "" - }, - "Sacrifice": { - "name": "Ship to sacrifice", - "help": "", - "vanguard": "Vanguard", - "flagship": "Flagship" - } - }, "RaidDaily": { "_info": { "name": "Raid Daily Settings", @@ -1509,9 +1497,9 @@ "help": "" } }, - "CoalitionScuttle": { + "Scuttle": { "_info": { - "name": "Coalition Scuttle", + "name": "Scuttle Settings", "help": "" }, "Sacrifice": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index dade4b1a8..d026f070c 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1445,18 +1445,6 @@ "help": "Raid.UseTicket.help" } }, - "RaidScuttle": { - "_info": { - "name": "RaidScuttle._info.name", - "help": "RaidScuttle._info.help" - }, - "Sacrifice": { - "name": "RaidScuttle.Sacrifice.name", - "help": "RaidScuttle.Sacrifice.help", - "vanguard": "vanguard", - "flagship": "flagship" - } - }, "RaidDaily": { "_info": { "name": "RaidDaily._info.name", @@ -1509,14 +1497,14 @@ "help": "MaritimeEscort.Enable.help" } }, - "CoalitionScuttle": { + "Scuttle": { "_info": { - "name": "CoalitionScuttle._info.name", - "help": "CoalitionScuttle._info.help" + "name": "Scuttle._info.name", + "help": "Scuttle._info.help" }, "Sacrifice": { - "name": "CoalitionScuttle.Sacrifice.name", - "help": "CoalitionScuttle.Sacrifice.help", + "name": "Scuttle.Sacrifice.name", + "help": "Scuttle.Sacrifice.help", "vanguard": "vanguard", "flagship": "flagship" } diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index bdb4f0e3d..00e8be214 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1445,18 +1445,6 @@ "help": "" } }, - "RaidScuttle": { - "_info": { - "name": "共斗沉船", - "help": "" - }, - "Sacrifice": { - "name": "牺牲船位置", - "help": "", - "vanguard": "前排", - "flagship": "旗舰" - } - }, "RaidDaily": { "_info": { "name": "共斗每日", @@ -1509,9 +1497,9 @@ "help": "" } }, - "CoalitionScuttle": { + "Scuttle": { "_info": { - "name": "协斗沉船", + "name": "沉船设置", "help": "" }, "Sacrifice": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 39b5848da..6ecbe8682 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1445,18 +1445,6 @@ "help": "" } }, - "RaidScuttle": { - "_info": { - "name": "共鬥鑿船", - "help": "" - }, - "Sacrifice": { - "name": "牺牲船位置", - "help": "", - "vanguard": "前排", - "flagship": "旗舰" - } - }, "RaidDaily": { "_info": { "name": "共鬥每日", @@ -1509,9 +1497,9 @@ "help": "" } }, - "CoalitionScuttle": { + "Scuttle": { "_info": { - "name": "協鬥鑿船", + "name": "鑿船設定", "help": "" }, "Sacrifice": { diff --git a/module/raid/scuttle.py b/module/raid/scuttle.py index 1b5aef3ce..70af70c51 100644 --- a/module/raid/scuttle.py +++ b/module/raid/scuttle.py @@ -71,11 +71,11 @@ class RaidScuttleRun(RaidRun, RaidScuttleCombat, Dock): @property def change_vanguard(self): - return 'vanguard' in self.config.RaidScuttle_Sacrifice + return 'vanguard' in self.config.Scuttle_Sacrifice @property def change_flagship(self): - return 'flagship' in self.config.RaidScuttle_Sacrifice + return 'flagship' in self.config.Scuttle_Sacrifice def triggered_stop_condition(self, oil_check=False, pt_check=False, coin_check=False): if self.triggered_normal_end: