YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-20 14:55:23 +00:00
Code Releases Wiki Activity

fix: auto-mission

Browse Source
This commit is contained in:
RedDeadDepresso 2024-01-19 23:29:20 +00:00
parent 16453898d1
commit f086844e92
5 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/template.json
View File

@ -58,23 +58,23 @@
}, },
"Formation": { "Formation": {
"burst1": 1, "burst1": 1,
"burst2": 1, "burst2": 4,
"pierce1": 1, "pierce1": 2,
"pierce2": 1, "pierce2": 4,
"mystic1": 1, "mystic1": 3,
"mystic2": 1 "mystic2": 4
}, },
"ManualBoss": { "ManualBoss": {
"Enable": false "Enable": false
}, },
"Normal": { "Normal": {
"Enable": false, "Enable": false,
"Area": 2, "Area": 4,
"Completion": "clear" "Completion": "clear"
}, },
"Hard": { "Hard": {
"Enable": false, "Enable": false,
"Area": 2, "Area": 6,
"Completion": "clear" "Completion": "clear"
} }
}, },

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

@ -285,7 +285,7 @@
}, },
"burst2": { "burst2": {
"type": "select", "type": "select",
"value": 1, "value": 4,
"option": [ "option": [
1, 1,
2, 2,
@ -295,7 +295,7 @@
}, },
"pierce1": { "pierce1": {
"type": "select", "type": "select",
"value": 1, "value": 2,
"option": [ "option": [
1, 1,
2, 2,
@ -305,7 +305,7 @@
}, },
"pierce2": { "pierce2": {
"type": "select", "type": "select",
"value": 1, "value": 4,
"option": [ "option": [
1, 1,
2, 2,
@ -315,7 +315,7 @@
}, },
"mystic1": { "mystic1": {
"type": "select", "type": "select",
"value": 1, "value": 3,
"option": [ "option": [
1, 1,
2, 2,
@ -325,7 +325,7 @@
}, },
"mystic2": { "mystic2": {
"type": "select", "type": "select",
"value": 1, "value": 4,
"option": [ "option": [
1, 1,
2, 2,
@ -347,7 +347,7 @@
}, },
"Area": { "Area": {
"type": "input", "type": "input",
"value": 2 "value": 4
}, },
"Completion": { "Completion": {
"type": "select", "type": "select",
@ -365,7 +365,7 @@
}, },
"Area": { "Area": {
"type": "input", "type": "input",
"value": 2 "value": 6
}, },
"Completion": { "Completion": {
"type": "select", "type": "select",

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

@ -247,19 +247,19 @@ Formation:
value: 1 value: 1
option: [ 1, 2, 3, 4 ] option: [ 1, 2, 3, 4 ]
burst2: burst2:
value: 1 value: 4
option: [ 1, 2, 3, 4 ] option: [ 1, 2, 3, 4 ]
pierce1: pierce1:
value: 1 value: 2
option: [ 1, 2, 3, 4 ] option: [ 1, 2, 3, 4 ]
pierce2: pierce2:
value: 1 value: 4
option: [ 1, 2, 3, 4 ] option: [ 1, 2, 3, 4 ]
mystic1: mystic1:
value: 1 value: 3
option: [ 1, 2, 3, 4 ] option: [ 1, 2, 3, 4 ]
mystic2: mystic2:
value: 1 value: 4
option: [ 1, 2, 3, 4 ] option: [ 1, 2, 3, 4 ]
ManualBoss: ManualBoss:
@ -267,14 +267,14 @@ ManualBoss:
Normal: Normal:
Enable: false Enable: false
Area: 2 Area: 4
Completion: Completion:
value: clear value: clear
option: [ clear, three_stars] option: [ clear, three_stars]
Hard: Hard:
Enable: false Enable: false
Area: 2 Area: 6
Completion: Completion:
value: clear value: clear
option: [ clear, three_stars, three_stars_chest] option: [ clear, three_stars, three_stars_chest]

14
module/config/config_generated.py
View File

@ -161,23 +161,23 @@ class GeneratedConfig:
# Group `Formation` # Group `Formation`
Formation_burst1 = 1 # 1, 2, 3, 4 Formation_burst1 = 1 # 1, 2, 3, 4
Formation_burst2 = 1 # 1, 2, 3, 4 Formation_burst2 = 4 # 1, 2, 3, 4
Formation_pierce1 = 1 # 1, 2, 3, 4 Formation_pierce1 = 2 # 1, 2, 3, 4
Formation_pierce2 = 1 # 1, 2, 3, 4 Formation_pierce2 = 4 # 1, 2, 3, 4
Formation_mystic1 = 1 # 1, 2, 3, 4 Formation_mystic1 = 3 # 1, 2, 3, 4
Formation_mystic2 = 1 # 1, 2, 3, 4 Formation_mystic2 = 4 # 1, 2, 3, 4
# Group `ManualBoss` # Group `ManualBoss`
ManualBoss_Enable = False ManualBoss_Enable = False
# Group `Normal` # Group `Normal`
Normal_Enable = False Normal_Enable = False
Normal_Area = 2 Normal_Area = 4
Normal_Completion = 'clear' # clear, three_stars Normal_Completion = 'clear' # clear, three_stars
# Group `Hard` # Group `Hard`
Hard_Enable = False Hard_Enable = False
Hard_Area = 2 Hard_Area = 6
Hard_Completion = 'clear' # clear, three_stars, three_stars_chest Hard_Completion = 'clear' # clear, three_stars, three_stars_chest
# Group `ItemStorage` # Group `ItemStorage`

3
tasks/auto_mission/auto_mission.py
View File

@ -35,7 +35,6 @@ class AutoMission(AutoMissionUI, Mission):
if valid: if valid:
info = zip(mode, area, stages_data, completion_level) info = zip(mode, area, stages_data, completion_level)
return list(filter(lambda x: x[2], info)) return list(filter(lambda x: x[2], info))
raise RequestHumanTakeover
def check_formation(self, mode, area, stages_data): def check_formation(self, mode, area, stages_data):
mode_name = "Normal" if mode == "N" else "Hard" mode_name = "Normal" if mode == "N" else "Hard"
@ -176,6 +175,8 @@ class AutoMission(AutoMissionUI, Mission):
if status == AutoMissionStatus.FINISH: if status == AutoMissionStatus.FINISH:
break break
else:
raise RequestHumanTakeover
self.config.task_delay(server_update=True) self.config.task_delay(server_update=True)