sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-17 13:25:26 +08:00
Code Activity

Opt: Changed the implementation of #1119

Browse Source
This commit is contained in:
SarContDeli
2022-05-13 14:09:12 +08:00
parent 632af5d976
commit 25b3ac58b4
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/research/project.py
View File

@@ -571,7 +571,7 @@ class ResearchSelector(UI):
self.projects = projects
def research_sort_filter(self):
def research_sort_filter(self, enforce):
"""
Returns:
list: A list of ResearchProject objects and preset strings,
@@ -596,10 +596,8 @@ class ResearchSelector(UI):
string = string.lower().replace('hakuryuu', 'hakuryu')
FILTER.load(string)
priority = FILTER.apply(self.projects, func=self._research_check)
if not [project for project in priority
if project != 'reset' and project != 'shortest' and project != 'cheapest']:
priority = FILTER.apply(self.projects, func=partial(self._research_check, enforce=True))
priority = FILTER.apply(self.projects, func=partial(self._research_check, enforce=enforce))
# Log
logger.attr('Filter_sort', ' > '.join([str(project) for project in priority]))
return priority
@@ -661,26 +659,26 @@ class ResearchSelector(UI):
return True
def research_sort_shortest(self):
def research_sort_shortest(self, enforce):
"""
Returns:
list: A list of ResearchProject objects and preset strings,
such as [object, object, object, 'reset']
"""
FILTER.load(FILTER_STRING_SHORTEST)
priority = FILTER.apply(self.projects, func=self._research_check)
priority = FILTER.apply(self.projects, func=partial(self._research_check, enforce=enforce))
logger.attr('Filter_sort', ' > '.join([str(project) for project in priority]))
return priority
def research_sort_cheapest(self):
def research_sort_cheapest(self, enforce):
"""
Returns:
list: A list of ResearchProject objects and preset strings,
such as [object, object, object, 'reset']
"""
FILTER.load(FILTER_STRING_CHEAPEST)
priority = FILTER.apply(self.projects, func=self._research_check)
priority = FILTER.apply(self.projects, func=partial(self._research_check, enforce=enforce))
logger.attr('Filter_sort', ' > '.join([str(project) for project in priority]))
return priority