Adj: Fuck FleetNumberInHardMode Setting, bind it with FleetOrder

config/template.json

@@ -329,7 +329,6 @@
       "ChangeVanguard": "ship",
       "CommonDD": "any",
       "ALLowLowVanguardLevel": true,
-      "FleetNumberInHardMode": 0,
       "StopIFAutoNotEnsured": true,
       "CommissionLimit": true
     },

module/campaign/gems_farming.py

@@ -90,18 +90,18 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
             self._ship_detail_enter = self._ship_detail_enter_hard
             self._fleet_detail_enter = self._fleet_detail_enter_hard
             self.page_fleet_check_button = FLEET_PREPARATION
-            if self.config.GemsFarming_FleetNumberInHardMode == 1:
+            if self.config.Fleet_FleetOrder == 'fleet1_all_fleet2_standby':
                 self.FLEET_ENTER_FLAGSHIP = FLEET_ENTER_FLAGSHIP_HARD_1
                 self.FLEET_ENTER = FLEET_ENTER_HARD_1
                 self.FLEET_ENTER_FLAGSHIP_3_POSITION = FLEET_ENTER_FLAGSHIP_HARD_1_3
                 self.FLEET_ENTER_3_POSITION = FLEET_ENTER_HARD_1_3
-            elif self.config.GemsFarming_FleetNumberInHardMode == 2:
+            elif self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all':
                 self.FLEET_ENTER_FLAGSHIP = FLEET_ENTER_FLAGSHIP_HARD_2
                 self.FLEET_ENTER = FLEET_ENTER_HARD_2
                 self.FLEET_ENTER_FLAGSHIP_3_POSITION = FLEET_ENTER_FLAGSHIP_HARD_2_3
                 self.FLEET_ENTER_3_POSITION = FLEET_ENTER_HARD_2_3
             else:
-                logger.critical('Fleet number to change not set, check your settings')
+                logger.critical('Fleet Order Error, please check your settings')
                 from module.exception import RequestHumanTakeover
                 raise RequestHumanTakeover
             self.hard_mode = True

module/config/argument/args.json

@@ -1675,15 +1675,6 @@
         "type": "checkbox",
         "value": true
       },
-      "FleetNumberInHardMode": {
-        "type": "select",
-        "value": 0,
-        "option": [
-          0,
-          1,
-          2
-        ]
-      },
       "StopIFAutoNotEnsured": {
         "type": "checkbox",
         "value": true

module/config/argument/argument.yaml

@@ -416,9 +416,6 @@ GemsFarming:
     value: any
     option: [ any, aulick_or_foote , cassin_or_downes ]
   ALLowLowVanguardLevel: true
-  FleetNumberInHardMode:
-    value: 0
-    option: [ 0, 1, 2 ]
   StopIFAutoNotEnsured: true
   CommissionLimit: true
 FlagshipFilter:

module/config/config_generated.py

@@ -229,7 +229,6 @@ class GeneratedConfig:
     GemsFarming_ChangeVanguard = 'ship'  # disabled, ship, ship_equip
     GemsFarming_CommonDD = 'any'  # any, aulick_or_foote, cassin_or_downes
     GemsFarming_ALLowLowVanguardLevel = True
-    GemsFarming_FleetNumberInHardMode = 0  # 0, 1, 2
     GemsFarming_StopIFAutoNotEnsured = True
     GemsFarming_CommissionLimit = True
 

module/config/i18n/en-US.json

@@ -1645,13 +1645,6 @@
       "name": "ALLow Low Vanguard Level",
       "help": "Destroyers over level 10 will now be used, 49 for Event CD"
     },
-    "FleetNumberInHardMode": {
-      "name": "Fleet number used in hard mode",
-      "help": "Fleet number used in hard mode like Event C/D",
-      "0": "Not a hard mode",
-      "1": "Fleet 1",
-      "2": "Fleet 2"
-    },
     "StopIFAutoNotEnsured": {
       "name": "GemsFarming.StopIFAutoNotEnsured.name",
       "help": "GemsFarming.StopIFAutoNotEnsured.help"

module/config/i18n/ja-JP.json

@@ -1645,13 +1645,6 @@
       "name": "GemsFarming.ALLowLowVanguardLevel.name",
       "help": "GemsFarming.ALLowLowVanguardLevel.help"
     },
-    "FleetNumberInHardMode": {
-      "name": "GemsFarming.FleetNumberInHardMode.name",
-      "help": "GemsFarming.FleetNumberInHardMode.help",
-      "0": "0",
-      "1": "1",
-      "2": "2"
-    },
     "StopIFAutoNotEnsured": {
       "name": "GemsFarming.StopIFAutoNotEnsured.name",
       "help": "GemsFarming.StopIFAutoNotEnsured.help"

module/config/i18n/zh-CN.json

@@ -1645,13 +1645,6 @@
       "name": "可更换低等级前排",
       "help": "倍率打开时，前排等级限制改为10以上即可。若为困难模式（如CD图）改为49级。"
     },
-    "FleetNumberInHardMode": {
-      "name": "困难模式舰队编号",
-      "help": "困难模式（如活动图CD等）下需要更换的舰队编号。\n使用时请保证另一个舰队为6个125级，否则可能会有等级限制出错",
-      "0": "非困难模式",
-      "1": "第一舰队",
-      "2": "第二舰队"
-    },
     "StopIFAutoNotEnsured": {
       "name": "无法设置职能时停止任务",
       "help": "无法设置舰队职能时，以以下方式停止任务以免跨队队伍出击，石油被大量消耗：\n若设置了错误推送则推送任务停止的消息并停止该任务。\n若没有设置错误推送，则直接停止Alas。"

module/config/i18n/zh-TW.json

@@ -1645,13 +1645,6 @@
       "name": "可更換低等級前排",
       "help": "倍率打開時，前排等級限制改為10以上即可"
     },
-    "FleetNumberInHardMode": {
-      "name": "GemsFarming.FleetNumberInHardMode.name",
-      "help": "GemsFarming.FleetNumberInHardMode.help",
-      "0": "0",
-      "1": "1",
-      "2": "2"
-    },
     "StopIFAutoNotEnsured": {
       "name": "GemsFarming.StopIFAutoNotEnsured.name",
       "help": "GemsFarming.StopIFAutoNotEnsured.help"