From af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621 Mon Sep 17 00:00:00 2001 From: Zuosizhu <2839299264@qq.com> Date: Thu, 11 Jul 2024 16:30:36 +0800 Subject: [PATCH] Add: PR7 presets and filters --- module/research/preset.py | 126 +++++++++++++++++++++------- module/research/preset_generator.py | 16 ++-- module/research/project.py | 3 +- module/research/project_data.py | 65 ++++++++++++++ module/research/selector.py | 5 +- 5 files changed, 175 insertions(+), 40 deletions(-) diff --git a/module/research/preset.py b/module/research/preset.py index 9f56c1a88..c6a81ffac 100644 --- a/module/research/preset.py +++ b/module/research/preset.py @@ -1,7 +1,73 @@ FILTER_STRING_SHORTEST = '0.5 > 1 > 1.5 > 2 > 2.5 > 3 > 4 > 5 > 6 > 8 > 10 > 12' FILTER_STRING_CHEAPEST = 'Q1 > Q2 > T3 > T4 > Q4 > C6 > T6 > C8 > C12 > G1.5 > D2.5 > G2.5 > D5 > Q0.5 > G4 > D8 > H1 > H2 > H0.5 > D0.5 > H4' DICT_FILTER_PRESET = { - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Average time cost: 153.41706666666678 + # Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333] + 'series_7_la9_only_cube': """ + S7-Q0.5 > S7-DR0.5 > S7-PRY0.5 > Q0.5 > S7-Q4 > S7-Q2 > S7-Q1 > 0.5 + > S7-E-315 > S7-G1.5 > S7-G4 > Q1 > reset > S7-H1 > H1 > 1 > S7-E-031 + > S7-DR2.5 > S7-PRY2.5 > S7-G2.5 > G1.5 > 1.5 > Q2 > E2 > S7-H2 > H2 + > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S7-DR5 > S7-PRY5 > Q4 > G4 + > S7-H4 > H4 > 4 > S7-C6 > DR5 > PRY5 > 5 > S7-DR8 > S7-PRY8 > S7-C8 + > C6 > 6 > S7-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 + """, + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Average time cost: 161.37177965277806 + # Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978] + 'series_7_la9_only': """ + S7-Q0.5 > S7-PRY0.5 > S7-DR0.5 > Q0.5 > S7-Q4 > S7-Q2 > S7-Q1 > 0.5 + > S7-E-315 > S7-G4 > S7-G1.5 > Q1 > 1 > S7-E-031 > S7-DR2.5 > reset + > S7-G2.5 > S7-PRY2.5 > G1.5 > 1.5 > Q2 > E2 > 2 > DR2.5 > PRY2.5 + > G2.5 > 2.5 > S7-DR5 > S7-PRY5 > Q4 > G4 > 4 > S7-C6 > DR5 > PRY5 + > 5 > S7-DR8 > S7-PRY8 > S7-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8 + > S7-C12 > C12 > 12 + """, + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Average time cost: 124.67622465277958 + # Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164] + 'series_7_blueprint_la9_cube': """ + S7-DR0.5 > S7-Q0.5 > S7-PRY0.5 > 0.5 > S7-DR2.5 > S7-Q1 > S7-Q2 + > S7-H1 > S7-E-315 > S7-G1.5 > reset > S7-Q4 > S7-G4 > S7-H2 > Q1 + > H1 > 1 > S7-G2.5 > S7-DR5 > S7-PRY2.5 > G1.5 > 1.5 > S7-E-031 + > S7-DR8 > Q2 > E2 > H2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S7-H4 + > S7-PRY5 > Q4 > G4 > H4 > 4 > S7-C6 > S7-PRY8 > DR5 > PRY5 > 5 > C6 + > 6 > S7-C8 > DR8 > PRY8 > C8 > 8 > S7-C12 > C12 > 12 + """, + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Average time cost: 143.56399131945145 + # Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499] + 'series_7_blueprint_la9': """ + S7-DR0.5 > S7-PRY0.5 > S7-Q0.5 > S7-H0.5 > Q0.5 > S7-DR2.5 + > S7-G1.5 > S7-Q1 > S7-DR5 > 0.5 > S7-G4 > S7-Q2 > S7-PRY2.5 > reset + > S7-DR8 > Q1 > 1 > S7-E-315 > S7-G2.5 > G1.5 > 1.5 > S7-E-031 + > S7-Q4 > Q2 > E2 > 2 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S7-PRY5 + > S7-PRY8 > Q4 > G4 > 4 > S7-C6 > DR5 > PRY5 > 5 > C6 > 6 > S7-C8 + > S7-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 + """, + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Average time cost: 82.0121088194467 + # Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791] + 'series_7_blueprint_only_cube': """ + S7-DR0.5 > S7-PRY0.5 > S7-H0.5 > S7-H1 > S7-H2 > S7-DR2.5 > S7-DR5 + > 0.5 > S7-DR8 > reset > S7-H4 > S7-Q1 > Q1 > H1 > 1 > S7-G1.5 > G1.5 + > 1.5 > S7-G2.5 > S7-Q2 > S7-E-315 > S7-E-031 > Q2 > E2 > H2 > 2 + > S7-PRY2.5 > S7-G4 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S7-Q4 > Q4 > G4 + > H4 > 4 > S7-PRY5 > S7-PRY8 > S7-C6 > DR5 > PRY5 > 5 > C6 > 6 + > S7-C8 > S7-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 + """, + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Average time cost: 124.71616166666873 + # Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238] + 'series_7_blueprint_only': """ + S7-DR0.5 > S7-H0.5 > S7-PRY0.5 > S7-DR8 > S7-DR5 > S7-DR2.5 + > S7-G1.5 > S7-PRY2.5 > 0.5 > S7-G2.5 > S7-G4 > reset > S7-Q1 > Q1 + > 1 > S7-PRY5 > G1.5 > 1.5 > S7-Q2 > S7-E-031 > S7-E-315 > Q2 > E2 + > 2 > S7-PRY8 > DR2.5 > PRY2.5 > G2.5 > 2.5 > S7-Q4 > Q4 > G4 > 4 + > S7-C6 > DR5 > PRY5 > 5 > C6 > 6 > S7-C8 > DR8 > PRY8 > C8 > 8 + > S7-C12 > C12 > 12 + """, + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 153.41706666666678 # Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333] 'series_6_203_only_cube': """ @@ -12,7 +78,7 @@ DICT_FILTER_PRESET = { > S6-H4 > H4 > 4 > S6-C6 > DR5 > PRY5 > 5 > S6-DR8 > S6-PRY8 > S6-C8 > C6 > 6 > S6-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 161.37177965277806 # Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978] 'series_6_203_only': """ @@ -23,7 +89,7 @@ DICT_FILTER_PRESET = { > 5 > S6-DR8 > S6-PRY8 > S6-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8 > S6-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 124.67622465277958 # Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164] 'series_6_blueprint_203_cube': """ @@ -34,7 +100,7 @@ DICT_FILTER_PRESET = { > S6-PRY5 > Q4 > G4 > H4 > 4 > S6-C6 > S6-PRY8 > DR5 > PRY5 > 5 > C6 > 6 > S6-C8 > DR8 > PRY8 > C8 > 8 > S6-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 143.56399131945145 # Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499] 'series_6_blueprint_203': """ @@ -45,7 +111,7 @@ DICT_FILTER_PRESET = { > S6-PRY8 > Q4 > G4 > 4 > S6-C6 > DR5 > PRY5 > 5 > C6 > 6 > S6-C8 > S6-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 82.0121088194467 # Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791] 'series_6_blueprint_only_cube': """ @@ -56,7 +122,7 @@ DICT_FILTER_PRESET = { > H4 > 4 > S6-PRY5 > S6-PRY8 > S6-C6 > DR5 > PRY5 > 5 > C6 > 6 > S6-C8 > S6-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 124.71616166666873 # Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238] 'series_6_blueprint_only': """ @@ -67,7 +133,7 @@ DICT_FILTER_PRESET = { > S6-C6 > DR5 > PRY5 > 5 > C6 > 6 > S6-C8 > DR8 > PRY8 > C8 > 8 > S6-C12 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 153.41706666666678 # Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333] 'series_5_152_only_cube': """ @@ -78,7 +144,7 @@ DICT_FILTER_PRESET = { > S5-H4 > H4 > 4 > S5-C6 > DR5 > PRY5 > 5 > S5-DR8 > S5-PRY8 > S5-C8 > C6 > 6 > S5-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 161.37177965277806 # Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978] 'series_5_152_only': """ @@ -89,7 +155,7 @@ DICT_FILTER_PRESET = { > 5 > S5-DR8 > S5-PRY8 > S5-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8 > S5-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 124.67622465277958 # Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164] 'series_5_blueprint_152_cube': """ @@ -100,7 +166,7 @@ DICT_FILTER_PRESET = { > S5-PRY5 > Q4 > G4 > H4 > 4 > S5-C6 > S5-PRY8 > DR5 > PRY5 > 5 > C6 > 6 > S5-C8 > DR8 > PRY8 > C8 > 8 > S5-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 143.56399131945145 # Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499] 'series_5_blueprint_152': """ @@ -111,7 +177,7 @@ DICT_FILTER_PRESET = { > S5-PRY8 > Q4 > G4 > 4 > S5-C6 > DR5 > PRY5 > 5 > C6 > 6 > S5-C8 > S5-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 82.0121088194467 # Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791] 'series_5_blueprint_only_cube': """ @@ -122,7 +188,7 @@ DICT_FILTER_PRESET = { > H4 > 4 > S5-PRY5 > S5-PRY8 > S5-C6 > DR5 > PRY5 > 5 > C6 > 6 > S5-C8 > S5-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 124.71616166666873 # Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238] 'series_5_blueprint_only': """ @@ -133,7 +199,7 @@ DICT_FILTER_PRESET = { > S5-C6 > DR5 > PRY5 > 5 > C6 > 6 > S5-C8 > DR8 > PRY8 > C8 > 8 > S5-C12 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 153.41706666666678 # Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333] 'series_4_tenrai_only_cube': """ @@ -144,7 +210,7 @@ DICT_FILTER_PRESET = { > S4-H4 > H4 > 4 > S4-C6 > DR5 > PRY5 > 5 > S4-DR8 > S4-PRY8 > S4-C8 > C6 > 6 > S4-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 161.37177965277806 # Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978] 'series_4_tenrai_only': """ @@ -155,7 +221,7 @@ DICT_FILTER_PRESET = { > 5 > S4-DR8 > S4-PRY8 > S4-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8 > S4-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 124.67622465277958 # Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164] 'series_4_blueprint_tenrai_cube': """ @@ -166,7 +232,7 @@ DICT_FILTER_PRESET = { > S4-PRY5 > Q4 > G4 > H4 > 4 > S4-C6 > S4-PRY8 > DR5 > PRY5 > 5 > C6 > 6 > S4-C8 > DR8 > PRY8 > C8 > 8 > S4-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 143.56399131945145 # Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499] 'series_4_blueprint_tenrai': """ @@ -177,7 +243,7 @@ DICT_FILTER_PRESET = { > S4-PRY8 > Q4 > G4 > 4 > S4-C6 > DR5 > PRY5 > 5 > C6 > 6 > S4-C8 > S4-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 82.0121088194467 # Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791] 'series_4_blueprint_only_cube': """ @@ -188,7 +254,7 @@ DICT_FILTER_PRESET = { > H4 > 4 > S4-PRY5 > S4-PRY8 > S4-C6 > DR5 > PRY5 > 5 > C6 > 6 > S4-C8 > S4-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 124.71616166666873 # Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238] 'series_4_blueprint_only': """ @@ -199,7 +265,7 @@ DICT_FILTER_PRESET = { > S4-C6 > DR5 > PRY5 > 5 > C6 > 6 > S4-C8 > DR8 > PRY8 > C8 > 8 > S4-C12 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 153.41706666666678 # Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333] 'series_3_234_only_cube': """ @@ -210,7 +276,7 @@ DICT_FILTER_PRESET = { > S3-H4 > H4 > 4 > S3-C6 > DR5 > PRY5 > 5 > S3-DR8 > S3-PRY8 > S3-C8 > C6 > 6 > S3-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 161.37177965277806 # Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978] 'series_3_234_only': """ @@ -221,7 +287,7 @@ DICT_FILTER_PRESET = { > 5 > S3-DR8 > S3-PRY8 > S3-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8 > S3-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 124.67622465277958 # Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164] 'series_3_blueprint_234_cube': """ @@ -232,7 +298,7 @@ DICT_FILTER_PRESET = { > S3-PRY5 > Q4 > G4 > H4 > 4 > S3-C6 > S3-PRY8 > DR5 > PRY5 > 5 > C6 > 6 > S3-C8 > DR8 > PRY8 > C8 > 8 > S3-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 143.56399131945145 # Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499] 'series_3_blueprint_234': """ @@ -243,7 +309,7 @@ DICT_FILTER_PRESET = { > S3-PRY8 > Q4 > G4 > 4 > S3-C6 > DR5 > PRY5 > 5 > C6 > 6 > S3-C8 > S3-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 82.0121088194467 # Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791] 'series_3_blueprint_only_cube': """ @@ -254,7 +320,7 @@ DICT_FILTER_PRESET = { > H4 > 4 > S3-PRY5 > S3-PRY8 > S3-C6 > DR5 > PRY5 > 5 > C6 > 6 > S3-C8 > S3-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 124.71616166666873 # Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238] 'series_3_blueprint_only': """ @@ -265,7 +331,7 @@ DICT_FILTER_PRESET = { > S3-C6 > DR5 > PRY5 > 5 > C6 > 6 > S3-C8 > DR8 > PRY8 > C8 > 8 > S3-C12 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 153.41706666666678 # Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333] 'series_2_457_only_cube': """ @@ -276,7 +342,7 @@ DICT_FILTER_PRESET = { > S2-H4 > H4 > 4 > S2-C6 > DR5 > PRY5 > 5 > S2-DR8 > S2-PRY8 > S2-C8 > C6 > 6 > S2-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + # Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 # Average time cost: 161.37177965277806 # Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978] 'series_2_457_only': """ @@ -287,7 +353,7 @@ DICT_FILTER_PRESET = { > 5 > S2-DR8 > S2-PRY8 > S2-C8 > C6 > 6 > DR8 > PRY8 > C8 > 8 > S2-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 124.67622465277958 # Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164] 'series_2_blueprint_457_cube': """ @@ -298,7 +364,7 @@ DICT_FILTER_PRESET = { > S2-PRY5 > Q4 > G4 > H4 > 4 > S2-C6 > S2-PRY8 > DR5 > PRY5 > 5 > C6 > 6 > S2-C8 > DR8 > PRY8 > C8 > 8 > S2-C12 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 # Average time cost: 143.56399131945145 # Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499] 'series_2_blueprint_457': """ @@ -309,7 +375,7 @@ DICT_FILTER_PRESET = { > S2-PRY8 > Q4 > G4 > 4 > S2-C6 > DR5 > PRY5 > 5 > C6 > 6 > S2-C8 > S2-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 82.0121088194467 # Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791] 'series_2_blueprint_only_cube': """ @@ -320,7 +386,7 @@ DICT_FILTER_PRESET = { > H4 > 4 > S2-PRY5 > S2-PRY8 > S2-C6 > DR5 > PRY5 > 5 > C6 > 6 > S2-C8 > S2-C12 > DR8 > PRY8 > C8 > 8 > C12 > 12 """, - # Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + # Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 # Average time cost: 124.71616166666873 # Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238] 'series_2_blueprint_only': """ diff --git a/module/research/preset_generator.py b/module/research/preset_generator.py index 07ab92395..df9c3ee9e 100644 --- a/module/research/preset_generator.py +++ b/module/research/preset_generator.py @@ -80,6 +80,8 @@ def translate(string: str, target='series_4_tenrai_only_cube', for_simulate=Fals def convert_name(name, series): name = re.sub(r'series_\d', f'series_{series}', name) + if 'series_7' in name: + name = name.replace('tenrai', 'la9') if 'series_6' in name: name = name.replace('tenrai', '203') if 'series_5' in name: @@ -100,7 +102,7 @@ if __name__ == '__main__': Value( FILTER_STRING_CHEAPEST='Q1 > Q2 > T3 > T4 > Q4 > C6 > T6 > C8 > C12 > G1.5 > D2.5 > G2.5 > D5 > Q0.5 > G4 > D8 > H1 > H2 > H0.5 > D0.5 > H4') with Dict('DICT_FILTER_PRESET'): - for series in [6, 5, 4, 3, 2]: + for series in [7, 6, 5, 4, 3, 2]: def new_filter(**kwargs): for k, v in kwargs.items(): k = convert_name(k, series) @@ -109,7 +111,7 @@ if __name__ == '__main__': # 1 Comment(""" - Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 Average time cost: 153.41706666666678 Average rewards: [238.69016631 238.37881965 529.71190834 528.92520834 528.39586667 150.07973333] """) @@ -122,7 +124,7 @@ if __name__ == '__main__': """) # 2 Comment(""" - Goal: DR_blurprint=0, PRY_blueprint=0, tanrai_blueprint=150 + Goal: DR_blueprint=0, PRY_blueprint=0, tanrai_blueprint=150 Average time cost: 161.37177965277806 Average rewards: [241.92774575 241.13046242 421.82134358 421.04494941 420.46893024 150.07799978] """) @@ -135,7 +137,7 @@ if __name__ == '__main__': """) # 5 Comment(""" - Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 Average time cost: 124.67622465277958 Average rewards: [531.93022864 529.81919864 510.27473326 510.18530159 510.11215826 100.8088164] """) @@ -148,7 +150,7 @@ if __name__ == '__main__': """) # 6 Comment(""" - Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=100 + Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=100 Average time cost: 143.56399131945145 Average rewards: [520.06195858 519.19883191 392.86544828 392.64870495 392.49383995 102.2368499] """) @@ -161,7 +163,7 @@ if __name__ == '__main__': """) # 3 Comment(""" - Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 Average time cost: 82.0121088194467 Average rewards: [519.0311752 514.64003687 653.77171198 653.72126532 653.66129615 26.97694791] """) @@ -174,7 +176,7 @@ if __name__ == '__main__': """) # 4 Comment(""" - Goal: DR_blurprint=513, PRY_blueprint=343, tanrai_blueprint=0 + Goal: DR_blueprint=513, PRY_blueprint=343, tanrai_blueprint=0 Average time cost: 124.71616166666873 Average rewards: [514.96354877 514.70099977 355.58865468 354.96831385 354.66888635 56.48432238] """) diff --git a/module/research/project.py b/module/research/project.py index a7e8a8d92..0f2cb00b6 100644 --- a/module/research/project.py +++ b/module/research/project.py @@ -100,7 +100,8 @@ def _get_research_series(img): (0, 0, 0): 3, (0, 1): 4, (1,): 5, - (1, 0): 6 + (1, 0): 6, + (1, 0, 0): 7 }.get(edge, 0) diff --git a/module/research/project_data.py b/module/research/project_data.py index 1ac7c77c1..95c61c224 100644 --- a/module/research/project_data.py +++ b/module/research/project_data.py @@ -302,6 +302,51 @@ LIST_RESEARCH_PROJECT = [ {'name': 'Q-089-MI', 'series': 6, 'time': 14400, 'task': '', 'input': [{'name': 'T3 Aircraft Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, {'name': 'H-387-MI', 'series': 6, 'time': 3600, 'task': '', 'input': [{'name': 'Wisdom Cube', 'amount': 3}], 'output': [{'name': 'Random Blueprint'}, {'name': 'T1 Mystery Retrofit Blueprint'}, {'name': 'Cognitive Chips'}]}, {'name': 'H-339-MI', 'series': 6, 'time': 7200, 'task': '', 'input': [{'name': 'Wisdom Cube', 'amount': 6}], 'output': [{'name': 'Random Blueprint'}, {'name': 'T2 Mystery Retrofit Blueprint'}, {'name': 'Cognitive Chips'}]}, + {'name': 'C-153-MI', 'series': 7, 'time': 21600, 'task': '', 'input': [], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'C-185-MI', 'series': 7, 'time': 28800, 'task': '', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'B-622-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 3 or onward stages for 6 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'B-636-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 4 or onward stages for 6 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'B-654-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 5 or onward stages for 6 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'B-682-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 6 or onward stages for 6 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'B-235-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 7 or onward stages for 5 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'B-268-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 8 or onward stages for 5 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'B-128-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 9 or onward stages for 4 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'B-164-MI', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 10 or onward stages for 4 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'T-018-MI', 'series': 7, 'time': 10800, 'task': 'Complete 2 commissions.', 'input': [], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'T-384-MI', 'series': 7, 'time': 14400, 'task': 'Complete 4 commissions.', 'input': [], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'T-249-MI', 'series': 7, 'time': 21600, 'task': 'Complete 6 commissions.', 'input': [], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'E-031-MI', 'series': 7, 'time': 7200, 'task': 'Scrap 8 pieces of gear.', 'input': [], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'E-315-MI', 'series': 7, 'time': 7200, 'task': 'Scrap 15 pieces of gear.', 'input': [], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'G-412-MI', 'series': 7, 'time': 5400, 'task': '', 'input': [{'name': 'Coins', 'amount': 1500}], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'G-236-MI', 'series': 7, 'time': 9000, 'task': '', 'input': [{'name': 'Coins', 'amount': 3000}], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'G-531-MI', 'series': 7, 'time': 14400, 'task': '', 'input': [{'name': 'Coins', 'amount': 6000}], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-790-MI', 'series': 7, 'time': 9000, 'task': '', 'input': [{'name': 'Coins', 'amount': 3000}], 'output': [{'name': 'Blueprint - Admiral Nakhimov'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'D-766-MI', 'series': 7, 'time': 9000, 'task': '', 'input': [{'name': 'Coins', 'amount': 3000}], 'output': [{'name': 'Blueprint - Napoli'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'D-703-MI', 'series': 7, 'time': 9000, 'task': '', 'input': [{'name': 'Coins', 'amount': 3000}], 'output': [{'name': 'Blueprint - Halford'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'D-758-MI', 'series': 7, 'time': 9000, 'task': '', 'input': [{'name': 'Coins', 'amount': 3000}], 'output': [{'name': 'Blueprint - Daisen'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'D-797-MI', 'series': 7, 'time': 9000, 'task': '', 'input': [{'name': 'Coins', 'amount': 3000}], 'output': [{'name': 'Blueprint - Bayard'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}]}, + {'name': 'D-390-MI', 'series': 7, 'time': 18000, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}], 'output': [{'name': 'Blueprint - Admiral Nakhimov'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-366-MI', 'series': 7, 'time': 18000, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}], 'output': [{'name': 'Blueprint - Napoli'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-303-MI', 'series': 7, 'time': 18000, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}], 'output': [{'name': 'Blueprint - Halford'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-358-MI', 'series': 7, 'time': 18000, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}], 'output': [{'name': 'Blueprint - Daisen'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-397-MI', 'series': 7, 'time': 18000, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}], 'output': [{'name': 'Blueprint - Bayard'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'Q-302-MI', 'series': 7, 'time': 3600, 'task': '', 'input': [{'name': 'T1 General Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-310-MI', 'series': 7, 'time': 3600, 'task': '', 'input': [{'name': 'T1 Main Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-351-MI', 'series': 7, 'time': 3600, 'task': '', 'input': [{'name': 'T1 Torpedo Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-368-MI', 'series': 7, 'time': 3600, 'task': '', 'input': [{'name': 'T1 Anti-Air Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-389-MI', 'series': 7, 'time': 3600, 'task': '', 'input': [{'name': 'T1 Aircraft Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-202-MI', 'series': 7, 'time': 7200, 'task': '', 'input': [{'name': 'T2 General Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-210-MI', 'series': 7, 'time': 7200, 'task': '', 'input': [{'name': 'T2 Main Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-251-MI', 'series': 7, 'time': 7200, 'task': '', 'input': [{'name': 'T2 Torpedo Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-268-MI', 'series': 7, 'time': 7200, 'task': '', 'input': [{'name': 'T2 Anti-Air Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-289-MI', 'series': 7, 'time': 7200, 'task': '', 'input': [{'name': 'T2 Aircraft Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T2'}, {'name': 'Coins'}]}, + {'name': 'Q-002-MI', 'series': 7, 'time': 14400, 'task': '', 'input': [{'name': 'T3 General Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'Q-010-MI', 'series': 7, 'time': 14400, 'task': '', 'input': [{'name': 'T3 Main Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'Q-051-MI', 'series': 7, 'time': 14400, 'task': '', 'input': [{'name': 'T3 Torpedo Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'Q-068-MI', 'series': 7, 'time': 14400, 'task': '', 'input': [{'name': 'T3 Anti-Air Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'Q-089-MI', 'series': 7, 'time': 14400, 'task': '', 'input': [{'name': 'T3 Aircraft Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'H-387-MI', 'series': 7, 'time': 3600, 'task': '', 'input': [{'name': 'Wisdom Cube', 'amount': 3}], 'output': [{'name': 'Random Blueprint'}, {'name': 'T1 Mystery Retrofit Blueprint'}, {'name': 'Cognitive Chips'}]}, + {'name': 'H-339-MI', 'series': 7, 'time': 7200, 'task': '', 'input': [{'name': 'Wisdom Cube', 'amount': 6}], 'output': [{'name': 'Random Blueprint'}, {'name': 'T2 Mystery Retrofit Blueprint'}, {'name': 'Cognitive Chips'}]}, {'name': 'C-038-RF', 'series': 1, 'time': 43200, 'task': '', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, {'name': 'B-351-RF', 'series': 1, 'time': 14400, 'task': 'Clear Chapter 11 or onward stages for 3 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, {'name': 'B-397-RF', 'series': 1, 'time': 14400, 'task': 'Clear Chapter 12 or onward stages for 3 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, @@ -450,4 +495,24 @@ LIST_RESEARCH_PROJECT = [ {'name': 'Q-068-UL', 'series': 6, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'T3 Anti-Air Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, {'name': 'Q-089-UL', 'series': 6, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'T3 Aircraft Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, {'name': 'H-063-UL', 'series': 6, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 8000}, {'name': 'Wisdom Cube', 'amount': 3}], 'output': [{'name': 'Random Blueprint'}, {'name': 'T3 Mystery Retrofit Blueprint'}, {'name': 'Cognitive Chips'}]}, + {'name': 'C-038-RF', 'series': 7, 'time': 43200, 'task': '', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}, {'name': 'Coins'}]}, + {'name': 'B-351-RF', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 11 or onward stages for 3 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'B-397-RF', 'series': 7, 'time': 14400, 'task': 'Clear Chapter 12 or onward stages for 3 times on Normal Mode ', 'input': [], 'output': [{'name': 'Random Blueprint'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-490-RF', 'series': 7, 'time': 28800, 'task': '', 'input': [{'name': 'Coins', 'amount': 8000}], 'output': [{'name': 'Blueprint - Admiral Nakhimov'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-466-RF', 'series': 7, 'time': 28800, 'task': '', 'input': [{'name': 'Coins', 'amount': 8000}], 'output': [{'name': 'Blueprint - Napoli'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-403-RF', 'series': 7, 'time': 28800, 'task': '', 'input': [{'name': 'Coins', 'amount': 8000}], 'output': [{'name': 'Blueprint - Halford'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-458-RF', 'series': 7, 'time': 28800, 'task': '', 'input': [{'name': 'Coins', 'amount': 8000}], 'output': [{'name': 'Blueprint - Daisen'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-497-RF', 'series': 7, 'time': 28800, 'task': '', 'input': [{'name': 'Coins', 'amount': 8000}], 'output': [{'name': 'Blueprint - Bayard'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'H-207-RF', 'series': 7, 'time': 14400, 'task': '', 'input': [{'name': 'Wisdom Cube', 'amount': 10}], 'output': [{'name': 'Random Blueprint'}, {'name': 'T3 Mystery Retrofit Blueprint'}, {'name': 'Cognitive Chips'}]}, + {'name': 'D-090-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'Wisdom Cube', 'amount': 5}], 'output': [{'name': 'Blueprint - Admiral Nakhimov'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-066-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'Wisdom Cube', 'amount': 5}], 'output': [{'name': 'Blueprint - Napoli'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-003-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'Wisdom Cube', 'amount': 5}], 'output': [{'name': 'Blueprint - Halford'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-058-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'Wisdom Cube', 'amount': 5}], 'output': [{'name': 'Blueprint - Daisen'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'D-097-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'Wisdom Cube', 'amount': 5}], 'output': [{'name': 'Blueprint - Bayard'}, {'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'Q-002-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'T3 General Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'Q-010-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'T3 Main Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'Q-051-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'T3 Torpedo Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'Q-068-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'T3 Anti-Air Gun Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'Q-089-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 5000}, {'name': 'T3 Aircraft Part', 'amount': 20}], 'output': [{'name': 'Random Gear Design'}, {'name': 'Random Gear Design T3'}]}, + {'name': 'H-063-UL', 'series': 7, 'time': 1800, 'task': '', 'input': [{'name': 'Coins', 'amount': 8000}, {'name': 'Wisdom Cube', 'amount': 3}], 'output': [{'name': 'Random Blueprint'}, {'name': 'T3 Mystery Retrofit Blueprint'}, {'name': 'Cognitive Chips'}]}, ] diff --git a/module/research/selector.py b/module/research/selector.py index b8149df44..16d1f15ab 100644 --- a/module/research/selector.py +++ b/module/research/selector.py @@ -12,14 +12,15 @@ from module.research.project import research_detect, research_jp_detect from module.research.ui import ResearchUI RESEARCH_ENTRANCE = [ENTRANCE_1, ENTRANCE_2, ENTRANCE_3, ENTRANCE_4, ENTRANCE_5] -FILTER_REGEX = re.compile('(s[123456])?' +FILTER_REGEX = re.compile('(s[1234567])?' '-?' '(neptune|monarch|ibuki|izumo|roon|saintlouis' '|seattle|georgia|kitakaze|azuma|friedrich' '|gascogne|champagne|cheshire|drake|mainz|odin' '|anchorage|hakuryu|agir|august|marcopolo' '|plymouth|rupprecht|harbin|chkalov|brest' - '|kearsarge|hindenburg|shimanto|schultz|flandre)?' + '|kearsarge|hindenburg|shimanto|schultz|flandre' + '|admiral nakhimov|napoli|halford|daisen|bayard)?' '(dr|pry)?' '([bcdeghqt])?' '-?'