sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

ADD：os_meowfficer_farming add specificSea Explore

Browse Source
This commit is contained in:
julystone 2021-10-26 17:46:04 +08:00
parent eb3328ca30
commit fff3f59caf
9 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/template.json
View File

@ -1210,7 +1210,8 @@
},
"OpsiMeowfficerFarming": {
"ActionPointPreserve": 500,
"HazardLevel": 5
"HazardLevel": 5,
"SeaArea": 0
}
},
"Daemon": {

4
module/config/argument/args.json
View File

@ -5465,6 +5465,10 @@
5,
6
]
},
"SeaArea": {
"type": "input",
"value": 0
}
}
},

2
module/config/argument/argument.yaml
View File

@ -403,6 +403,8 @@ OpsiMeowfficerFarming:
HazardLevel:
value: 5
option: [1, 2, 3, 4, 5, 6]
SeaArea:
value: 0
# ==================== Tools ====================

1
module/config/config_generated.py
View File

@ -278,6 +278,7 @@ class GeneratedConfig:
# Group `OpsiMeowfficerFarming`
OpsiMeowfficerFarming_ActionPointPreserve = 500
OpsiMeowfficerFarming_HazardLevel = 5 # 1, 2, 3, 4, 5, 6
OpsiMeowfficerFarming_SeaArea = 0
# Group `Daemon`
Daemon_EnterMap = True

4
module/config/i18n/en-US.json
View File

@ -1464,6 +1464,10 @@
"4": "4",
"5": "5",
"6": "6"
},
"SeaArea": {
"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"
}
},
"Daemon": {

4
module/config/i18n/ja-JP.json
View File

@ -1464,6 +1464,10 @@
"4": "4",
"5": "5",
"6": "6"
},
"SeaArea": {
"name": "OpsiMeowfficerFarming.SeaArea.name",
"help": "OpsiMeowfficerFarming.SeaArea.help"
}
},
"Daemon": {

4
module/config/i18n/zh-CN.json
View File

@ -1464,6 +1464,10 @@
"4": "4",
"5": "5",
"6": "6"
},
"SeaArea": {
"name": "指定海域",
"help": "支持海域id、海域名称，指定海域后，则在该海域循环\n填入默认值0，或者删除数值即可取消指定"
}
},
"Daemon": {

4
module/config/i18n/zh-TW.json
View File

@ -1464,6 +1464,10 @@
"4": "4",
"5": "5",
"6": "6"
},
"SeaArea": {
"name": "OpsiMeowfficerFarming.SeaArea.name",
"help": "OpsiMeowfficerFarming.SeaArea.help"
}
},
"Daemon": {

26
module/os/operation_siren.py
View File

@ -263,16 +263,24 @@ 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
zones = self.zone_select(hazard_level=self.config.OpsiMeowfficerFarming_HazardLevel) \
.delete(SelectedGrids([self.zone])) \
.delete(SelectedGrids(self.zones.select(is_port=True))) \
.sort_by_clock_degree(center=(1252, 1012), start=self.zone.location)
zone_id = self.config.OpsiMeowfficerFarming_SeaArea
if zone_id != 0:
logger.hr(f'OS meowfficer farming, zone_id={zone_id}', level=1)
self.globe_goto(zone_id)
self.run_auto_search()
self.handle_fleet_repair(revert=False)
self.globe_goto(self.zone_nearest_azur_port(zone=zone_id))
else:
zones = self.zone_select(hazard_level=self.config.OpsiMeowfficerFarming_HazardLevel) \
.delete(SelectedGrids([self.zone])) \
.delete(SelectedGrids(self.zones.select(is_port=True))) \
.sort_by_clock_degree(center=(1252, 1012), start=self.zone.location)
logger.hr(f'OS meowfficer farming, zone_id={zones[0].zone_id}', level=1)
self.globe_goto(zones[0])
self.run_auto_search()
self.handle_fleet_repair(revert=False)
self.config.check_task_switch()
logger.hr(f'OS meowfficer farming, zone_id={zones[0].zone_id}', level=1)
self.globe_goto(zones[0])
self.run_auto_search()
self.handle_fleet_repair(revert=False)
self.config.check_task_switch()
def os_explore(self):
"""