From f086844e92b41e6520352f923c2275699d08aabd Mon Sep 17 00:00:00 2001
From: RedDeadDepresso <94017243+RedDeadDepresso@users.noreply.github.com>
Date: Fri, 19 Jan 2024 23:29:20 +0000
Subject: [PATCH] fix: auto-mission

---
 config/template.json                 | 14 +++++++-------
 module/config/argument/args.json     | 14 +++++++-------
 module/config/argument/argument.yaml | 14 +++++++-------
 module/config/config_generated.py    | 14 +++++++-------
 tasks/auto_mission/auto_mission.py   |  3 ++-
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/config/template.json b/config/template.json
index ddd082a..697ff30 100644
--- a/config/template.json
+++ b/config/template.json
@@ -58,23 +58,23 @@
     },
     "Formation": {
       "burst1": 1,
-      "burst2": 1,
-      "pierce1": 1,
-      "pierce2": 1,
-      "mystic1": 1,
-      "mystic2": 1
+      "burst2": 4,
+      "pierce1": 2,
+      "pierce2": 4,
+      "mystic1": 3,
+      "mystic2": 4
     },
     "ManualBoss": {
       "Enable": false
     },
     "Normal": {
       "Enable": false,
-      "Area": 2,
+      "Area": 4,
       "Completion": "clear"
     },
     "Hard": {
       "Enable": false,
-      "Area": 2,
+      "Area": 6,
       "Completion": "clear"
     }
   },
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
index a17aa40..ab63e57 100644
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -285,7 +285,7 @@
       },
       "burst2": {
         "type": "select",
-        "value": 1,
+        "value": 4,
         "option": [
           1,
           2,
@@ -295,7 +295,7 @@
       },
       "pierce1": {
         "type": "select",
-        "value": 1,
+        "value": 2,
         "option": [
           1,
           2,
@@ -305,7 +305,7 @@
       },
       "pierce2": {
         "type": "select",
-        "value": 1,
+        "value": 4,
         "option": [
           1,
           2,
@@ -315,7 +315,7 @@
       },
       "mystic1": {
         "type": "select",
-        "value": 1,
+        "value": 3,
         "option": [
           1,
           2,
@@ -325,7 +325,7 @@
       },
       "mystic2": {
         "type": "select",
-        "value": 1,
+        "value": 4,
         "option": [
           1,
           2,
@@ -347,7 +347,7 @@
       },
       "Area": {
         "type": "input",
-        "value": 2
+        "value": 4
       },
       "Completion": {
         "type": "select",
@@ -365,7 +365,7 @@
       },
       "Area": {
         "type": "input",
-        "value": 2
+        "value": 6
       },
       "Completion": {
         "type": "select",
diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml
index ebda167..86336c3 100644
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -247,19 +247,19 @@ Formation:
     value: 1
     option: [ 1, 2, 3, 4 ]
   burst2:
-    value: 1
+    value: 4
     option: [ 1, 2, 3, 4 ]
   pierce1:
-    value: 1
+    value: 2
     option: [ 1, 2, 3, 4 ]
   pierce2:
-    value: 1
+    value: 4
     option: [ 1, 2, 3, 4 ]
   mystic1:
-    value: 1
+    value: 3
     option: [ 1, 2, 3, 4 ]
   mystic2:
-    value: 1
+    value: 4
     option: [ 1, 2, 3, 4 ]
 
 ManualBoss:
@@ -267,14 +267,14 @@ ManualBoss:
   
 Normal:
   Enable: false
-  Area: 2
+  Area: 4
   Completion:
     value: clear
     option: [ clear, three_stars]
 
 Hard:
   Enable: false
-  Area: 2
+  Area: 6
   Completion:
     value: clear
     option: [ clear, three_stars, three_stars_chest]
diff --git a/module/config/config_generated.py b/module/config/config_generated.py
index 9eab0f8..de74565 100644
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -161,23 +161,23 @@ class GeneratedConfig:
 
     # Group `Formation`
     Formation_burst1 = 1  # 1, 2, 3, 4
-    Formation_burst2 = 1  # 1, 2, 3, 4
-    Formation_pierce1 = 1  # 1, 2, 3, 4
-    Formation_pierce2 = 1  # 1, 2, 3, 4
-    Formation_mystic1 = 1  # 1, 2, 3, 4
-    Formation_mystic2 = 1  # 1, 2, 3, 4
+    Formation_burst2 = 4  # 1, 2, 3, 4
+    Formation_pierce1 = 2  # 1, 2, 3, 4
+    Formation_pierce2 = 4  # 1, 2, 3, 4
+    Formation_mystic1 = 3  # 1, 2, 3, 4
+    Formation_mystic2 = 4  # 1, 2, 3, 4
 
     # Group `ManualBoss`
     ManualBoss_Enable = False
 
     # Group `Normal`
     Normal_Enable = False
-    Normal_Area = 2
+    Normal_Area = 4
     Normal_Completion = 'clear'  # clear, three_stars
 
     # Group `Hard`
     Hard_Enable = False
-    Hard_Area = 2
+    Hard_Area = 6
     Hard_Completion = 'clear'  # clear, three_stars, three_stars_chest
 
     # Group `ItemStorage`
diff --git a/tasks/auto_mission/auto_mission.py b/tasks/auto_mission/auto_mission.py
index 50e2297..0863a75 100644
--- a/tasks/auto_mission/auto_mission.py
+++ b/tasks/auto_mission/auto_mission.py
@@ -35,7 +35,6 @@ class AutoMission(AutoMissionUI, Mission):
         if valid:
             info = zip(mode, area, stages_data, completion_level)
             return list(filter(lambda x: x[2], info))
-        raise RequestHumanTakeover
     
     def check_formation(self, mode, area, stages_data):
         mode_name = "Normal" if mode == "N" else "Hard"
@@ -176,6 +175,8 @@ class AutoMission(AutoMissionUI, Mission):
 
                 if status == AutoMissionStatus.FINISH:
                     break
+        else:
+            raise RequestHumanTakeover
         
         self.config.task_delay(server_update=True)
         
\ No newline at end of file