1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-16 22:05:12 +00:00

feat: 7 choices in lesson

This commit is contained in:
RedDeadDepresso 2024-01-10 14:52:00 +00:00 committed by YoursFunny
parent 9d0c276db5
commit 01a3fdfce5
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
8 changed files with 179 additions and 1 deletions

View File

@ -99,6 +99,14 @@
"Choice5": { "Choice5": {
"Location": "None", "Location": "None",
"Classrooms": null "Classrooms": null
},
"Choice6": {
"Location": "None",
"Classrooms": null
},
"Choice7": {
"Location": "None",
"Classrooms": null
} }
}, },
"Shop": { "Shop": {

View File

@ -473,6 +473,52 @@
"type": "textarea", "type": "textarea",
"value": null "value": null
} }
},
"Choice6": {
"Location": {
"type": "select",
"value": "None",
"option": [
"None",
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
]
},
"Classrooms": {
"type": "textarea",
"value": null
}
},
"Choice7": {
"Location": {
"type": "select",
"value": "None",
"option": [
"None",
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
]
},
"Classrooms": {
"type": "textarea",
"value": null
}
} }
}, },
"Shop": { "Shop": {

View File

@ -133,6 +133,20 @@ Choice5:
Classrooms: Classrooms:
value: null value: null
type: textarea type: textarea
Choice6:
Location:
value: None
option: [ None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Classrooms:
value: null
type: textarea
Choice7:
Location:
value: None
option: [ None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Classrooms:
value: null
type: textarea
Bounty: Bounty:
OnError: OnError:

View File

@ -37,6 +37,8 @@ Daily:
- Choice3 - Choice3
- Choice4 - Choice4
- Choice5 - Choice5
- Choice6
- Choice7
Shop: Shop:
- Scheduler - Scheduler
- NormalShop - NormalShop

View File

@ -75,6 +75,14 @@ class GeneratedConfig:
Choice5_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 Choice5_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice5_Classrooms = None Choice5_Classrooms = None
# Group `Choice6`
Choice6_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice6_Classrooms = None
# Group `Choice7`
Choice7_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice7_Classrooms = None
# Group `Bounty` # Group `Bounty`
Bounty_OnError = 'skip' # stop, skip Bounty_OnError = 'skip' # stop, skip

View File

@ -423,6 +423,56 @@
"help": "" "help": ""
} }
}, },
"Choice6": {
"_info": {
"name": "Choice 6",
"help": "Choice 6"
},
"Location": {
"name": "Location",
"help": "",
"None": "None",
"0": "Schale Office",
"1": "Schale Residence",
"2": "Gehenna",
"3": "Abydos",
"4": "Millennium",
"5": "Trinity",
"6": "Red Winter",
"7": "Hyakkiyako",
"8": "D.U. Shiratori",
"9": "Shanhaijing"
},
"Classrooms": {
"name": "Classrooms",
"help": ""
}
},
"Choice7": {
"_info": {
"name": "Choice 7",
"help": "Choice 7"
},
"Location": {
"name": "Location",
"help": "",
"None": "None",
"0": "Schale Office",
"1": "Schale Residence",
"2": "Gehenna",
"3": "Abydos",
"4": "Millennium",
"5": "Trinity",
"6": "Red Winter",
"7": "Hyakkiyako",
"8": "D.U. Shiratori",
"9": "Shanhaijing"
},
"Classrooms": {
"name": "Classrooms",
"help": ""
}
},
"Bounty": { "Bounty": {
"_info": { "_info": {
"name": "Bounty Settings", "name": "Bounty Settings",

View File

@ -423,6 +423,56 @@
"help": "Choice5.Classrooms.help" "help": "Choice5.Classrooms.help"
} }
}, },
"Choice6": {
"_info": {
"name": "Choice6._info.name",
"help": "Choice6._info.help"
},
"Location": {
"name": "Choice6.Location.name",
"help": "Choice6.Location.help",
"None": "None",
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
},
"Classrooms": {
"name": "Choice6.Classrooms.name",
"help": "Choice6.Classrooms.help"
}
},
"Choice7": {
"_info": {
"name": "Choice7._info.name",
"help": "Choice7._info.help"
},
"Location": {
"name": "Choice7.Location.name",
"help": "Choice7.Location.help",
"None": "None",
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
},
"Classrooms": {
"name": "Choice7.Classrooms.name",
"help": "Choice7.Classrooms.help"
}
},
"Bounty": { "Bounty": {
"_info": { "_info": {
"name": "悬赏通缉设置", "name": "悬赏通缉设置",

View File

@ -24,7 +24,7 @@ class Schedule(ScheduleUI):
info = [] info = []
input_valid = True input_valid = True
schedule_config = self.config.cross_get("Schedule") schedule_config = self.config.cross_get("Schedule")
choices = ["Choice1", "Choice2", "Choice3", "Choice4", "Choice5"] choices = ["Choice1", "Choice2", "Choice3", "Choice4", "Choice5", "Choice6", "Choice7"]
for choice in choices: for choice in choices:
location, classrooms = schedule_config[choice]["Location"], schedule_config[choice]["Classrooms"] location, classrooms = schedule_config[choice]["Location"], schedule_config[choice]["Classrooms"]