Feat(opsi): 将购买战役信息记录仪移至兑换商店任务

- 将BuySpecialRadar从OpsiShop移至OpsiVoucher, 确保在每月开荒前执行购买

config/template.json

@@ -1999,7 +1999,6 @@
       "ServerUpdate": "00:00"
     },
     "OpsiShop": {
-      "BuySpecialRadar": false,
       "PresetFilter": "max_benefit_meta",
       "CustomFilter": "LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator"
     },
@@ -2017,6 +2016,7 @@
       "ServerUpdate": "00:00"
     },
     "OpsiVoucher": {
+      "BuySpecialRadar": false,
       "Filter": "LoggerAbyssal > LoggerObscure > Book > Coin > Fragment"
     },
     "Storage": {

module/campaign/os_run.py

@@ -22,12 +22,6 @@ class OSCampaignRun(OSMapOperation):
             self.config.opsi_task_delay(ap_limit=True)
 
     def opsi_shop(self):
-        if self.config.OpsiShop_BuySpecialRadar:
-            if Oilkeep(self.config, self.device).update_oil() > 6000:
-                campaign = self.load_campaign()
-                campaign.os_voucher_buy_loggerUnlock()
-            else:
-                logger.warning('oil < 6000, skip buying loggerUnlock')
         try:
             campaign = self.load_campaign()
             campaign.os_shop()
@@ -35,6 +29,12 @@ class OSCampaignRun(OSMapOperation):
             self.config.opsi_task_delay(ap_limit=True)
 
     def opsi_voucher(self):
+        if self.config.OpsiVoucher_BuySpecialRadar:
+            if Oilkeep(self.config, self.device).update_oil() > 6000:
+                campaign = self.load_campaign()
+                campaign.os_voucher_buy_loggerUnlock()
+            else:
+                logger.warning('oil < 6000, skip buying loggerUnlock')
         try:
             campaign = self.load_campaign()
             campaign.os_voucher()

module/config/argument/args.json

@@ -9705,10 +9705,6 @@
       }
     },
     "OpsiShop": {
-      "BuySpecialRadar": {
-        "type": "checkbox",
-        "value": false
-      },
       "PresetFilter": {
         "type": "select",
         "value": "max_benefit_meta",
@@ -9771,6 +9767,10 @@
       }
     },
     "OpsiVoucher": {
+      "BuySpecialRadar": {
+        "type": "checkbox",
+        "value": false
+      },
       "Filter": {
         "type": "textarea",
         "value": "LoggerAbyssal > LoggerObscure > Book > Coin > Fragment"

module/config/argument/argument.yaml

@@ -882,7 +882,6 @@ OpsiExplore:
   ForceRun: false
   LastZone: 0
 OpsiShop:
-  BuySpecialRadar: false
   PresetFilter:
     value: max_benefit_meta
     option:
@@ -897,6 +896,7 @@ OpsiShop:
     > OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1
     > METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator
 OpsiVoucher:
+  BuySpecialRadar: false
   Filter: |-
     LoggerAbyssal > LoggerObscure > Book > Coin > Fragment
 OpsiDaily:

module/config/config_generated.py

@@ -546,11 +546,11 @@ class GeneratedConfig:
     OpsiExplore_LastZone = 0
 
     # Group `OpsiShop`
-    OpsiShop_BuySpecialRadar = False
     OpsiShop_PresetFilter = 'max_benefit_meta'  # max_benefit, max_benefit_meta, no_meta, all, custom
     OpsiShop_CustomFilter = 'LoggerAbyssalT6 > LoggerAbyssalT5 > LoggerObscure > LoggerAbyssalT4 > ActionPoint > PurpleCoins\n> GearDesignPlanT3 > PlateRandomT4 > DevelopmentMaterialT3 > GearDesignPlanT2 > GearPart\n> OrdnanceTestingReportT3 > OrdnanceTestingReportT2 > DevelopmentMaterialT2 > OrdnanceTestingReportT1\n> METARedBook > CrystallizedHeatResistantSteel > NanoceramicAlloy > NeuroplasticProstheticArm > SupercavitationGenerator'
 
     # Group `OpsiVoucher`
+    OpsiVoucher_BuySpecialRadar = False
     OpsiVoucher_Filter = 'LoggerAbyssal > LoggerObscure > Book > Coin > Fragment'
 
     # Group `OpsiDaily`

module/config/config_manual.py

@@ -18,10 +18,10 @@ class ManualConfig:
     > ShopFrequent > ShopOnce > Shipyard > Freebies > Daily > Hard 
     > Oilkeep > Event > RaidDaily
     > PrivateQuarters
-    > OpsiExplore
+    > OpsiVoucher > OpsiExplore
     > EventStory > Smallevent > Minigame > Awaken
     > OpsiAshBeacon
-    > OpsiDaily > OpsiShop > OpsiVoucher
+    > OpsiDaily > OpsiShop
     > OpsiAbyssal > OpsiStronghold > OpsiObscure > OpsiArchive
     > OpsiAshBeacon > OpsiAshAssist > OpsiMonthBoss
     > Sos > EventSp > EventA > EventB > EventC > EventD

module/config/i18n/en-US.json

@@ -2995,10 +2995,6 @@
       "name": "OpSi Shop Settings",
       "help": "Completes OpSi daily activities\nThe following must be satisfied:\n- OpSi story and practice battles must be complete\n- Task OpSi Explore enabled or consuming 5000 oil for special radar in OpSi voucher shop\nAvailable only in the next month after clearing OpSi story, i.e., after the port shop becomes a new version of the shop"
     },
-    "BuySpecialRadar": {
-      "name": "Buy Special Radar",
-      "help": "Automatically purchase the Operation Siren Data Logger (5k oil item)"
-    },
     "PresetFilter": {
       "name": "OpSi Shop Filter",
       "help": "Generally does not need to be modified. Use \"High value items and META material\"` if Voucher Coins spilled or \"Without META materials\" if you are newcomer.\nHigh value items include ActionPoint, Logger and T4 or higher items; META materials include METABook and META enhance materials.",
@@ -3018,6 +3014,10 @@
       "name": "OpSi Voucher Settings",
       "help": "Buy monthly items from the OpSi voucher shop\nThe following must be satisfied:\n- OpSi story and practice battles must be complete"
     },
+    "BuySpecialRadar": {
+      "name": "Buy Special Radar",
+      "help": "Automatically purchase the Operation Siren Data Logger (5k oil item)"
+    },
     "Filter": {
       "name": "Item Filter",
       "help": "All options have been defined at <https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/reward_shop_filter_string>"

module/config/i18n/ja-JP.json

@@ -2995,10 +2995,6 @@
       "name": "OpsiShop._info.name",
       "help": "OpsiShop._info.help"
     },
-    "BuySpecialRadar": {
-      "name": "戦闘情報記録器購入",
-      "help": "戦闘情報記録器（5000油道具）自動購入"
-    },
     "PresetFilter": {
       "name": "OpsiShop.PresetFilter.name",
       "help": "OpsiShop.PresetFilter.help",
@@ -3018,6 +3014,10 @@
       "name": "OpsiVoucher._info.name",
       "help": "OpsiVoucher._info.help"
     },
+    "BuySpecialRadar": {
+      "name": "戦闘情報記録器購入",
+      "help": "戦闘情報記録器（5000油道具）自動購入"
+    },
     "Filter": {
       "name": "OpsiVoucher.Filter.name",
       "help": "OpsiVoucher.Filter.help"

module/config/i18n/zh-CN.json

@@ -2995,10 +2995,6 @@
       "name": "大世界商店",
       "help": "使用此功能前必须满足以下条件：\n- 通关大世界主线并完成模拟战+塞壬试验场\n- 启用大世界开荒任务或使用战役信息记录仪（5000油道具）\n- 通关大世界主线后的下一个月，即港口商店变为新版商店后才可使用"
     },
-    "BuySpecialRadar": {
-      "name": "购买战役信息记录仪",
-      "help": "自动购买战役信息记录仪（5000油道具）"
-    },
     "PresetFilter": {
       "name": "港口商店过滤器",
       "help": "一般默认即可，白票溢出建议选 \"高价值物品与META材料\"，萌新建议选 \"不购买META材料\"，这会买除了META材料以外的所有东西。\n高价值物品为行动力、坐标和金或者更高级別的商品；META材料为META通用战术教材和4种强化材料。",
@@ -3018,6 +3014,10 @@
       "name": "特别兑换商店（每月白票商店）",
       "help": "购买每月白票商店\n使用此功能前必须满足以下条件：\n- 通关大世界主线并完成模拟战+塞壬试验场"
     },
+    "BuySpecialRadar": {
+      "name": "购买战役信息记录仪",
+      "help": "自动购买战役信息记录仪（5000油道具）"
+    },
     "Filter": {
       "name": "商店过滤器",
       "help": "参考文档 https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/reward_shop_filter_string"

module/config/i18n/zh-TW.json

@@ -2995,10 +2995,6 @@
       "name": "大世界商店",
       "help": "使用此功能前必須滿足以下條件：\n- 通關大世界主線任務+模擬戰\n- 開啟大世界開荒任務或使用戰役信息記錄儀（5000油道具）\n- 通關大世界主線後的下個月，也就是港口商店變成新版商店後才可使用"
     },
-    "BuySpecialRadar": {
-      "name": "購買戰役信息記錄儀",
-      "help": "自動購買戰役信息記錄儀（5000油道具）"
-    },
     "PresetFilter": {
       "name": "港口商店過濾器",
       "help": "一般用預設即可，白票溢出建議選 \"高價值物品與META材料\"，新手建議選 \"不購買META材料\"，這會買除了META材料以外的所有東西。\n高價值物品為行動點、坐標和金或者更高級別的物品；META材料為META通用戰術教材和4種強化材料。",
@@ -3018,6 +3014,10 @@
       "name": "兌換商店（每月白票商店）",
       "help": "購買每月白票商店\n使用此功能前必須滿足以下條件：\n- 通關大世界主線任務並完成模擬戰+塞壬試驗場"
     },
+    "BuySpecialRadar": {
+      "name": "購賣戰役信息記錄儀",
+      "help": "自動購賣戰役信息記錄儀（5000油道具）"
+    },
     "Filter": {
       "name": "商店過濾器",
       "help": "參考文檔 https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/reward_shop_filter_string"