Add: hazard 1 leveling

2026-03-19 23:33:33 +08:00 · 2022-11-11 14:27:15 +08:00
parent 26aa797a72
commit 1f38e92e02
31 changed files with 553 additions and 62 deletions
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -3281,10 +3281,10 @@
          "event_20200227_cn"
        ],
        "display": "disabled",
-        "cn": "event_20201229_cn",
-        "en": "event_20201229_cn",
-        "jp": "event_20201229_cn",
-        "tw": "event_20211111_cn"
+        "tw": "event_20211111_cn",
+        "cn": "event_20220915_cn",
+        "en": "event_20220915_cn",
+        "jp": "event_20220915_cn"
      },
      "Mode": {
        "type": "select",
@@ -7772,7 +7772,7 @@
      },
      "ServerUpdate": {
        "type": "input",
-        "value": "00:00",
+        "value": "00:00, 12:00",
        "display": "hide"
      }
    },
@@ -7869,7 +7869,7 @@
    "OpsiMeowfficerFarming": {
      "ActionPointPreserve": {
        "type": "input",
-        "value": 500
+        "value": 1000
      },
      "HazardLevel": {
        "type": "select",
@@ -7904,6 +7904,71 @@
      }
    }
  },
+  "OpsiHazard1Leveling": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "OpsiHazard1Leveling",
+        "display": "hide"
+      },
+      "SuccessInterval": {
+        "type": "input",
+        "value": 30,
+        "display": "hide"
+      },
+      "FailureInterval": {
+        "type": "input",
+        "value": 60,
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "00:00",
+        "display": "hide"
+      }
+    },
+    "OpsiHazard1Leveling": {
+      "StrategySearch": {
+        "type": "checkbox",
+        "value": true
+      },
+      "TargetZone": {
+        "type": "select",
+        "value": 0,
+        "option": [
+          0,
+          44,
+          22
+        ]
+      }
+    },
+    "OpsiFleet": {
+      "Fleet": {
+        "type": "select",
+        "value": 1,
+        "option": [
+          1,
+          2,
+          3,
+          4
+        ]
+      },
+      "Submarine": {
+        "type": "checkbox",
+        "value": false,
+        "display": "hide"
+      }
+    }
+  },
  "Daemon": {
    "Daemon": {
      "EnterMap": {
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -569,12 +569,17 @@ OpsiAbyssal:
 OpsiStronghold:
  ForceRun: false
 OpsiMeowfficerFarming:
-  ActionPointPreserve: 500
+  ActionPointPreserve: 1000
  HazardLevel:
    value: 5
    option: [3, 4, 5, 6, 10]
  TargetZone:
    value: 0
+OpsiHazard1Leveling:
+  StrategySearch: True
+  TargetZone:
+    value: 0
+    option: [0, 44, 22]

 # ==================== Tools ====================

--- a/module/config/argument/menu.json
+++ b/module/config/argument/menu.json
@@ -57,7 +57,8 @@
      "OpsiObscure",
      "OpsiAbyssal",
      "OpsiStronghold",
-      "OpsiMeowfficerFarming"
+      "OpsiMeowfficerFarming",
+      "OpsiHazard1Leveling"
    ],
    "Tool": [
      "Daemon",
--- a/module/config/argument/override.yaml
+++ b/module/config/argument/override.yaml
@@ -350,7 +350,7 @@ OpsiAbyssal:
  Scheduler:
    SuccessInterval: 60
    FailureInterval: 60
-    ServerUpdate: 00:00
+    ServerUpdate: 00:00, 12:00
 OpsiStronghold:
  Scheduler:
    SuccessInterval: 60
@@ -361,3 +361,10 @@ OpsiMeowfficerFarming:
    SuccessInterval: 30
    FailureInterval: 30
    ServerUpdate: 00:00
+OpsiHazard1Leveling:
+  Scheduler:
+    SuccessInterval: 30
+    FailureInterval: 60
+    ServerUpdate: 00:00
+  OpsiFleet:
+    Submarine: false
--- a/module/config/argument/task.yaml
+++ b/module/config/argument/task.yaml
@@ -263,6 +263,10 @@ OpsiMeowfficerFarming:
  - Scheduler
  - OpsiMeowfficerFarming
  - OpsiFleet
+OpsiHazard1Leveling:
+  - Scheduler
+  - OpsiHazard1Leveling
+  - OpsiFleet

 # ==================== Tool ====================

--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -379,10 +379,14 @@ class GeneratedConfig:
    OpsiStronghold_ForceRun = False

    # Group `OpsiMeowfficerFarming`
-    OpsiMeowfficerFarming_ActionPointPreserve = 500
+    OpsiMeowfficerFarming_ActionPointPreserve = 1000
    OpsiMeowfficerFarming_HazardLevel = 5  # 3, 4, 5, 6, 10
    OpsiMeowfficerFarming_TargetZone = 0

+    # Group `OpsiHazard1Leveling`
+    OpsiHazard1Leveling_StrategySearch = True
+    OpsiHazard1Leveling_TargetZone = 0  # 0, 44, 22
+
    # Group `Daemon`
    Daemon_EnterMap = True

--- a/module/config/config_manual.py
+++ b/module/config/config_manual.py
@@ -24,6 +24,7 @@ class ManualConfig:
    > Event > Event2 > Raid > Main > Main2 > Main3
    > OpsiMeowfficerFarming
    > GemsFarming
+    > OpsiHazard1Leveling
    """

    """
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@@ -218,6 +218,10 @@
      "name": "Meowfficer Farming",
      "help": ""
    },
+    "OpsiHazard1Leveling": {
+      "name": "CL1 Leveling",
+      "help": ""
+    },
    "Daemon": {
      "name": "Normal Semi-auto",
      "help": ""
@@ -2098,7 +2102,7 @@
    },
    "ActionPointPreserve": {
      "name": "Keep X Amount of AP",
-      "help": "Stops task if total AP (including AP boxes in inventory) is below this number, 500 is recommended\nThis value will be auto reduced to 300 at 3 days before OpSi reset and to 0 at day before reset"
+      "help": "Stops task if total AP (including AP boxes in inventory) is below this number, 1000 is recommended\nThis value will be auto reduced to 300 at 3 days before OpSi reset, or 500 if CL1 leveling enabled, and to 0 at day before reset"
    },
    "HazardLevel": {
      "name": "Target Zone Hazard Level",
@@ -2114,6 +2118,23 @@
      "help": "Supports either Zone ID or Name in CN/EN/JP/TW, i.e. \"51\", \"NA Ocean SE Sector E\"\nIf specified, Alas will loop on this same zone after each clear\nUse default value 0 or clear the field to remove the specification\nZone information can be acquired from <./module/os/map_data.py>"
    }
  },
+  "OpsiHazard1Leveling": {
+    "_info": {
+      "name": "CL1 leveling",
+      "help": "OpsiHazard1Leveling._info.help"
+    },
+    "StrategySearch": {
+      "name": "Strategic Search",
+      "help": ""
+    },
+    "TargetZone": {
+      "name": "Target Zone ID",
+      "help": "Only attack target zone, which can be used to obtain world achievement stars or avoid the event that the map cannot be refreshed due to game bug",
+      "0": "No Specification",
+      "44": "44 | West Continental Shelf D",
+      "22": "22 | NA Ocean SW Sector B"
+    }
+  },
  "Daemon": {
    "_info": {
      "name": "Semi-auto Clicking",
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@@ -218,6 +218,10 @@
      "name": "Task.OpsiMeowfficerFarming.name",
      "help": "Task.OpsiMeowfficerFarming.help"
    },
+    "OpsiHazard1Leveling": {
+      "name": "Task.OpsiHazard1Leveling.name",
+      "help": "Task.OpsiHazard1Leveling.help"
+    },
    "Daemon": {
      "name": "Task.Daemon.name",
      "help": "Task.Daemon.help"
@@ -585,7 +589,6 @@
      "name": "Campaign.Event.name",
      "help": "Campaign.Event.help",
      "campaign_main": "campaign_main",
-      "event_20201229_cn": "虚畳なりし限象（復刻）",
      "event_20211111_cn": "燈火のシニエ",
      "raid_20221027": "戦え！ロイヤルメイド隊3rd",
      "event_20210121_cn": "悲歎せし焔海の詩（復刻）",
@@ -2114,6 +2117,23 @@
      "help": "OpsiMeowfficerFarming.TargetZone.help"
    }
  },
+  "OpsiHazard1Leveling": {
+    "_info": {
+      "name": "OpsiHazard1Leveling._info.name",
+      "help": "OpsiHazard1Leveling._info.help"
+    },
+    "StrategySearch": {
+      "name": "OpsiHazard1Leveling.StrategySearch.name",
+      "help": "OpsiHazard1Leveling.StrategySearch.help"
+    },
+    "TargetZone": {
+      "name": "OpsiHazard1Leveling.TargetZone.name",
+      "help": "OpsiHazard1Leveling.TargetZone.help",
+      "0": "0",
+      "44": "44",
+      "22": "22"
+    }
+  },
  "Daemon": {
    "_info": {
      "name": "Daemon._info.name",
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@@ -218,6 +218,10 @@
      "name": "短猫相接",
      "help": ""
    },
+    "OpsiHazard1Leveling": {
+      "name": "侵蚀1练级",
+      "help": ""
+    },
    "Daemon": {
      "name": "半自动点击",
      "help": ""
@@ -2098,7 +2102,7 @@
    },
    "ActionPointPreserve": {
      "name": "保留 X 点行动力",
-      "help": "行动力低于 X 后停止，自动打开行动力箱子，X 包含箱子中的行动力，建议保留 500 点行动力\n这个值将在大世界重置前3天自动减少至300点，并在最后一天自动减少至0点"
+      "help": "行动力低于 X 后停止，自动打开行动力箱子，X 包含箱子中的行动力，建议保留1000行动力给侵蚀1练级\n这个值将在大世界重置前3天自动减少至200点，如果启用侵蚀1练级则改为500点，并在最后一天自动减少至0点"
    },
    "HazardLevel": {
      "name": "侵蚀等级",
@@ -2114,6 +2118,23 @@
      "help": "仅出击指定的海域，可以用来获取大世界成就星星\n支持海域ID、国服/国际服/日服/台服海域名称，例如 \"51\", \"NA海域东南E\", \"NA Ocean SE Sector E\"\n填入默认值0，或者删除数值即可取消指定"
    }
  },
+  "OpsiHazard1Leveling": {
+    "_info": {
+      "name": "侵蚀1练级",
+      "help": "警告：这个功能仅推荐用于练级\n根据海事局最新的结论，侵蚀1产出的行动力刚好跟消耗持平，可以用来无限获取经验\n尝试使用此功能获取额外行动力被视为自负盈亏的赌博行为\n\n这个功能会自动完成地图随机事件并跳过塞壬探测装置\n推荐携带2艘预装填的保姆船以获取最高的时均经验收益\n由于在商店购买行动力需要大量作战补给凭证，启用本功能后会自动启用短猫相接来补充"
+    },
+    "StrategySearch": {
+      "name": "使用计划作战",
+      "help": ""
+    },
+    "TargetZone": {
+      "name": "指定海域",
+      "help": "仅出击指定的海域，可以用来获取大世界成就星星或规避游戏BUG导致的无法刷新海域",
+      "0": "不指定",
+      "44": "44 | 西大陆架D",
+      "22": "22 | NA海域西南B"
+    }
+  },
  "Daemon": {
    "_info": {
      "name": "半自动点击",
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -218,6 +218,10 @@
      "name": "短貓相接",
      "help": ""
    },
+    "OpsiHazard1Leveling": {
+      "name": "侵蝕1練級",
+      "help": ""
+    },
    "Daemon": {
      "name": "半自動點擊",
      "help": ""
@@ -2098,7 +2102,7 @@
    },
    "ActionPointPreserve": {
      "name": "保留 X 點行動力",
-      "help": "行動力低於 X 後停止，自動打開行動力箱子，X 包含箱子中的行動力，建議保留 500 點行動力\n這個值將在大世界重置前3天自動減少至300點，並在最後一天自動減少至0點"
+      "help": "行動力低於 X 後停止，自動打開行動力箱子，X 包含箱子中的行動力，建議保留 1000 點行動力给侵蝕1練級\n這個值將在大世界重置前3天自動減少至300點，如果啟用侵蝕1練級則改為500點，並在最後一天自動減少至0點"
    },
    "HazardLevel": {
      "name": "侵蝕等級",
@@ -2114,6 +2118,23 @@
      "help": "僅出擊指定的海域，可以用來獲取大世界成就星星\n自動更新的數值，填0可重置進度，重置後自動跳過已開荒的海域\n支持海域ID、國服/國際服/日服/台服海域名稱，例如 \"51\", \"NA海域東南E\", \"NA Ocean SE Sector E\"\n填入默認值0，或者刪除數值即可取消指定"
    }
  },
+  "OpsiHazard1Leveling": {
+    "_info": {
+      "name": "侵蝕1練級",
+      "help": "OpsiHazard1Leveling._info.help"
+    },
+    "StrategySearch": {
+      "name": "使用計畫作戰",
+      "help": ""
+    },
+    "TargetZone": {
+      "name": "指定海域",
+      "help": "僅出擊指定的海域，可以用來獲取大世界成就星星或規避遊戲BUG導致的無法重繪海域",
+      "0": "不指定",
+      "44": "44 | 西大陸棚D",
+      "22": "22 | NA海域西南B"
+    }
+  },
  "Daemon": {
    "_info": {
      "name": "半自動點擊",
@@ -2149,7 +2170,7 @@
    },
    "AdbncScreenshot": {
      "name": "測試 ADB 截圖",
-      "help": "Benchmark.AdbncScreenshot.help"
+      "help": ""
    },
    "Uiautomator2Screenshot": {
      "name": "測試 uiautomator2 截圖",