diff --git a/config/template.json b/config/template.json index 814cffd..32e3802 100644 --- a/config/template.json +++ b/config/template.json @@ -63,6 +63,26 @@ "ServerUpdate": "04:00" } }, + "Bounty": { + "Scheduler": { + "Enable": true, + "NextRun": "2020-01-01 00:00:00", + "Command": "Bounty", + "ServerUpdate": "04:00" + }, + "Highway": { + "Stage": 1, + "Count": 2 + }, + "DesertRailroad": { + "Stage": 1, + "Count": 2 + }, + "Schoolhouse": { + "Stage": 1, + "Count": 2 + } + }, "TacticalChallenge": { "Scheduler": { "Enable": true, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 33106ea..db609e0 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -257,6 +257,96 @@ } } }, + "Bounty": { + "Scheduler": { + "Enable": { + "type": "checkbox", + "value": true, + "option": [ + true, + false + ] + }, + "NextRun": { + "type": "datetime", + "value": "2020-01-01 00:00:00", + "validate": "datetime" + }, + "Command": { + "type": "input", + "value": "Bounty", + "display": "hide" + }, + "ServerUpdate": { + "type": "input", + "value": "04:00", + "display": "hide" + } + }, + "Highway": { + "Stage": { + "type": "select", + "value": 1, + "option": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9 + ] + }, + "Count": { + "type": "input", + "value": 2 + } + }, + "DesertRailroad": { + "Stage": { + "type": "select", + "value": 1, + "option": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9 + ] + }, + "Count": { + "type": "input", + "value": 2 + } + }, + "Schoolhouse": { + "Stage": { + "type": "select", + "value": 1, + "option": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9 + ] + }, + "Count": { + "type": "input", + "value": 2 + } + } + }, "TacticalChallenge": { "Scheduler": { "Enable": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 819919c..eda1b66 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -81,6 +81,22 @@ Cafe: AutoAdjust: true SecondCafe: true +Highway: + Stage: + value: 1 + option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] + Count: 2 +DesertRailroad: + Stage: + value: 1 + option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] + Count: 2 +Schoolhouse: + Stage: + value: 1 + option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] + Count: 2 + TacticalChallenge: PlayerSelect: value: 0 diff --git a/module/config/argument/default.yaml b/module/config/argument/default.yaml index 4b1585f..d05be5a 100644 --- a/module/config/argument/default.yaml +++ b/module/config/argument/default.yaml @@ -13,6 +13,9 @@ Mail: Circle: Scheduler: Enable: true +Bounty: + Scheduler: + Enable: true TacticalChallenge: Scheduler: Enable: true \ No newline at end of file diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 71fa952..7fc71d7 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -14,6 +14,7 @@ "Cafe", "Mail", "Circle", + "Bounty", "TacticalChallenge", "DataUpdate" ] diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index ccb7176..b37f270 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -29,6 +29,11 @@ Daily: - Scheduler Circle: - Scheduler + Bounty: + - Scheduler + - Highway + - DesertRailroad + - Schoolhouse TacticalChallenge: - Scheduler - TacticalChallenge diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 80537d9..876f2b0 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -45,6 +45,18 @@ class GeneratedConfig: Cafe_AutoAdjust = True Cafe_SecondCafe = True + # Group `Highway` + Highway_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9 + Highway_Count = 2 + + # Group `DesertRailroad` + DesertRailroad_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9 + DesertRailroad_Count = 2 + + # Group `Schoolhouse` + Schoolhouse_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9 + Schoolhouse_Count = 2 + # Group `TacticalChallenge` TacticalChallenge_PlayerSelect = 0 # 0, 1, 2, 3 diff --git a/module/config/config_manual.py b/module/config/config_manual.py index d5dbfd5..a76c84c 100644 --- a/module/config/config_manual.py +++ b/module/config/config_manual.py @@ -8,7 +8,7 @@ class ManualConfig: SCHEDULER_PRIORITY = """ Restart - > Cafe > Circle > Mail > DataUpdate > TacticalChallenge + > Cafe > Circle > Mail > DataUpdate > Bounty > TacticalChallenge """ """ diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 54272f5..4073d47 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -30,6 +30,10 @@ "name": "Club", "help": "" }, + "Bounty": { + "name": "Bounty", + "help": "" + }, "TacticalChallenge": { "name": "Tactical Challenge", "help": "" @@ -209,6 +213,75 @@ "help": "JP server only\nEnable auto switch to second floor and perform interaction" } }, + "Highway": { + "_info": { + "name": "Overpass", + "help": "" + }, + "Stage": { + "name": "Select Stage", + "help": "", + "1": "01 - Overpass A", + "2": "02 - Overpass B", + "3": "03 - Overpass C", + "4": "04 - Overpass D", + "5": "05 - Overpass E", + "6": "06 - Overpass F", + "7": "07 - Overpass G", + "8": "08 - Overpass H", + "9": "09 - Overpass I" + }, + "Count": { + "name": "Sweep X times", + "help": "Sweep the selected stage for X times" + } + }, + "DesertRailroad": { + "_info": { + "name": "Desert Railroad", + "help": "" + }, + "Stage": { + "name": "Select Stage", + "help": "", + "1": "01 - Abandoned Train A", + "2": "02 - Abandoned Train B", + "3": "03 - Abandoned Train C", + "4": "04 - Abandoned Train D", + "5": "05 - Abandoned Train E", + "6": "06 - Abandoned Train F", + "7": "07 - Abandoned Train G", + "8": "08 - Abandoned Train H", + "9": "09 - Abandoned Train I" + }, + "Count": { + "name": "Sweep X times", + "help": "Sweep the selected stage for X times" + } + }, + "Schoolhouse": { + "_info": { + "name": "Classroom", + "help": "" + }, + "Stage": { + "name": "Select Stage", + "help": "", + "1": "01 - Besieged Classroom A", + "2": "02 - Besieged Classroom B", + "3": "03 - Besieged Classroom C", + "4": "04 - Besieged Classroom D", + "5": "05 - Besieged Classroom E", + "6": "06 - Besieged Classroom F", + "7": "07 - Besieged Classroom G", + "8": "08 - Besieged Classroom H", + "9": "09 - Besieged Classroom I" + }, + "Count": { + "name": "Sweep X times", + "help": "Sweep the selected stage for X times" + } + }, "TacticalChallenge": { "_info": { "name": "Tactical Challenge Settings", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 834b797..ba97986 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -30,6 +30,10 @@ "name": "公会", "help": "社团 / 小组" }, + "Bounty": { + "name": "通缉悬赏", + "help": "" + }, "TacticalChallenge": { "name": "战术对抗赛", "help": "战术大赛 / 竞技场" @@ -209,6 +213,75 @@ "help": "仅支持日服\n自动切换第二咖啡厅进行互动点击" } }, + "Highway": { + "_info": { + "name": "高架公路", + "help": "" + }, + "Stage": { + "name": "选择关卡", + "help": "", + "1": "01 - 高架公路 A", + "2": "02 - 高架公路 B", + "3": "03 - 高架公路 C", + "4": "04 - 高架公路 D", + "5": "05 - 高架公路 E", + "6": "06 - 高架公路 F", + "7": "07 - 高架公路 G", + "8": "08 - 高架公路 H", + "9": "09 - 高架公路 I" + }, + "Count": { + "name": "扫荡次数", + "help": "扫荡所选择关卡 X 次" + } + }, + "DesertRailroad": { + "_info": { + "name": "沙漠铁路", + "help": "" + }, + "Stage": { + "name": "选择关卡", + "help": "", + "1": "01 - 被遗弃的列车 A", + "2": "02 - 被遗弃的列车 B", + "3": "03 - 被遗弃的列车 C", + "4": "04 - 被遗弃的列车 D", + "5": "05 - 被遗弃的列车 E", + "6": "06 - 被遗弃的列车 F", + "7": "07 - 被遗弃的列车 G", + "8": "08 - 被遗弃的列车 H", + "9": "09 - 被遗弃的列车 I" + }, + "Count": { + "name": "扫荡次数", + "help": "扫荡所选择关卡 X 次" + } + }, + "Schoolhouse": { + "_info": { + "name": "教室", + "help": "" + }, + "Stage": { + "name": "选择关卡", + "help": "", + "1": "01 - 被袭击的教室 A", + "2": "02 - 被袭击的教室 B", + "3": "03 - 被袭击的教室 C", + "4": "04 - 被袭击的教室 D", + "5": "05 - 被袭击的教室 E", + "6": "06 - 被袭击的教室 F", + "7": "07 - 被袭击的教室 G", + "8": "08 - 被袭击的教室 H", + "9": "09 - 被袭击的教室 I" + }, + "Count": { + "name": "扫荡次数", + "help": "扫荡所选择关卡 X 次" + } + }, "TacticalChallenge": { "_info": { "name": "战术对抗赛设置",