diff --git a/config/template.maa.json b/config/template.maa.json index 86bb4023a..23a15567d 100644 --- a/config/template.maa.json +++ b/config/template.maa.json @@ -227,7 +227,7 @@ "ServerUpdate": "04:00" }, "MaaRoguelike": { - "Theme": "Sami", + "Theme": "Sarkaz", "Mode": 0, "StartsCount": 9999999, "InvestmentsCount": 9999999, diff --git a/submodule/AlasMaaBridge/module/config/argument/args.json b/submodule/AlasMaaBridge/module/config/argument/args.json index 9f042e728..a04dfc952 100644 --- a/submodule/AlasMaaBridge/module/config/argument/args.json +++ b/submodule/AlasMaaBridge/module/config/argument/args.json @@ -952,7 +952,8 @@ "option": [ "Phantom", "Mizuki", - "Sami" + "Sami", + "Sarkaz" ] }, "Mode": { @@ -980,6 +981,10 @@ "type": "select", "value": "指挥分队", "option": [ + "魂灵护送分队", + "博闻广记分队", + "蓝图测绘分队", + "因地制宜分队", "永恒狩猎分队", "生活至上分队", "科学主义分队", diff --git a/submodule/AlasMaaBridge/module/config/argument/argument.yaml b/submodule/AlasMaaBridge/module/config/argument/argument.yaml index 88b4c54df..d0df371a8 100644 --- a/submodule/AlasMaaBridge/module/config/argument/argument.yaml +++ b/submodule/AlasMaaBridge/module/config/argument/argument.yaml @@ -151,8 +151,8 @@ MaaMall: MaaRoguelike: Theme: - value: Sami - option: [ Phantom, Mizuki, Sami ] + value: Sarkaz + option: [ Phantom, Mizuki, Sami, Sarkaz ] Mode: value: 0 option: [ 0, 1, 4 ] @@ -161,7 +161,7 @@ MaaRoguelike: StopWhenInvestmentFull: false Squad: value: 指挥分队 - option: [ 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 ] + option: [ 魂灵护送分队, 博闻广记分队, 蓝图测绘分队, 因地制宜分队, 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 ] Roles: value: 取长补短 option: [ 先手必胜, 稳扎稳打, 取长补短, 随心所欲 ] diff --git a/submodule/AlasMaaBridge/module/config/config_generated.py b/submodule/AlasMaaBridge/module/config/config_generated.py index 4aa7e6a7a..fff36ce6e 100644 --- a/submodule/AlasMaaBridge/module/config/config_generated.py +++ b/submodule/AlasMaaBridge/module/config/config_generated.py @@ -99,12 +99,12 @@ class GeneratedConfig: MaaMall_BlackList = '碳 > 家具 > 加急许可' # Group `MaaRoguelike` - MaaRoguelike_Theme = 'Sami' # Phantom, Mizuki, Sami + MaaRoguelike_Theme = 'Sarkaz' # Phantom, Mizuki, Sami, Sarkaz MaaRoguelike_Mode = 0 # 0, 1, 4 MaaRoguelike_StartsCount = 9999999 MaaRoguelike_InvestmentsCount = 9999999 MaaRoguelike_StopWhenInvestmentFull = False - MaaRoguelike_Squad = '指挥分队' # 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 + MaaRoguelike_Squad = '指挥分队' # 魂灵护送分队, 博闻广记分队, 蓝图测绘分队, 因地制宜分队, 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 MaaRoguelike_Roles = '取长补短' # 先手必胜, 稳扎稳打, 取长补短, 随心所欲 MaaRoguelike_CoreChar = None MaaRoguelike_Support = 'no_use' # no_use, friend_support, nonfriend_support diff --git a/submodule/AlasMaaBridge/module/config/i18n/en-US.json b/submodule/AlasMaaBridge/module/config/i18n/en-US.json index b8b9ef95f..c3bb6ba62 100644 --- a/submodule/AlasMaaBridge/module/config/i18n/en-US.json +++ b/submodule/AlasMaaBridge/module/config/i18n/en-US.json @@ -513,7 +513,8 @@ "help": "MaaRoguelike.Theme.help", "Phantom": "Phantom", "Mizuki": "Mizuki", - "Sami": "Sami" + "Sami": "Sami", + "Sarkaz": "Sarkaz" }, "Mode": { "name": "MaaRoguelike.Mode.name", @@ -537,6 +538,10 @@ "Squad": { "name": "MaaRoguelike.Squad.name", "help": "MaaRoguelike.Squad.help", + "魂灵护送分队": "Soul Escort (Sarkaz)", + "博闻广记分队": "Well-Informed (Sarkaz)", + "蓝图测绘分队": "Blueprint Surveying (Sarkaz)", + "因地制宜分队": "Adapting To Local Conditions (Sarkaz)", "永恒狩猎分队": "Eternal Hunting (Sami)", "生活至上分队": "Life Prioritizing (Sami)", "科学主义分队": "Scientific Thinking (Sami)", diff --git a/submodule/AlasMaaBridge/module/config/i18n/ja-JP.json b/submodule/AlasMaaBridge/module/config/i18n/ja-JP.json index 8c8c7d6df..a92851e17 100644 --- a/submodule/AlasMaaBridge/module/config/i18n/ja-JP.json +++ b/submodule/AlasMaaBridge/module/config/i18n/ja-JP.json @@ -513,7 +513,8 @@ "help": "MaaRoguelike.Theme.help", "Phantom": "Phantom", "Mizuki": "Mizuki", - "Sami": "Sami" + "Sami": "Sami", + "Sarkaz": "Sarkaz" }, "Mode": { "name": "MaaRoguelike.Mode.name", @@ -537,6 +538,10 @@ "Squad": { "name": "MaaRoguelike.Squad.name", "help": "MaaRoguelike.Squad.help", + "魂灵护送分队": "魂灵护送分队", + "博闻广记分队": "博闻广记分队", + "蓝图测绘分队": "蓝图测绘分队", + "因地制宜分队": "因地制宜分队", "永恒狩猎分队": "永恒狩猎分队", "生活至上分队": "生活至上分队", "科学主义分队": "科学主义分队", diff --git a/submodule/AlasMaaBridge/module/config/i18n/zh-CN.json b/submodule/AlasMaaBridge/module/config/i18n/zh-CN.json index 53cc3e50d..9d6a6c4c3 100644 --- a/submodule/AlasMaaBridge/module/config/i18n/zh-CN.json +++ b/submodule/AlasMaaBridge/module/config/i18n/zh-CN.json @@ -513,7 +513,8 @@ "help": "需在集成战略界面手动将对应主题添加到终端", "Phantom": "傀影与猩红血钻", "Mizuki": "水月与深蓝之树", - "Sami": "探索者的银凇止境" + "Sami": "探索者的银凇止境", + "Sarkaz": "萨卡兹的无终奇语" }, "Mode": { "name": "策略", @@ -537,6 +538,10 @@ "Squad": { "name": "开局分队", "help": "", + "魂灵护送分队": "魂灵护送分队(萨卡兹)", + "博闻广记分队": "博闻广记分队(萨卡兹)", + "蓝图测绘分队": "蓝图测绘分队(萨卡兹)", + "因地制宜分队": "因地制宜分队(萨卡兹)", "永恒狩猎分队": "永恒狩猎分队(萨米)", "生活至上分队": "生活至上分队(萨米)", "科学主义分队": "科学主义分队(萨米)", diff --git a/submodule/AlasMaaBridge/module/config/i18n/zh-TW.json b/submodule/AlasMaaBridge/module/config/i18n/zh-TW.json index 4836778f9..c98c13b96 100644 --- a/submodule/AlasMaaBridge/module/config/i18n/zh-TW.json +++ b/submodule/AlasMaaBridge/module/config/i18n/zh-TW.json @@ -513,7 +513,8 @@ "help": "MaaRoguelike.Theme.help", "Phantom": "Phantom", "Mizuki": "Mizuki", - "Sami": "Sami" + "Sami": "Sami", + "Sarkaz": "Sarkaz" }, "Mode": { "name": "MaaRoguelike.Mode.name", @@ -537,6 +538,10 @@ "Squad": { "name": "MaaRoguelike.Squad.name", "help": "MaaRoguelike.Squad.help", + "魂灵护送分队": "魂灵护送分队", + "博闻广记分队": "博闻广记分队", + "蓝图测绘分队": "蓝图测绘分队", + "因地制宜分队": "因地制宜分队", "永恒狩猎分队": "永恒狩猎分队", "生活至上分队": "生活至上分队", "科学主义分队": "科学主义分队", diff --git a/submodule/AlasMaaBridge/module/handler/handler.py b/submodule/AlasMaaBridge/module/handler/handler.py index 73298269d..4e9f8dd91 100644 --- a/submodule/AlasMaaBridge/module/handler/handler.py +++ b/submodule/AlasMaaBridge/module/handler/handler.py @@ -458,7 +458,11 @@ class AssistantHandler: self.config.MaaRoguelike_Theme != "Sami" and self.config.MaaRoguelike_Squad in ["永恒狩猎分队", "生活至上分队", "科学主义分队", - "特训分队"]): + "特训分队"]) or ( + self.config.MaaRoguelike_Theme != "Sarkaz" and self.config.MaaRoguelike_Squad in ["魂灵护送分队", + "博闻广记分队", + "蓝图测绘分队", + "因地制宜分队"]): args["squad"] = "指挥分队" if self.config.MaaRoguelike_CoreChar: