Merge pull request #470 from Q1213a/master

71献祭流增加跳过血量检测，避免自律中断，修改某人trae写的逻辑问题

config/template.json

@@ -2619,6 +2619,7 @@
       "OperationCoinsPreserve": 40000,
       "MinimumActionPointReserve": 200,
       "ExecuteFixedPatrolScan": true,
+      "SkipHpCheck": false,
       "Cl1Filter": "ActionPoint",
       "RecordNonCL1AP": true
     },

module/config/argument/args.json

@@ -14078,6 +14078,14 @@
         "type": "checkbox",
         "value": true
       },
+      "SkipHpCheck": {
+        "type": "checkbox",
+        "value": false,
+        "option": [
+          true,
+          false
+        ]
+      },
       "Cl1Filter": {
         "type": "textarea",
         "value": "ActionPoint"

module/config/argument/argument.yaml

@@ -1161,6 +1161,11 @@ OpsiHazard1Leveling:
   OperationCoinsPreserve: 40000
   MinimumActionPointReserve: 200
   ExecuteFixedPatrolScan: true
+  # Sacrifice run: skip HP check
+  SkipHpCheck:
+    type: checkbox
+    value: false
+    option: [true, false]
   Cl1Filter: |-
     ActionPoint
   RecordNonCL1AP: true

module/config/config_generated.py

@@ -727,6 +727,7 @@ class GeneratedConfig:
     OpsiHazard1Leveling_OperationCoinsPreserve = 40000
     OpsiHazard1Leveling_MinimumActionPointReserve = 200
     OpsiHazard1Leveling_ExecuteFixedPatrolScan = True
+    OpsiHazard1Leveling_SkipHpCheck = False  # True, False
     OpsiHazard1Leveling_Cl1Filter = 'ActionPoint'
     OpsiHazard1Leveling_RecordNonCL1AP = True
 

module/config/i18n/en-US.json

@@ -4616,6 +4616,12 @@
       "name": "Forced Fleet Movement",
       "help": "Warm reminder from Yukikaze-sama: After enabling, the fleet will be forced to move to prevent not finding Akashi. Commander, you don’t want to crash because you can’t find Akashi nanoda? Enable this function and easily reach 500,000 nautical miles per month nanoda. What are you waiting for, Commander?"
     },
+    "SkipHpCheck": {
+      "name": "Sacrifice run: skip HP check",
+      "help": "Skip HP check after combat. Fleet will continue even if ships are sunk.",
+      "True": "True",
+      "False": "False"
+    },
     "Cl1Filter": {
       "name": "Akashi Purchase Filter",
       "help": "By default, only Action Points are purchased nanoda. If you want to also buy purple coins, set it to ‘ActionPoint > PurpleCoins’"

module/config/i18n/ja-JP.json

@@ -4616,6 +4616,12 @@
       "name": "艦隊の強制移動",
       "help": "雪風様からの温かいリマインダー: スイッチをオンにすると、艦隊は明石の発見を防ぐために強制的に移動します。指揮官、アカシが見つからないからといってナノダを墜落させたくないんですか？この機能をオンにすると、nanoda を使用して月あたり 500,000 海里を簡単に達成できます。何を待っていますか、指揮官？"
     },
+    "SkipHpCheck": {
+      "name": "HPチェックをスキップ",
+      "help": "戦闘後のHPチェックをスキップします。艦船が撃沈されても練級を続行します。",
+      "True": "True",
+      "False": "False"
+    },
     "Cl1Filter": {
       "name": "明石購入フィルター",
       "help": "デフォルトでは体力ナノダのみ購入されます。パープルコインも同時に購入したい場合は「ActionPoint > PurpleCoins」に設定してください"

module/config/i18n/zh-CN.json

@@ -4616,6 +4616,12 @@
       "name": "舰队强制移动",
       "help": "雪风大人温馨提示：开启后，将强制移动舰队以免找不到明石，指挥官你也不想因为找不到明石导致坠机nanoda？打开这个功能轻轻松松达到50万海里每月nanoda，指挥官还在等什么nanoda!"
     },
+    "SkipHpCheck": {
+      "name": "献祭流跳过血量检测",
+      "help": "开启后跳过战斗后的血量检测，即使船沉了也不会停止练级",
+      "True": "True",
+      "False": "False"
+    },
     "Cl1Filter": {
       "name": "明石购买筛选",
       "help": "默认只购买体力nanoda。如果要同时购买紫币，设置为 'ActionPoint > PurpleCoins'"

module/config/i18n/zh-MIAO.json

@@ -4616,6 +4616,12 @@
       "name": "舰队强制移动 (雪风温馨提示) (ฅ´ω`ฅ)",
       "help": "开启后强制移动舰队以免找不到明石，不想坠机就打开喵，轻松达到50万海里每月喵！"
     },
+    "SkipHpCheck": {
+      "name": "献祭流跳过血量检测",
+      "help": "开启后跳过战斗后的血量检测，即使船沉了也不会停止练级nanoda",
+      "True": "True",
+      "False": "False"
+    },
     "Cl1Filter": {
       "name": "明石购买筛选 (｀ω´)",
       "help": "默认只买体力喵。同时买紫币设为 'ActionPoint > PurpleCoins'。"

module/config/i18n/zh-TW.json

@@ -4616,6 +4616,12 @@
       "name": "艦隊強制移動",
       "help": "雪風大人溫馨提示：開啟後，將強制移動艦隊以免找不到明石，指揮官你也不想因為找不到明石導致墜機nanoda？開啟這個功能輕輕鬆鬆達到50萬海裡每月nanoda，指揮官還在等什麼nanoda!"
     },
+    "SkipHpCheck": {
+      "name": "獻祭流跳過血量檢測",
+      "help": "開啟後跳過戰鬥後的血量檢測，即使船沉了也不會停止練級",
+      "True": "True",
+      "False": "False"
+    },
     "Cl1Filter": {
       "name": "明石購買篩選",
       "help": "預設只購買體力nanoda。如果要同時購買紫幣，設定為 'ActionPoint > PurpleCoins'"

module/os/fleet.py

@@ -187,6 +187,10 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
         Calculate current HP, also detects the wrench (Ship died, need to repair)
         """
         super().hp_get()
+        if self.config.OpsiHazard1Leveling_SkipHpCheck:
+            self.need_repair = [False, False, False, False, False, False]
+            return
+
         ship_icon = self._hp_grid().crop((0, -67, 67, 0))
         need_repair = [TEMPLATE_EMPTY_HP.match(self.image_crop(button, copy=False)) for button in ship_icon.buttons]
         self.need_repair = need_repair

module/os/map.py

@@ -876,7 +876,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StorageHandler, StrategicSearchHandler):
                     finished_combat += 1
                 else:
                     self.hp_get()
-                    if any(self.need_repair):
+                    if any(self.need_repair) and not self.config.OpsiHazard1Leveling_SkipHpCheck:
                         success = False
                         logger.warning('Fleet died, stop auto search')
                         continue