Skip to content

Commit e78100e

Browse files
authored
Add: Sarkaz roguelike (#4159)
* add Sarkaz Roguelike * add Sarkaz Roguelike
1 parent fac39e7 commit e78100e

9 files changed

Lines changed: 41 additions & 12 deletions

File tree

config/template.maa.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
"ServerUpdate": "04:00"
228228
},
229229
"MaaRoguelike": {
230-
"Theme": "Sami",
230+
"Theme": "Sarkaz",
231231
"Mode": 0,
232232
"StartsCount": 9999999,
233233
"InvestmentsCount": 9999999,

submodule/AlasMaaBridge/module/config/argument/args.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,8 @@
952952
"option": [
953953
"Phantom",
954954
"Mizuki",
955-
"Sami"
955+
"Sami",
956+
"Sarkaz"
956957
]
957958
},
958959
"Mode": {
@@ -980,6 +981,10 @@
980981
"type": "select",
981982
"value": "指挥分队",
982983
"option": [
984+
"魂灵护送分队",
985+
"博闻广记分队",
986+
"蓝图测绘分队",
987+
"因地制宜分队",
983988
"永恒狩猎分队",
984989
"生活至上分队",
985990
"科学主义分队",

submodule/AlasMaaBridge/module/config/argument/argument.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ MaaMall:
151151

152152
MaaRoguelike:
153153
Theme:
154-
value: Sami
155-
option: [ Phantom, Mizuki, Sami ]
154+
value: Sarkaz
155+
option: [ Phantom, Mizuki, Sami, Sarkaz ]
156156
Mode:
157157
value: 0
158158
option: [ 0, 1, 4 ]
@@ -161,7 +161,7 @@ MaaRoguelike:
161161
StopWhenInvestmentFull: false
162162
Squad:
163163
value: 指挥分队
164-
option: [ 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 ]
164+
option: [ 魂灵护送分队, 博闻广记分队, 蓝图测绘分队, 因地制宜分队, 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 ]
165165
Roles:
166166
value: 取长补短
167167
option: [ 先手必胜, 稳扎稳打, 取长补短, 随心所欲 ]

submodule/AlasMaaBridge/module/config/config_generated.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ class GeneratedConfig:
9999
MaaMall_BlackList = '碳 > 家具 > 加急许可'
100100

101101
# Group `MaaRoguelike`
102-
MaaRoguelike_Theme = 'Sami' # Phantom, Mizuki, Sami
102+
MaaRoguelike_Theme = 'Sarkaz' # Phantom, Mizuki, Sami, Sarkaz
103103
MaaRoguelike_Mode = 0 # 0, 1, 4
104104
MaaRoguelike_StartsCount = 9999999
105105
MaaRoguelike_InvestmentsCount = 9999999
106106
MaaRoguelike_StopWhenInvestmentFull = False
107-
MaaRoguelike_Squad = '指挥分队' # 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
107+
MaaRoguelike_Squad = '指挥分队' # 魂灵护送分队, 博闻广记分队, 蓝图测绘分队, 因地制宜分队, 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
108108
MaaRoguelike_Roles = '取长补短' # 先手必胜, 稳扎稳打, 取长补短, 随心所欲
109109
MaaRoguelike_CoreChar = None
110110
MaaRoguelike_Support = 'no_use' # no_use, friend_support, nonfriend_support

submodule/AlasMaaBridge/module/config/i18n/en-US.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@
513513
"help": "MaaRoguelike.Theme.help",
514514
"Phantom": "Phantom",
515515
"Mizuki": "Mizuki",
516-
"Sami": "Sami"
516+
"Sami": "Sami",
517+
"Sarkaz": "Sarkaz"
517518
},
518519
"Mode": {
519520
"name": "MaaRoguelike.Mode.name",
@@ -537,6 +538,10 @@
537538
"Squad": {
538539
"name": "MaaRoguelike.Squad.name",
539540
"help": "MaaRoguelike.Squad.help",
541+
"魂灵护送分队": "Soul Escort (Sarkaz)",
542+
"博闻广记分队": "Well-Informed (Sarkaz)",
543+
"蓝图测绘分队": "Blueprint Surveying (Sarkaz)",
544+
"因地制宜分队": "Adapting To Local Conditions (Sarkaz)",
540545
"永恒狩猎分队": "Eternal Hunting (Sami)",
541546
"生活至上分队": "Life Prioritizing (Sami)",
542547
"科学主义分队": "Scientific Thinking (Sami)",

submodule/AlasMaaBridge/module/config/i18n/ja-JP.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@
513513
"help": "MaaRoguelike.Theme.help",
514514
"Phantom": "Phantom",
515515
"Mizuki": "Mizuki",
516-
"Sami": "Sami"
516+
"Sami": "Sami",
517+
"Sarkaz": "Sarkaz"
517518
},
518519
"Mode": {
519520
"name": "MaaRoguelike.Mode.name",
@@ -537,6 +538,10 @@
537538
"Squad": {
538539
"name": "MaaRoguelike.Squad.name",
539540
"help": "MaaRoguelike.Squad.help",
541+
"魂灵护送分队": "魂灵护送分队",
542+
"博闻广记分队": "博闻广记分队",
543+
"蓝图测绘分队": "蓝图测绘分队",
544+
"因地制宜分队": "因地制宜分队",
540545
"永恒狩猎分队": "永恒狩猎分队",
541546
"生活至上分队": "生活至上分队",
542547
"科学主义分队": "科学主义分队",

submodule/AlasMaaBridge/module/config/i18n/zh-CN.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@
513513
"help": "需在集成战略界面手动将对应主题添加到终端",
514514
"Phantom": "傀影与猩红血钻",
515515
"Mizuki": "水月与深蓝之树",
516-
"Sami": "探索者的银凇止境"
516+
"Sami": "探索者的银凇止境",
517+
"Sarkaz": "萨卡兹的无终奇语"
517518
},
518519
"Mode": {
519520
"name": "策略",
@@ -537,6 +538,10 @@
537538
"Squad": {
538539
"name": "开局分队",
539540
"help": "",
541+
"魂灵护送分队": "魂灵护送分队(萨卡兹)",
542+
"博闻广记分队": "博闻广记分队(萨卡兹)",
543+
"蓝图测绘分队": "蓝图测绘分队(萨卡兹)",
544+
"因地制宜分队": "因地制宜分队(萨卡兹)",
540545
"永恒狩猎分队": "永恒狩猎分队(萨米)",
541546
"生活至上分队": "生活至上分队(萨米)",
542547
"科学主义分队": "科学主义分队(萨米)",

submodule/AlasMaaBridge/module/config/i18n/zh-TW.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@
513513
"help": "MaaRoguelike.Theme.help",
514514
"Phantom": "Phantom",
515515
"Mizuki": "Mizuki",
516-
"Sami": "Sami"
516+
"Sami": "Sami",
517+
"Sarkaz": "Sarkaz"
517518
},
518519
"Mode": {
519520
"name": "MaaRoguelike.Mode.name",
@@ -537,6 +538,10 @@
537538
"Squad": {
538539
"name": "MaaRoguelike.Squad.name",
539540
"help": "MaaRoguelike.Squad.help",
541+
"魂灵护送分队": "魂灵护送分队",
542+
"博闻广记分队": "博闻广记分队",
543+
"蓝图测绘分队": "蓝图测绘分队",
544+
"因地制宜分队": "因地制宜分队",
540545
"永恒狩猎分队": "永恒狩猎分队",
541546
"生活至上分队": "生活至上分队",
542547
"科学主义分队": "科学主义分队",

submodule/AlasMaaBridge/module/handler/handler.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,11 @@ def roguelike(self):
458458
self.config.MaaRoguelike_Theme != "Sami" and self.config.MaaRoguelike_Squad in ["永恒狩猎分队",
459459
"生活至上分队",
460460
"科学主义分队",
461-
"特训分队"]):
461+
"特训分队"]) or (
462+
self.config.MaaRoguelike_Theme != "Sarkaz" and self.config.MaaRoguelike_Squad in ["魂灵护送分队",
463+
"博闻广记分队",
464+
"蓝图测绘分队",
465+
"因地制宜分队"]):
462466

463467
args["squad"] = "指挥分队"
464468
if self.config.MaaRoguelike_CoreChar:

0 commit comments

Comments
 (0)