From 337ff1d550c6f8fd530d1dd4beac3f59dff8c446 Mon Sep 17 00:00:00 2001 From: ZuoSiZhu <2839299264@qq.com> Date: Sat, 1 Mar 2025 15:08:37 +0800 Subject: [PATCH] Add: choice to do_nothing in type-changer --- config/deploy.template-AidLux-cn.yaml | 2 +- config/deploy.template-AidLux.yaml | 2 +- config/deploy.template-cn.yaml | 2 +- config/deploy.template-docker-cn.yaml | 2 +- config/deploy.template-docker.yaml | 2 +- config/deploy.template-linux-cn.yaml | 2 +- config/deploy.template-linux.yaml | 2 +- config/deploy.template.yaml | 2 +- module/config/argument/args.json | 21 ++++++++++++--------- module/config/argument/argument.yaml | 2 ++ module/config/config_generated.py | 4 ++-- module/config/i18n/en-US.json | 6 ++++-- module/config/i18n/ja-JP.json | 6 ++++-- module/config/i18n/zh-CN.json | 6 ++++-- module/config/i18n/zh-TW.json | 6 ++++-- 15 files changed, 40 insertions(+), 27 deletions(-) diff --git a/config/deploy.template-AidLux-cn.yaml b/config/deploy.template-AidLux-cn.yaml index b37ef13b2..c92dbc68b 100644 --- a/config/deploy.template-AidLux-cn.yaml +++ b/config/deploy.template-AidLux-cn.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: /usr/bin/python # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: https://mirrors.aliyun.com/pypi/simple # Install dependencies at startup diff --git a/config/deploy.template-AidLux.yaml b/config/deploy.template-AidLux.yaml index 4eb0dda8b..68a19e145 100644 --- a/config/deploy.template-AidLux.yaml +++ b/config/deploy.template-AidLux.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: /usr/bin/python # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: null # Install dependencies at startup diff --git a/config/deploy.template-cn.yaml b/config/deploy.template-cn.yaml index 59cbec818..b7687a408 100644 --- a/config/deploy.template-cn.yaml +++ b/config/deploy.template-cn.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: ./toolkit/python.exe # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: https://mirrors.aliyun.com/pypi/simple # Install dependencies at startup diff --git a/config/deploy.template-docker-cn.yaml b/config/deploy.template-docker-cn.yaml index ad4a491aa..a792896d3 100644 --- a/config/deploy.template-docker-cn.yaml +++ b/config/deploy.template-docker-cn.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: /usr/local/bin/python # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: https://mirrors.aliyun.com/pypi/simple # Install dependencies at startup diff --git a/config/deploy.template-docker.yaml b/config/deploy.template-docker.yaml index b197bd921..1dc8421ec 100644 --- a/config/deploy.template-docker.yaml +++ b/config/deploy.template-docker.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: /usr/local/bin/python # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: null # Install dependencies at startup diff --git a/config/deploy.template-linux-cn.yaml b/config/deploy.template-linux-cn.yaml index 26693d759..bf266f8f9 100644 --- a/config/deploy.template-linux-cn.yaml +++ b/config/deploy.template-linux-cn.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: python # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: https://mirrors.aliyun.com/pypi/simple # Install dependencies at startup diff --git a/config/deploy.template-linux.yaml b/config/deploy.template-linux.yaml index 6b420880c..a1abe262f 100644 --- a/config/deploy.template-linux.yaml +++ b/config/deploy.template-linux.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: python # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: null # Install dependencies at startup diff --git a/config/deploy.template.yaml b/config/deploy.template.yaml index a841c48da..5453b9c6f 100644 --- a/config/deploy.template.yaml +++ b/config/deploy.template.yaml @@ -35,7 +35,7 @@ Deploy: # [Other] Use you own python, and its version should be 3.7.6 64bit PythonExecutable: ./toolkit/python.exe # URL of pypi mirror - # [CN user] Use 'https://mirrors.aliyun.com/pypi/simple' for faster and more stable download + # [CN user] Use 'https://pypi.tuna.tsinghua.edu.cn/simple' for faster and more stable download # [Other] Use null PypiMirror: null # Install dependencies at startup diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 20c9a8104..0473e6076 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -5511,16 +5511,17 @@ "event_20240912_cn", "event_20241024_cn", "event_20241121_cn", - "event_20241219_cn" + "event_20241219_cn", + "event_20250227_cn" ], "option_bold": [ - "event_20221222_cn", - "event_20231221_cn" + "event_20240725_cn", + "event_20250227_cn" ], - "cn": "event_20221222_cn", - "en": "event_20221222_cn", - "jp": "event_20221222_cn", - "tw": "event_20231221_cn" + "cn": "event_20250227_cn", + "en": "event_20250227_cn", + "jp": "event_20250227_cn", + "tw": "event_20240725_cn" }, "Mode": { "type": "select", @@ -13051,7 +13052,8 @@ "option": [ "downes_and_cassin_to_ca", "downes_and_cassin_to_cl", - "custom" + "custom", + "do_nothing" ] }, "CapitalShip": { @@ -13061,7 +13063,8 @@ "cvl_to_bc", "cvl_to_bb", "cvl_to_cv", - "custom" + "custom", + "do_nothing" ] }, "ShipData": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index cc2f4b015..c37cb3ae9 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -980,6 +980,7 @@ ChangeShip: downes_and_cassin_to_ca, downes_and_cassin_to_cl, custom, + do_nothing, ] CapitalShip: value: cvl_to_bc @@ -988,6 +989,7 @@ ChangeShip: cvl_to_bb, cvl_to_cv, custom, + do_nothing, ] ShipData: type: textarea diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 0fb09f9ec..f2b8748b5 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -568,8 +568,8 @@ class GeneratedConfig: ChangeShip_Enable = False ChangeShip_PushLua = False ChangeShip_Timeout = 90 - ChangeShip_Vanguard = 'downes_and_cassin_to_ca' # downes_and_cassin_to_ca, downes_and_cassin_to_cl, custom - ChangeShip_CapitalShip = 'cvl_to_bc' # cvl_to_bc, cvl_to_bb, cvl_to_cv, custom + ChangeShip_Vanguard = 'downes_and_cassin_to_ca' # downes_and_cassin_to_ca, downes_and_cassin_to_cl, custom, do_nothing + ChangeShip_CapitalShip = 'cvl_to_bc' # cvl_to_bc, cvl_to_bb, cvl_to_cv, custom, do_nothing ChangeShip_ShipData = '106021;2;1;6;4\n107041;2;1;6;4\n206011;2;1;6;4\n107011;2;1;6;4\n\n105011;2;1;5;19\n105021;2;1;5;19\n\n101041;2;1;1;3\n101031;2;1;1;3' # Group `ChangeAttribute` diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index af573d539..b086afe30 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -3365,7 +3365,8 @@ "help": "ChangeShip.Vanguard.help", "downes_and_cassin_to_ca": "downes_and_cassin_to_ca", "downes_and_cassin_to_cl": "downes_and_cassin_to_cl", - "custom": "custom" + "custom": "custom", + "do_nothing": "do_nothing" }, "CapitalShip": { "name": "ChangeShip.CapitalShip.name", @@ -3373,7 +3374,8 @@ "cvl_to_bc": "cvl_to_bc", "cvl_to_bb": "cvl_to_bb", "cvl_to_cv": "cvl_to_cv", - "custom": "custom" + "custom": "custom", + "do_nothing": "do_nothing" }, "ShipData": { "name": "ChangeShip.ShipData.name", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 50113bced..998f6621e 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -3365,7 +3365,8 @@ "help": "ChangeShip.Vanguard.help", "downes_and_cassin_to_ca": "downes_and_cassin_to_ca", "downes_and_cassin_to_cl": "downes_and_cassin_to_cl", - "custom": "custom" + "custom": "custom", + "do_nothing": "do_nothing" }, "CapitalShip": { "name": "ChangeShip.CapitalShip.name", @@ -3373,7 +3374,8 @@ "cvl_to_bc": "cvl_to_bc", "cvl_to_bb": "cvl_to_bb", "cvl_to_cv": "cvl_to_cv", - "custom": "custom" + "custom": "custom", + "do_nothing": "do_nothing" }, "ShipData": { "name": "ChangeShip.ShipData.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 9ead855d9..86efbe8fc 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -3365,7 +3365,8 @@ "help": "", "downes_and_cassin_to_ca": "唐卡改重巡", "downes_and_cassin_to_cl": "唐卡改轻巡", - "custom": "自定义" + "custom": "自定义", + "do_nothing": "不改前排" }, "CapitalShip": { "name": "后排设置", @@ -3373,7 +3374,8 @@ "cvl_to_bc": "白轻航改战巡", "cvl_to_bb": "白轻航改战列", "cvl_to_cv": "白轻航改航母", - "custom": "自定义" + "custom": "自定义", + "do_nothing": "不改后排" }, "ShipData": { "name": "舰船数据", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 975f2dfb5..c336533fd 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -3365,7 +3365,8 @@ "help": "ChangeShip.Vanguard.help", "downes_and_cassin_to_ca": "downes_and_cassin_to_ca", "downes_and_cassin_to_cl": "downes_and_cassin_to_cl", - "custom": "custom" + "custom": "custom", + "do_nothing": "do_nothing" }, "CapitalShip": { "name": "ChangeShip.CapitalShip.name", @@ -3373,7 +3374,8 @@ "cvl_to_bc": "cvl_to_bc", "cvl_to_bb": "cvl_to_bb", "cvl_to_cv": "cvl_to_cv", - "custom": "custom" + "custom": "custom", + "do_nothing": "do_nothing" }, "ShipData": { "name": "ChangeShip.ShipData.name",