Merge b22681b71a into 2cad7ebbac

config/template.json

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

module/config/argument/args.json

@@ -473,52 +473,6 @@
         "type": "textarea",
         "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": {

module/config/argument/argument.yaml

@@ -133,20 +133,6 @@ Choice5:
   Classrooms:
     value: null
     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:
   OnError:

module/config/argument/task.yaml

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

module/config/config_generated.py

@@ -75,14 +75,6 @@ class GeneratedConfig:
     Choice5_Location = 'None'  # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
     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`
     Bounty_OnError = 'skip'  # stop, skip
 

module/config/i18n/en-US.json

@@ -423,56 +423,6 @@
       "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": {
     "_info": {
       "name": "Bounty Settings",

module/config/i18n/zh-CN.json

@@ -423,56 +423,6 @@
       "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": {
     "_info": {
       "name": "悬赏通缉设置",

tasks/mission/mission.py

@@ -34,17 +34,11 @@ class Mission(MissionUI, CommissionsUI):
             case "H":
                 return 20
             case "E":
-                if self.current_stage >= "09":
+                stage = int(self.current_stage, base=10)
-                    return 20
+                return 20 if stage >= 9 else 10 + 5 * math.floor(stage / 5)
-                elif self.current_stage <= "04":
-                    return 10
-                else:
-                    return 15
             case "XP" | "CR":
-                if self.current_stage >= "08":
+                stage = int(self.current_stage, base=10)
-                    return 40
+                return 40 if stage >= 8 else stage * 5
-                else:
-                    return int(self.current_stage, base=10) * 5
 
     @property
     def mission_info(self) -> list:

tasks/mission/ui.py

@@ -45,11 +45,19 @@ MODE_TO_PAGE = {
 class MissionUI(UI, AP):
     def select_mission(self, mode, stage):
         area = int(stage.split("-")[0])
-        switch = SWITCH_HARD if mode == "H" else SWITCH_NORMAL
+        if not self.select_area(area):
-        if self.select_area(area) and self.select_mode(switch):
+            logger.warning("Area not found")
-            return True
             return False
 
+        to_switch = {
+            "N": SWITCH_NORMAL,
+            "H": SWITCH_HARD
+        }
+        switch = to_switch[mode]
+        if not self.select_mode(switch) and not self.select_area(area):
+            return False
+        return True
+    
     def select_area(self, num):
         """"
         May require further error handling for these cases. 
@@ -73,7 +81,6 @@ class MissionUI(UI, AP):
             except:
                 tries += 1
                 if tries > 3:
-                    logger.warning(f"Area {num} not found")
                     return False
 
     def select_mode(self, switch):
@@ -139,10 +146,11 @@ class MissionUI(UI, AP):
 class CommissionsUI(UI, AP):
     """Works the same way as select_bounty"""
     def select_commission(self, mode):
-        if mode == "CR":
+        to_button = {
-            dest_enter, dest_check = SELECT_CR, CHECK_CR
+            "CR": (SELECT_CR, CHECK_CR),
-        else:
+            "XP": (SELECT_XP, CHECK_XP)
-            dest_enter, dest_check = SELECT_XP, CHECK_XP
+        }
+        dest_enter, dest_check = to_button[mode]
         timer = Timer(5, 10).start()
         while 1:
             self.device.screenshot()

tasks/schedule/schedule.py

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