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

Opt: Earlier stop of assignment checking

Browse Source
This commit is contained in:
Zebartin 2023-09-27 10:31:10 +08:00
parent c033d3b60d
commit 442cec332b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/assignment/assignment.py
View File

@ -40,13 +40,14 @@ class Assignment(AssignmentClaim, SynthesizeUI):
if isinstance(g, AssignmentEventGroup) if isinstance(g, AssignmentEventGroup)
), None) ), None)
if event_first and event_ongoing is not None: if event_first and event_ongoing is not None:
undispatched = assignments
remain = self._check_all() remain = self._check_all()
remain = self._dispatch_event(remain) remain = self._dispatch_event(remain)
undispatched = [x for x in assignments if x not in self.dispatched]
else: else:
# Iterate in user-specified order, return undispatched ones # Iterate in user-specified order, return undispatched ones
undispatched = list(self._check_inlist(assignments, duration)) undispatched = list(self._check_inlist(assignments, duration))
remain = self._check_all() remain = self._check_all()
undispatched = [x for x in undispatched if x not in self.dispatched]
# There are unchecked assignments # There are unchecked assignments
if remain > 0: if remain > 0:
for assignment in undispatched[:remain]: for assignment in undispatched[:remain]:
@ -100,6 +101,9 @@ class Assignment(AssignmentClaim, SynthesizeUI):
for assignment in assignments: for assignment in assignments:
if assignment in self.dispatched: if assignment in self.dispatched:
continue continue
if remain <= 0:
yield assignment
continue
logger.hr('Assignment inlist', level=2) logger.hr('Assignment inlist', level=2)
logger.info(f'Check assignment inlist: {assignment}') logger.info(f'Check assignment inlist: {assignment}')
self.goto_entry(assignment) self.goto_entry(assignment)
@ -112,11 +116,8 @@ class Assignment(AssignmentClaim, SynthesizeUI):
self._get_assignment_time() self._get_assignment_time()
continue continue
# General assignments must be dispatchable here # General assignments must be dispatchable here
if remain > 0:
self.dispatch(assignment, duration) self.dispatch(assignment, duration)
remain -= 1 remain -= 1
else:
yield assignment
def _check_all(self): def _check_all(self):
""" """
@ -127,8 +128,8 @@ class Assignment(AssignmentClaim, SynthesizeUI):
Break when a dispatchable assignment is encountered Break when a dispatchable assignment is encountered
""" """
logger.hr('Assignment check all', level=1) logger.hr('Assignment check all', level=1)
_, remain, total = self._limit_status current, remain, _ = self._limit_status
if total == len(self.dispatched): if current == len(self.dispatched):
return remain return remain
for group in self._iter_groups(): for group in self._iter_groups():
self.goto_group(group) self.goto_group(group)
@ -142,13 +143,14 @@ class Assignment(AssignmentClaim, SynthesizeUI):
status = self._check_assignment_status() status = self._check_assignment_status()
if status == AssignmentStatus.CLAIMABLE: if status == AssignmentStatus.CLAIMABLE:
self.claim(assignment, None, should_redispatch=False) self.claim(assignment, None, should_redispatch=False)
current -= 1
remain += 1 remain += 1
insight = True # Order of entries change after claiming insight = True # Order of entries change after claiming
continue continue
if status == AssignmentStatus.DISPATCHED: if status == AssignmentStatus.DISPATCHED:
self.dispatched[assignment] = datetime.now() + \ self.dispatched[assignment] = datetime.now() + \
self._get_assignment_time() self._get_assignment_time()
if total == len(self.dispatched): if current == len(self.dispatched):
return remain return remain
continue continue
break break