xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-22 00:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Handle enemy during rotation_set()

Browse Source
This commit is contained in:
LmeSzinc 2024-05-07 23:03:40 +08:00
parent 9cf388b8e0
commit 348c22cd35
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tasks/map/control/control.py
View File

@ -59,8 +59,11 @@ class MapControl(Combat, AimDetectorMixin):
skip_first_screenshot:
Returns:
bool: If swiped rotation
list[str]: A list of walk result
Enemy may attack character during rotation_set, function returns walk result
"""
logger.hr('Rotation set')
result = []
interval = Timer(1, count=2)
while 1:
if skip_first_screenshot:
@ -70,15 +73,27 @@ class MapControl(Combat, AimDetectorMixin):
self.minimap.update_rotation(self.device.image)
self.minimap.log_minimap()
# End
if self.minimap.is_rotation_near(target, threshold=threshold):
logger.info(f'Rotation is now at: {target}')
break
# Additional
if self.is_combat_executing():
logger.info('Walk result add: enemy')
result.append('enemy')
logger.hr('Combat', level=2)
self.combat_execute()
if self.walk_additional():
continue
if interval.reached():
if self.handle_rotation_set(target, threshold=threshold):
interval.reset()
continue
if self.is_in_main():
# End
if self.minimap.is_rotation_near(target, threshold=threshold):
logger.info(f'Rotation is now at: {target}')
break
# Swipe
if interval.reached():
if self.handle_rotation_set(target, threshold=threshold):
interval.reset()
continue
return result
def walk_additional(self) -> bool:
"""