From 6448f9174fb117eff0485852e678d4e4b9b071c8 Mon Sep 17 00:00:00 2001 From: Zuosizhu <2839299264@qq.com> Date: Thu, 11 Jul 2024 16:36:41 +0800 Subject: [PATCH] Add: PR7 gui settings --- config/template.json | 2 +- module/config/argument/args.json | 5 ++++- module/config/argument/argument.yaml | 5 ++++- module/config/config_generated.py | 2 +- module/config/i18n/en-US.json | 3 +++ module/config/i18n/ja-JP.json | 15 +++++++++------ module/config/i18n/zh-CN.json | 3 +++ module/config/i18n/zh-TW.json | 3 +++ 8 files changed, 28 insertions(+), 10 deletions(-) diff --git a/config/template.json b/config/template.json index b0c130966..93d88b85b 100644 --- a/config/template.json +++ b/config/template.json @@ -1869,7 +1869,7 @@ "UseCoin": "always_use", "UsePart": "always_use", "AllowDelay": true, - "PresetFilter": "series_6_blueprint_203", + "PresetFilter": "series_7_blueprint_la9", "CustomFilter": "S5-DR0.5 > S5-PRY0.5 > S5-H0.5 > S5-Q0.5 > S5-DR2.5 > 0.5 > S5-G1.5\n> S5-Q1 > S5-DR5 > S5-DR8 > S5-G4 > S5-PRY2.5 > 1 > S5-Q2 > reset\n> S5-G2.5 > S5-PRY5 > S5-PRY8 > 1.5 > 2 > S5-Q4 > 2.5 > 3\n> Q4 > G4 > 4 > 5 > S5-C6 > C6 > 6 > S5-C8 > 8\n> S5-C12 > 12" }, "Storage": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 5c14cd6be..075618ecf 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -10258,9 +10258,12 @@ }, "PresetFilter": { "type": "select", - "value": "series_6_blueprint_203", + "value": "series_7_blueprint_la9", "option": [ "custom", + "series_7_blueprint_la9", + "series_7_blueprint_only", + "series_7_la9_only", "series_6_blueprint_203", "series_6_blueprint_only", "series_6_203_only", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 449bfd458..1836598dd 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -546,9 +546,12 @@ Research: option: [ always_use, only_05_hour, only_no_project, do_not_use ] AllowDelay: true PresetFilter: - value: series_6_blueprint_203 + value: series_7_blueprint_la9 option: - custom + - series_7_blueprint_la9 + - series_7_blueprint_only + - series_7_la9_only - series_6_blueprint_203 - series_6_blueprint_only - series_6_203_only diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 891463539..c3a46d612 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -296,7 +296,7 @@ class GeneratedConfig: Research_UseCoin = 'always_use' # always_use, only_05_hour, only_no_project, do_not_use Research_UsePart = 'always_use' # always_use, only_05_hour, only_no_project, do_not_use Research_AllowDelay = True - Research_PresetFilter = 'series_6_blueprint_203' # custom, series_6_blueprint_203, series_6_blueprint_only, series_6_203_only, series_5_blueprint_152, series_5_blueprint_only, series_5_152_only, series_4_blueprint_tenrai, series_4_blueprint_only, series_4_tenrai_only, series_3_blueprint_234, series_3_blueprint_only, series_3_234_only, series_2_than_3_457_234, series_2_blueprint_457, series_2_blueprint_only, series_2_457_only + Research_PresetFilter = 'series_7_blueprint_la9' # custom, series_7_blueprint_la9, series_7_blueprint_only, series_7_la9_only, series_6_blueprint_203, series_6_blueprint_only, series_6_203_only, series_5_blueprint_152, series_5_blueprint_only, series_5_152_only, series_4_blueprint_tenrai, series_4_blueprint_only, series_4_tenrai_only, series_3_blueprint_234, series_3_blueprint_only, series_3_234_only, series_2_than_3_457_234, series_2_blueprint_457, series_2_blueprint_only, series_2_457_only Research_CustomFilter = 'S5-DR0.5 > S5-PRY0.5 > S5-H0.5 > S5-Q0.5 > S5-DR2.5 > 0.5 > S5-G1.5\n> S5-Q1 > S5-DR5 > S5-DR8 > S5-G4 > S5-PRY2.5 > 1 > S5-Q2 > reset\n> S5-G2.5 > S5-PRY5 > S5-PRY8 > 1.5 > 2 > S5-Q4 > 2.5 > 3\n> Q4 > G4 > 4 > 5 > S5-C6 > C6 > 6 > S5-C8 > 8\n> S5-C12 > 12' # Group `Dorm` diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 712c1a464..f49a67544 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -2033,6 +2033,9 @@ "name": "Preset Filter Select", "help": "See research drops rates and spawn rates in https://azur-stats.lyoko.io/. People without a basic knowledge of these are recommended to use pre-optimized presets instead of writing custom filters", "custom": "custom", + "series_7_blueprint_la9": "Series 7 Blueprint+La9", + "series_7_blueprint_only": "Series 7 Blueprint Only", + "series_7_la9_only": "Series 7 La9 Only", "series_6_blueprint_203": "Series 6 Blueprints+203", "series_6_blueprint_only": "Series 6 Blueprints Only", "series_6_203_only": "Series 6 203 Only", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index f74e5cdd4..cc47d37b6 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -2033,12 +2033,15 @@ "name": "Research.PresetFilter.name", "help": "Research.PresetFilter.help", "custom": "custom", - "series_6_blueprint_203": "series_6_blueprint_203", - "series_6_blueprint_only": "series_6_blueprint_only", - "series_6_203_only": "series_6_203_only", - "series_5_blueprint_152": "series_5_blueprint_152", - "series_5_blueprint_only": "series_5_blueprint_only", - "series_5_152_only": "series_5_152_only", + "series_7_blueprint_la9": "Series 7 Blueprint+La9", + "series_7_blueprint_only": "Series 7 Blueprint Only", + "series_7_la9_only": "Series 7 La9 Only", + "series_6_blueprint_203": "Series 6 Blueprints+203", + "series_6_blueprint_only": "Series 6 Blueprints Only", + "series_6_203_only": "Series 6 203 Only", + "series_5_blueprint_152": "Series 5 Blueprints+152", + "series_5_blueprint_only": "Series 5 Blueprints Only", + "series_5_152_only": "Series 5 152 Only", "series_4_blueprint_tenrai": "Series 4 Blueprints+Tenrai", "series_4_blueprint_only": "Series 4 Blueprints Only", "series_4_tenrai_only": "Series 4 Tenrai Only", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 2ab2682bd..447bec28d 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -2033,6 +2033,9 @@ "name": "科研过滤器", "help": "科研掉落和项目刷新见 https://azur-stats.lyoko.io/，对这些没有基本了解的人不建议编写自定义过滤器，建议使用预优化科研过滤器", "custom": "自定义", + "series_7_blueprint_la9": "七期 蓝图+La9", + "series_7_blueprint_only": "七期 仅蓝图", + "series_7_la9_only": "七期 仅La9", "series_6_blueprint_203": "六期 蓝图+203", "series_6_blueprint_only": "六期 仅蓝图", "series_6_203_only": "六期 仅203", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index cf0ef8895..7a403b593 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -2033,6 +2033,9 @@ "name": "科研過濾器", "help": "科研掉落和項目刷新見 https://azur-stats.lyoko.io/，對這些沒有基本了解的人不建議編寫自定義過濾器，建議使用預優化科研過濾器", "custom": "自定義", + "series_7_blueprint_la9": "七期 藍圖+La9", + "series_7_blueprint_only": "七期 僅藍圖", + "series_7_la9_only": "七期 僅La9", "series_6_blueprint_203": "六期 藍圖+203", "series_6_blueprint_only": "六期 僅藍圖", "series_6_203_only": "六期 僅203",