diff --git a/config/template.json b/config/template.json index 550cccefd..15c7d97c9 100644 --- a/config/template.json +++ b/config/template.json @@ -1211,7 +1211,7 @@ "OpsiMeowfficerFarming": { "ActionPointPreserve": 500, "HazardLevel": 5, - "SeaArea": 0 + "TargetZone": 0 } }, "Daemon": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index b605d73c2..cf41f9c42 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -5466,7 +5466,7 @@ 6 ] }, - "SeaArea": { + "TargetZone": { "type": "input", "value": 0 } diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index a9f98105e..d7eb00b01 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -403,7 +403,7 @@ OpsiMeowfficerFarming: HazardLevel: value: 5 option: [1, 2, 3, 4, 5, 6] - SeaArea: + TargetZone: value: 0 # ==================== Tools ==================== diff --git a/module/config/config_generated.py b/module/config/config_generated.py index dd94b04c0..db0fe8891 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -278,7 +278,7 @@ class GeneratedConfig: # Group `OpsiMeowfficerFarming` OpsiMeowfficerFarming_ActionPointPreserve = 500 OpsiMeowfficerFarming_HazardLevel = 5 # 1, 2, 3, 4, 5, 6 - OpsiMeowfficerFarming_SeaArea = 0 + OpsiMeowfficerFarming_TargetZone = 0 # Group `Daemon` Daemon_EnterMap = True diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 423b3a216..ab656fae5 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1465,7 +1465,7 @@ "5": "5", "6": "6" }, - "SeaArea": { + "TargetZone": { "name": "Target Zone ID", "help": "Support zone ID and zone name. After specifying the sea area, it will circulate in the sea area\nFill in the default value of 0, or delete the value to cancel the specify" } diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 2b7a5d5dc..e552e0da6 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1465,9 +1465,9 @@ "5": "5", "6": "6" }, - "SeaArea": { - "name": "OpsiMeowfficerFarming.SeaArea.name", - "help": "OpsiMeowfficerFarming.SeaArea.help" + "TargetZone": { + "name": "OpsiMeowfficerFarming.TargetZone.name", + "help": "OpsiMeowfficerFarming.TargetZone.help" } }, "Daemon": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index c37c6e634..1c8149569 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1465,7 +1465,7 @@ "5": "5", "6": "6" }, - "SeaArea": { + "TargetZone": { "name": "指定海域", "help": "支持海域id、海域名称,指定海域后,则在该海域循环\n填入默认值0,或者删除数值即可取消指定" } diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 9acedbb80..99ce23c65 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1465,9 +1465,9 @@ "5": "5", "6": "6" }, - "SeaArea": { - "name": "OpsiMeowfficerFarming.SeaArea.name", - "help": "OpsiMeowfficerFarming.SeaArea.help" + "TargetZone": { + "name": "OpsiMeowfficerFarming.TargetZone.name", + "help": "OpsiMeowfficerFarming.TargetZone.help" } }, "Daemon": { diff --git a/module/os/operation_siren.py b/module/os/operation_siren.py index 5ee4f4e2f..4e03dd44e 100644 --- a/module/os/operation_siren.py +++ b/module/os/operation_siren.py @@ -263,7 +263,11 @@ class OperationSiren(Reward, OSMap): self.config.OS_ACTION_POINT_PRESERVE = self.config.OpsiMeowfficerFarming_ActionPointPreserve # (1252, 1012) is the coordinate of zone 134 (the center zone) in os_globe_map.png - zone_id = self.config.OpsiMeowfficerFarming_SeaArea + try: + zone_id = self.config.OpsiMeowfficerFarming_TargetZone + except ScriptError: + logger.hr(f'wrong zone_id input:{self.config.OpsiMeowfficerFarming_TargetZone}', level=3) + self.config.task_delay(server_update=True) if zone_id != 0: logger.hr(f'OS meowfficer farming, zone_id={zone_id}', level=1) self.globe_goto(zone_id)