sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00
Code Activity

Opt: Use the cube optimized filter when forcing research

Browse Source
This commit is contained in:
SarContDeli
2022-05-30 19:40:29 +08:00
parent 83c3a9658c
commit 793092e3a7
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/research/project.py
View File

@@ -582,7 +582,7 @@ class ResearchSelector(UI):
if preset == 'custom':
string = self.config.Research_CustomFilter
else:
if self.config.Research_UseCube == 'always_use':
if self.config.Research_UseCube == 'always_use' or enforce:
if f'{preset}_cube' in DICT_FILTER_PRESET:
preset = f'{preset}_cube'
if preset not in DICT_FILTER_PRESET:

15
module/research/research.py
View File

@@ -94,16 +94,19 @@ class RewardResearch(ResearchSelector):
return True
def research_enforce(self):
"""
Returns:
bool: True if triggered enforce research
"""
if (not self.enforce) \
and (self.config.Research_UseCube == 'only_no_project'
or self.config.Research_UseCube == 'only_05_hour'
or self.config.Research_UseCoin == 'only_no_project'
or self.config.Research_UseCoin == 'only_05_hour'
or self.config.Research_UsePart == 'only_no_project'
or self.config.Research_UsePart == 'only_05_hour'):
and (self.config.Research_UseCube in ['only_no_project', 'only_05_hour']
or self.config.Research_UseCoin 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')
self.enforce = True
self.research_select(self.research_sort_filter(self.enforce))
return True
return False
def research_select(self, priority):
"""