sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-17 18:20:11 +08:00
Code Activity

Fix: shortest/cheapest project string clause, carry over passed parameters

Browse Source 
Fix: research_enforce parameter update, carry over passed parameters
This commit is contained in:
nEEtdo0d
2022-07-23 13:07:32 -04:00
parent 07dbb1c5c5
commit 2660462606
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
module/research/research.py
View File

@@ -72,8 +72,13 @@ class RewardResearch(ResearchSelector, ResearchQueue):
self._research_project_offset = 0 self._research_project_offset = 0
return True return True
def research_enforce(self): def research_enforce(self, drop=None, add_queue=True):
""" """
Args:
drop (DropImage):
add_queue (bool): Whether to add into queue.
The 6th project can't be added into queue, so here's the toggle.
Returns: Returns:
bool: True if triggered enforce research bool: True if triggered enforce research
""" """
@@ -83,7 +88,8 @@ class RewardResearch(ResearchSelector, ResearchQueue):
or self.config.Research_UsePart in ['only_no_project', 'only_05_hour']): or self.config.Research_UsePart in ['only_no_project', 'only_05_hour']):
logger.info('Enforce choosing research project') logger.info('Enforce choosing research project')
self.enforce = True self.enforce = True
self.research_select(self.research_sort_filter(self.enforce)) self.research_select(self.research_sort_filter(self.enforce),
drop=drop, add_queue=add_queue)
return True return True
return False return False
@@ -101,7 +107,7 @@ class RewardResearch(ResearchSelector, ResearchQueue):
""" """
if not len(priority): if not len(priority):
logger.info('No research project satisfies current filter') logger.info('No research project satisfies current filter')
self.research_enforce() self.research_enforce(drop=drop, add_queue=add_queue)
return True return True
for project in priority: for project in priority:
# priority example: ['reset', 'shortest'] # priority example: ['reset', 'shortest']
@@ -114,13 +120,16 @@ class RewardResearch(ResearchSelector, ResearchQueue):
if isinstance(project, str): if isinstance(project, str):
# priority example: ['shortest'] # priority example: ['shortest']
if project == 'shortest': if project == 'shortest':
self.research_select(self.research_sort_shortest(self.enforce), drop=drop) self.research_select(self.research_sort_shortest(self.enforce),
drop=drop, add_queue=add_queue)
elif project == 'cheapest': elif project == 'cheapest':
self.research_select(self.research_sort_cheapest(self.enforce), drop=drop) self.research_select(self.research_sort_cheapest(self.enforce),
drop=drop, add_queue=add_queue)
else: else:
logger.warning(f'Unknown select method: {project}') logger.warning(f'Unknown select method: {project}')
return True return True
elif project.genre.upper() in ['C', 'T'] and self.research_enforce(): elif project.genre.upper() in ['C', 'T'] and \
self.research_enforce(drop=drop, add_queue=add_queue):
return True return True
else: else:
# priority example: [ResearchProject, ResearchProject,] # priority example: [ResearchProject, ResearchProject,]
@@ -130,7 +139,7 @@ class RewardResearch(ResearchSelector, ResearchQueue):
continue continue
logger.info('No research project started') logger.info('No research project started')
self.research_enforce() self.research_enforce(drop=drop, add_queue=add_queue)
return True return True
def research_project_start(self, project, add_queue=True, skip_first_screenshot=True): def research_project_start(self, project, add_queue=True, skip_first_screenshot=True):