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

Fix: Wrong rotation is never corrected if allow_rotation_set turns False

Browse Source
This commit is contained in:
LmeSzinc 2023-10-15 04:25:07 +08:00
parent 4491924dcd
commit 68fda96809
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,6 +258,8 @@ class MapControl(Combat, AimDetectorMixin):
logger.info(f'Already at target rotation, ' logger.info(f'Already at target rotation, '
f'current={last_rotation}, target={direction}, disallow rotation_set') f'current={last_rotation}, target={direction}, disallow rotation_set')
allow_rotation_set = False allow_rotation_set = False
if not allow_rotation_set and rotation_interval.reached_and_reset():
last_rotation = self.minimap.rotation
if allow_rotation_set and rotation_interval.reached(): if allow_rotation_set and rotation_interval.reached():
if self.handle_rotation_set(direction, threshold=10): if self.handle_rotation_set(direction, threshold=10):
rotation_interval.reset() rotation_interval.reset()
@ -278,6 +280,8 @@ class MapControl(Combat, AimDetectorMixin):
logger.info(f'Already at target rotation, ' logger.info(f'Already at target rotation, '
f'current={last_rotation}, target={direction}, disallow rotation_set') f'current={last_rotation}, target={direction}, disallow rotation_set')
allow_rotation_set = False allow_rotation_set = False
if not allow_rotation_set and rotation_interval.reached_and_reset():
last_rotation = self.minimap.rotation
if allow_rotation_set and rotation_interval.reached(): if allow_rotation_set and rotation_interval.reached():
if self.handle_rotation_set(direction, threshold=10): if self.handle_rotation_set(direction, threshold=10):
rotation_interval.reset() rotation_interval.reset()
@ -294,6 +298,8 @@ class MapControl(Combat, AimDetectorMixin):
if allow_rotation_set: if allow_rotation_set:
last_rotation = self.minimap.rotation last_rotation = self.minimap.rotation
allow_rotation_set = False allow_rotation_set = False
if not allow_rotation_set and rotation_interval.reached_and_reset():
last_rotation = self.minimap.rotation
if direction_interval.reached(): if direction_interval.reached():
contact.set(direction=contact_direction(), run=True) contact.set(direction=contact_direction(), run=True)
direction_interval.reset() direction_interval.reset()
@ -305,6 +311,8 @@ class MapControl(Combat, AimDetectorMixin):
if allow_rotation_set: if allow_rotation_set:
last_rotation = self.minimap.rotation last_rotation = self.minimap.rotation
allow_rotation_set = False allow_rotation_set = False
if not allow_rotation_set and rotation_interval.reached_and_reset():
last_rotation = self.minimap.rotation
if direction_interval.reached(): if direction_interval.reached():
contact.set(direction=contact_direction(), run=False) contact.set(direction=contact_direction(), run=False)
direction_interval.reset() direction_interval.reset()