From cc4ec5d32096670f1d923552b69690b5a00a4ac5 Mon Sep 17 00:00:00 2001 From: positnuec <93694981+positnuec@users.noreply.github.com> Date: Sun, 15 Feb 2026 17:40:54 +0800 Subject: [PATCH] Add: Control CL1 record independently --- module/config/argument/args.json | 10 ++++++++++ module/config/argument/argument.yaml | 3 +++ module/config/config_generated.py | 1 + module/config/i18n/en-US.json | 8 ++++++++ module/config/i18n/ja-JP.json | 8 ++++++++ module/config/i18n/zh-CN.json | 8 ++++++++ module/config/i18n/zh-TW.json | 8 ++++++++ module/os/map.py | 6 ++++-- 8 files changed, 50 insertions(+), 2 deletions(-) diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 5c8c28933..190acf1bf 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -491,6 +491,16 @@ "save_and_upload" ] }, + "CL1Record": { + "type": "select", + "value": "do_not", + "option": [ + "do_not", + "save", + "upload", + "save_and_upload" + ] + }, "AkashiRecord": { "type": "select", "value": "do_not", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index bb8a7e28b..6796e3780 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -114,6 +114,9 @@ DropRecord: OpsiRecord: value: do_not option: [ do_not, save, upload, save_and_upload ] + CL1Record: + value: do_not + option: [ do_not, save, upload, save_and_upload ] AkashiRecord: value: do_not option: [ do_not, save ] diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 499116fca..9efde7720 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -52,6 +52,7 @@ class GeneratedConfig: DropRecord_CommissionRecord = 'do_not' # do_not, save, upload, save_and_upload DropRecord_CombatRecord = 'do_not' # do_not, save DropRecord_OpsiRecord = 'do_not' # do_not, save, upload, save_and_upload + DropRecord_CL1Record = 'do_not' # do_not, save, upload, save_and_upload DropRecord_AkashiRecord = 'do_not' # do_not, save DropRecord_MeowfficerBuy = 'do_not' # do_not, save DropRecord_MeowfficerTalent = 'do_not' # do_not, save, upload, save_and_upload diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index fae9be518..521c21e50 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -592,6 +592,14 @@ "upload": "Upload", "save_and_upload": "Save and upload" }, + "CL1Record": { + "name": "CL1 Record", + "help": "Whether to save CL1 drop screenshots is controlled independently by this option", + "do_not": "Do nothing", + "save": "Save", + "upload": "Upload", + "save_and_upload": "Save and upload" + }, "AkashiRecord": { "name": "Opsi Akashi Shop Record", "help": "", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 8d0fa1b0d..bc71d387f 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -592,6 +592,14 @@ "upload": "upload", "save_and_upload": "save_and_upload" }, + "CL1Record": { + "name": "DropRecord.CL1Record.name", + "help": "DropRecord.CL1Record.help", + "do_not": "do_not", + "save": "save", + "upload": "upload", + "save_and_upload": "save_and_upload" + }, "AkashiRecord": { "name": "DropRecord.AkashiRecord.name", "help": "DropRecord.AkashiRecord.help", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index c038382d1..e8c066f1b 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -592,6 +592,14 @@ "upload": "上传", "save_and_upload": "保存并上传" }, + "CL1Record": { + "name": "侵蚀一掉落截图", + "help": "是否保存侵蚀一掉落截图由该选项单独控制,与 “大世界掉落截图” 选项无关", + "do_not": "无操作", + "save": "保存", + "upload": "上传", + "save_and_upload": "保存并上传" + }, "AkashiRecord": { "name": "大世界明石商店截图", "help": "", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index c094f79c8..738e30ddf 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -592,6 +592,14 @@ "upload": "上傳", "save_and_upload": "保存並上傳" }, + "CL1Record": { + "name": "侵蝕一掉落截圖", + "help": "是否保存侵蝕一掉落截圖由該選項單獨控制", + "do_not": "無操作", + "save": "保存", + "upload": "上傳", + "save_and_upload": "保存並上傳" + }, "AkashiRecord": { "name": "大世界明石商店截圖", "help": "", diff --git a/module/os/map.py b/module/os/map.py index c838300a3..58e49c726 100644 --- a/module/os/map.py +++ b/module/os/map.py @@ -956,9 +956,11 @@ class OSMap(OSFleet, Map, GlobeCamera, StorageHandler, StrategicSearchHandler): logger.info(f'Run auto search, question={question}, rescan={rescan}') finished_combat = 0 + genre = inflection.underscore(self.config.task.command) with self.stat.new( - genre=inflection.underscore(self.config.task.command), - method=self.config.DropRecord_OpsiRecord + genre=genre, + method=(self.config.DropRecord_CL1Record if genre == 'opsi_hazard1_leveling' + else self.config.DropRecord_OpsiRecord) ) as drop: while 1: combat = self.os_auto_search_run(drop, interrupt=interrupt)