YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 15:35:12 +00:00
Code Releases Wiki Activity

feat: add auto select for bounty and scrimmage

Browse Source
This commit is contained in:
YoursFunny 2023-11-30 14:21:19 +08:00
parent ecd4ba0a7c
commit 71da6fd996
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
8 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/template.json
View File

@ -81,15 +81,15 @@
"OnError": "skip" "OnError": "skip"
}, },
"Highway": { "Highway": {
"Stage": 1, "Stage": 0,
"Count": 2 "Count": 2
}, },
"DesertRailroad": { "DesertRailroad": {
"Stage": 1, "Stage": 0,
"Count": 2 "Count": 2
}, },
"Schoolhouse": { "Schoolhouse": {
"Stage": 1, "Stage": 0,
"Count": 2 "Count": 2
} }
}, },
@ -104,15 +104,15 @@
"OnError": "skip" "OnError": "skip"
}, },
"Trinity": { "Trinity": {
"Stage": 1, "Stage": 0,
"Count": 2 "Count": 2
}, },
"Gehenna": { "Gehenna": {
"Stage": 1, "Stage": 0,
"Count": 2 "Count": 2
}, },
"Millennium": { "Millennium": {
"Stage": 1, "Stage": 0,
"Count": 2 "Count": 2
} }
}, },

18
module/config/argument/args.json
View File

@ -332,8 +332,9 @@
"Highway": { "Highway": {
"Stage": { "Stage": {
"type": "select", "type": "select",
"value": 1, "value": 0,
"option": [ "option": [
0,
1, 1,
2, 2,
3, 3,
@ -353,8 +354,9 @@
"DesertRailroad": { "DesertRailroad": {
"Stage": { "Stage": {
"type": "select", "type": "select",
"value": 1, "value": 0,
"option": [ "option": [
0,
1, 1,
2, 2,
3, 3,
@ -374,8 +376,9 @@
"Schoolhouse": { "Schoolhouse": {
"Stage": { "Stage": {
"type": "select", "type": "select",
"value": 1, "value": 0,
"option": [ "option": [
0,
1, 1,
2, 2,
3, 3,
@ -432,8 +435,9 @@
"Trinity": { "Trinity": {
"Stage": { "Stage": {
"type": "select", "type": "select",
"value": 1, "value": 0,
"option": [ "option": [
0,
1, 1,
2, 2,
3, 3,
@ -448,8 +452,9 @@
"Gehenna": { "Gehenna": {
"Stage": { "Stage": {
"type": "select", "type": "select",
"value": 1, "value": 0,
"option": [ "option": [
0,
1, 1,
2, 2,
3, 3,
@ -464,8 +469,9 @@
"Millennium": { "Millennium": {
"Stage": { "Stage": {
"type": "select", "type": "select",
"value": 1, "value": 0,
"option": [ "option": [
0,
1, 1,
2, 2,
3, 3,

24
module/config/argument/argument.yaml
View File

@ -100,18 +100,18 @@ Bounty:
Highway: Highway:
Stage: Stage:
value: 1 value: 0
option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Count: 2 Count: 2
DesertRailroad: DesertRailroad:
Stage: Stage:
value: 1 value: 0
option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Count: 2 Count: 2
Schoolhouse: Schoolhouse:
Stage: Stage:
value: 1 value: 0
option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Count: 2 Count: 2
Scrimmage: Scrimmage:
@ -121,18 +121,18 @@ Scrimmage:
Trinity: Trinity:
Stage: Stage:
value: 1 value: 0
option: [ 1, 2, 3, 4 ] option: [ 0, 1, 2, 3, 4 ]
Count: 2 Count: 2
Gehenna: Gehenna:
Stage: Stage:
value: 1 value: 0
option: [ 1, 2, 3, 4 ] option: [ 0, 1, 2, 3, 4 ]
Count: 2 Count: 2
Millennium: Millennium:
Stage: Stage:
value: 1 value: 0
option: [ 1, 2, 3, 4 ] option: [ 0, 1, 2, 3, 4 ]
Count: 2 Count: 2
TacticalChallenge: TacticalChallenge:

12
module/config/config_generated.py
View File

@ -56,30 +56,30 @@ class GeneratedConfig:
Bounty_OnError = 'skip' # stop, skip Bounty_OnError = 'skip' # stop, skip
# Group `Highway` # Group `Highway`
Highway_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9 Highway_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Highway_Count = 2 Highway_Count = 2
# Group `DesertRailroad` # Group `DesertRailroad`
DesertRailroad_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9 DesertRailroad_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
DesertRailroad_Count = 2 DesertRailroad_Count = 2
# Group `Schoolhouse` # Group `Schoolhouse`
Schoolhouse_Stage = 1 # 1, 2, 3, 4, 5, 6, 7, 8, 9 Schoolhouse_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Schoolhouse_Count = 2 Schoolhouse_Count = 2
# Group `Scrimmage` # Group `Scrimmage`
Scrimmage_OnError = 'skip' # stop, skip Scrimmage_OnError = 'skip' # stop, skip
# Group `Trinity` # Group `Trinity`
Trinity_Stage = 1 # 1, 2, 3, 4 Trinity_Stage = 0 # 0, 1, 2, 3, 4
Trinity_Count = 2 Trinity_Count = 2
# Group `Gehenna` # Group `Gehenna`
Gehenna_Stage = 1 # 1, 2, 3, 4 Gehenna_Stage = 0 # 0, 1, 2, 3, 4
Gehenna_Count = 2 Gehenna_Count = 2
# Group `Millennium` # Group `Millennium`
Millennium_Stage = 1 # 1, 2, 3, 4 Millennium_Stage = 0 # 0, 1, 2, 3, 4
Millennium_Count = 2 Millennium_Count = 2
# Group `TacticalChallenge` # Group `TacticalChallenge`

6
module/config/i18n/en-US.json
View File

@ -273,6 +273,7 @@
"Stage": { "Stage": {
"name": "Select Stage", "name": "Select Stage",
"help": "", "help": "",
"0": "Auto select",
"1": "01 - Overpass A", "1": "01 - Overpass A",
"2": "02 - Overpass B", "2": "02 - Overpass B",
"3": "03 - Overpass C", "3": "03 - Overpass C",
@ -296,6 +297,7 @@
"Stage": { "Stage": {
"name": "Select Stage", "name": "Select Stage",
"help": "", "help": "",
"0": "Auto select",
"1": "01 - Abandoned Train A", "1": "01 - Abandoned Train A",
"2": "02 - Abandoned Train B", "2": "02 - Abandoned Train B",
"3": "03 - Abandoned Train C", "3": "03 - Abandoned Train C",
@ -319,6 +321,7 @@
"Stage": { "Stage": {
"name": "Select Stage", "name": "Select Stage",
"help": "", "help": "",
"0": "Auto select",
"1": "01 - Besieged Classroom A", "1": "01 - Besieged Classroom A",
"2": "02 - Besieged Classroom B", "2": "02 - Besieged Classroom B",
"3": "03 - Besieged Classroom C", "3": "03 - Besieged Classroom C",
@ -354,6 +357,7 @@
"Stage": { "Stage": {
"name": "Select Stage", "name": "Select Stage",
"help": "", "help": "",
"0": "Auto select",
"1": "01 - Trinity A", "1": "01 - Trinity A",
"2": "02 - Trinity B", "2": "02 - Trinity B",
"3": "03 - Trinity C", "3": "03 - Trinity C",
@ -372,6 +376,7 @@
"Stage": { "Stage": {
"name": "Select Stage", "name": "Select Stage",
"help": "", "help": "",
"0": "Auto select",
"1": "01 - Gehenna A", "1": "01 - Gehenna A",
"2": "02 - Gehenna B", "2": "02 - Gehenna B",
"3": "03 - Gehenna C", "3": "03 - Gehenna C",
@ -390,6 +395,7 @@
"Stage": { "Stage": {
"name": "Select Stage", "name": "Select Stage",
"help": "", "help": "",
"0": "Auto select",
"1": "01 - Millennium A", "1": "01 - Millennium A",
"2": "02 - Millennium B", "2": "02 - Millennium B",
"3": "03 - Millennium C", "3": "03 - Millennium C",

6
module/config/i18n/zh-CN.json
View File

@ -273,6 +273,7 @@
"Stage": { "Stage": {
"name": "选择关卡", "name": "选择关卡",
"help": "", "help": "",
"0": "自动选择",
"1": "01 - 高架公路 A", "1": "01 - 高架公路 A",
"2": "02 - 高架公路 B", "2": "02 - 高架公路 B",
"3": "03 - 高架公路 C", "3": "03 - 高架公路 C",
@ -296,6 +297,7 @@
"Stage": { "Stage": {
"name": "选择关卡", "name": "选择关卡",
"help": "", "help": "",
"0": "自动选择",
"1": "01 - 被遗弃的列车 A", "1": "01 - 被遗弃的列车 A",
"2": "02 - 被遗弃的列车 B", "2": "02 - 被遗弃的列车 B",
"3": "03 - 被遗弃的列车 C", "3": "03 - 被遗弃的列车 C",
@ -319,6 +321,7 @@
"Stage": { "Stage": {
"name": "选择关卡", "name": "选择关卡",
"help": "", "help": "",
"0": "自动选择",
"1": "01 - 被袭击的教室 A", "1": "01 - 被袭击的教室 A",
"2": "02 - 被袭击的教室 B", "2": "02 - 被袭击的教室 B",
"3": "03 - 被袭击的教室 C", "3": "03 - 被袭击的教室 C",
@ -354,6 +357,7 @@
"Stage": { "Stage": {
"name": "选择关卡", "name": "选择关卡",
"help": "", "help": "",
"0": "自动选择",
"1": "01 - 三一 A", "1": "01 - 三一 A",
"2": "02 - 三一 B", "2": "02 - 三一 B",
"3": "03 - 三一 C", "3": "03 - 三一 C",
@ -372,6 +376,7 @@
"Stage": { "Stage": {
"name": "选择关卡", "name": "选择关卡",
"help": "", "help": "",
"0": "自动选择",
"1": "01 - 格黑娜 A", "1": "01 - 格黑娜 A",
"2": "02 - 格黑娜 B", "2": "02 - 格黑娜 B",
"3": "03 - 格黑娜 C", "3": "03 - 格黑娜 C",
@ -390,6 +395,7 @@
"Stage": { "Stage": {
"name": "选择关卡", "name": "选择关卡",
"help": "", "help": "",
"0": "自动选择",
"1": "01 - 千年 A", "1": "01 - 千年 A",
"2": "02 - 千年 B", "2": "02 - 千年 B",
"3": "03 - 千年 C", "3": "03 - 千年 C",

2
tasks/bounty/ui.py
View File

@ -22,6 +22,8 @@ class BountyUI(UI):
return False return False
def enter_stage(self, index: int) -> bool: def enter_stage(self, index: int) -> bool:
if not index:
index = BOUNTY_LIST.insight_max_sweepable_index(self)
if BOUNTY_LIST.select_index_enter(self, index): if BOUNTY_LIST.select_index_enter(self, index):
return True return True
return False return False

2
tasks/scrimmage/ui.py
View File

@ -22,6 +22,8 @@ class ScrimmageUI(UI):
return False return False
def enter_stage(self, index: int) -> bool: def enter_stage(self, index: int) -> bool:
if not index:
index = SCRIMMAGE_LIST.insight_max_sweepable_index(self)
if SCRIMMAGE_LIST.select_index_enter(self, index, insight=False): if SCRIMMAGE_LIST.select_index_enter(self, index, insight=False):
return True return True
return False return False