diff --git a/module/research/preset.py b/module/research/preset.py index 1c0b11028..766a307c5 100644 --- a/module/research/preset.py +++ b/module/research/preset.py @@ -4,34 +4,39 @@ DICT_FILTER_PRESET = { 'series_4_blueprint_tenrai_cube': """ S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR2.5 > 0.5 > S4-Q1 > S4-H1 > S4-Q2 > reset > S4-Q4 > S4-G1.5 > Q1 > 1 > S4-H2 > S4-G4 - > 1.5 > S4-G2.5 > S4-PRY2.5 > 2.5 > S4-DR5 > Q2 > 2 > S4-H4 > S4-DR8 - > S4-PRY5 > Q4 > G4 > 4 > 5 > S4-PRY8 > S4-C6 > 6 > S4-C8 > 8 - > S4-C12 > 12""", + > 1.5 > S4-G2.5 > S4-PRY2.5 > 2.5 > S4-DR5 > Q2 > 2 > S4-T3 > T3 > 3 + > S4-H4 > S4-DR8 > S4-PRY5 > Q4 > G4 > S4-T4 > T4 > 4 > 5 > S4-PRY8 + > S4-C6 > S4-T6 > C6 > T6 > 6 > S4-C8 > 8 > S4-C12 > 12""", 'series_4_blueprint_tenrai': """ S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-Q0.5 > S4-DR2.5 > 0.5 > S4-G1.5 > S4-Q1 > S4-DR5 > S4-DR8 > S4-G4 > S4-PRY2.5 > 1 > S4-Q2 > reset - > S4-G2.5 > S4-PRY5 > S4-PRY8 > 1.5 > 2 > S4-Q4 > 2.5 > 4 > 5 > S4-C6 - > 6 > S4-C8 > 8 > S4-C12 > 12""", + > S4-G2.5 > S4-PRY5 > S4-PRY8 > 1.5 > 2 > S4-Q4 > 2.5 > S4-T3 > T3 > 3 + > Q4 > G4 > S4-T4 > T4 > 4 > 5 > S4-C6 > S4-T6 > C6 > T6 > 6 > S4-C8 > 8 + > S4-C12 > 12""", 'series_4_blueprint_only_cube': """ S4-DR0.5 > S4-H0.5 > S4-PRY0.5 > S4-H1 > S4-H2 > S4-DR2.5 > S4-Q0.5 > 0.5 > S4-DR5 > reset > S4-DR8 > S4-H4 > S4-Q1 > Q1 > 1 > S4-G1.5 - > 1.5 > S4-Q2 > Q2 > 2 > S4-G2.5 > S4-PRY2.5 > 2.5 > S4-Q4 > S4-G4 - > Q4 > G4 > 4 > S4-PRY5 > 5 > S4-PRY8 > S4-C6 > 6 > S4-C8 > 8 > S4-C12 > 12""", + > 1.5 > S4-Q2 > Q2 > 2 > S4-G2.5 > S4-PRY2.5 > 2.5 > S4-T3 > T3 > 3 + > S4-Q4 > S4-G4 > Q4 > G4 > S4-T4 > T4 > 4 > S4-PRY5 > 5 > S4-PRY8 > S4-C6 + > S4-T6 > C6 > T6 > 6 > S4-C8 > 8 > S4-C12 > 12""", 'series_4_blueprint_only': """ S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR8 > S4-DR2.5 > S4-DR5 > S4-G1.5 > S4-PRY2.5 > S4-Q0.5 > 0.5 > S4-G2.5 > S4-Q1 > 1 > reset > S4-G4 - > S4-PRY5 > 1.5 > S4-Q2 > 2 > S4-PRY8 > 2.5 > S4-Q4 > 4 > 5 > S4-C6 - > 6 > S4-C8 > 8 > S4-C12 > 12""", + > S4-PRY5 > 1.5 > S4-Q2 > 2 > S4-PRY8 > 2.5 > S4-T3 > T3 > 3 > S4-Q4 + > Q4 > G4 > S4-T4 > T4 > 4 > 5 > S4-C6 > S4-T6 > C6 > T6 > 6 > S4-C8 > 8 + > S4-C12 > 12""", 'series_4_tenrai_only_cube': """ S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > S4-Q1 > S4-Q4 > S4-Q2 > S4-H0.5 > 0.5 - > S4-G4 > S4-G1.5 > Q1 > S4-1 > 1 > reset > S4-DR2.5 > S4-PRY2.5 - > S4-G2.5 > 1.5 > Q2 > S4-2 > 2 > 2.5 > S4-DR5 > S4-PRY5 > Q4 > G4 - > S4-4 > 4 > 5 > S4-DR8 > S4-PRY8 > S4-C6 > 6 > S4-C8 > 8 > S4-C12 > 12""", + > S4-G4 > S4-G1.5 > Q1 > S4-H1 > 1 > reset > S4-DR2.5 > S4-PRY2.5 + > S4-G2.5 > 1.5 > Q2 > S4-H2 > 2 > 2.5 > S4-T3 > T3 > 3 > S4-DR5 > S4-PRY5 + > Q4 > G4 > S4-T4 > T4 > S4-H4 > H4 > 4 > 5 > S4-DR8 > S4-PRY8 > S4-C6 + > S4-T6 > C6 > S4-C8 > 8 > S4-C12 > 12""", 'series_4_tenrai_only': """ S4-Q0.5 > S4-DR0.5 > S4-PRY0.5 > S4-Q4 > S4-Q1 > S4-Q2 > S4-H0.5 > 0.5 - > S4-G4 > S4-G1.5 > 1 > S4-DR2.5 > S4-PRY2.5 > reset > S4-G2.5 > 1.5 - > 2 > 2.5 > S4-DR5 > S4-PRY5 > 4 > 5 > S4-C6 > S4-DR8 > S4-PRY8 > S4-C8 - > 6 > 8 > S4-C12 > 12""", + > S4-G4 > S4-G1.5 > Q1 > 1 > S4-DR2.5 > S4-PRY2.5 > reset > S4-G2.5 > 1.5 + > Q2 > 2 > 2.5 > S4-T3 > T3 > 3 > S4-DR5 > S4-PRY5 > Q4 > G4 > S4-T4 > T4 + > 4 > 5 > S4-C6 > S4-T6 > S4-DR8 > S4-PRY8 > S4-C8 > C6 > T6 > 6 > 8 + > S4-C12 > 12""", 'series_3': 'S3-DR-0.5 > S3-0.5 > Q0.5 > S3-DR-2.5 > S3-DR-8 > S3-DR-5 > S3-H-1 > S3-H-4 > S3-H-2 > Q1 > Q2 > Q4 > reset > G1.5 > G2.5 > shortest', 'series_3_than_2': 'S3-DR-0.5 > S3-0.5 > S2-DR-0.5 > Q0.5 > S3-DR-2.5 > S3-DR-8 > S3-DR-5 > S3-H-1 > S3-H-4 > S3-H-2 > S2-DR-2.5 > S2-DR-8 > S2-DR-5 > Q1 > Q2 > Q4 > reset > G1.5 > G2.5 > shortest', 'series_3_fastest': 'S3-DR-0.5 > S3-0.5 > S3-DR-2.5 > S3-H-1 > S3-H-4 > S3-H-2 > S3-DR-8 > S3-DR-5 > Q1 > Q2 > reset > shortest', diff --git a/module/research/project.py b/module/research/project.py index 13ab08362..7b888d603 100644 --- a/module/research/project.py +++ b/module/research/project.py @@ -639,8 +639,9 @@ class ResearchSelector(UI): if project.genre.upper() == 'B': return False # T series require commission - if project.genre.upper() == 'T': - return False + # 2022.05.08 Allow T series researches because commission is now force to enable + # if project.genre.upper() == 'T': + # return False # 2021.08.19 Allow E-2 to disassemble tech boxes, but JP still remains the same. if self.config.SERVER == 'jp': if project.genre.upper() == 'E' and str(project.duration) != '6':