Merge branch 'master' into dev

LmeSzinc · Jan 11, 2022 · abd91e9 · abd91e9
2 parents 2443a02 + 5dc207b
commit abd91e9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
@@ -54,7 +54,7 @@
     },
     "Optimization": {
       "CombatScreenshotInterval": {
-        "type": "input",
+        "type": "disable",
         "value": 1.0
       },
       "TaskHoardingDuration": {

diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml
@@ -4,6 +4,9 @@
 
 # ==================== Alas ====================
 
+Alas:
+  Optimization:
+    CombatScreenshotInterval: 1.0
 Restart:
   Scheduler:
     SuccessInterval: 0

diff --git a/module/device/screenshot.py b/module/device/screenshot.py
@@ -120,9 +120,6 @@ def screenshot_last_save_time_reset(self, genre):
     def screenshot_interval_set(self, interval):
         interval = max(interval, 0.1)
         if interval != self._screenshot_interval_timer.limit:
-            if self.config.Campaign_UseAutoSearch:
-                interval = min(interval, 1.0)
-                logger.info(f'Screenshot interval set to {interval}s, limited to 1.0s in auto search')
-            else:
-                logger.info(f'Screenshot interval set to {interval}s')
+            interval = min(interval, 1.0)
+            logger.info(f'Screenshot interval set to {interval}s')
             self._screenshot_interval_timer.limit = interval
diff --git a/module/os/globe_operation.py b/module/os/globe_operation.py
@@ -246,7 +246,7 @@ def os_map_goto_globe(self, unpin=True, skip_first_screenshot=True):
             # Popup: Leaving current zone will terminate meowfficer searching.
             # Searching reward will be shown after entering another zone.
             if self.handle_popup_confirm('GOTO_GLOBE'):
-                return True
+                continue
 
             # End
             if self.is_in_globe():

diff --git a/module/research/preset.py b/module/research/preset.py
@@ -7,10 +7,10 @@
         > S4-G2.5 > S4-PRY5 > S4-PRY8 > 1.5 > 2 > S4-Q4 > 2.5 > 4 > 5 > S4-C6
         > S4-C8 > 6 > 8 > S4-C12 > 12""",
     'series_4_blueprint_only': """
-        S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR8 > S4-DR2.5 > S4-DR5 > S4-G1.5 > S4-PRY2.5
-        > S4-Q0.5 > !4-0.5 > S4-G2.5 > !4-1 > S4-Q1 > reset > S4-G4 > S4-PRY5
-        > !4-1.5 > S4-Q2 > !4-2 > !4-5 > S4-PRY8 > !4-2.5 > S4-Q4 > !4-4
-        > !4-C6 > S4-C6 > S4-C8 > !4-C8 > S4-C12 > !4-C12""",
+        S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR8 > S4-DR2.5 > S4-DR5 > S4-G1.5
+        > S4-PRY2.5 > S4-Q0.5 > 0.5 > S4-G2.5 > S4-Q1 > 1 > reset > S4-G4
+        > S4-PRY5 > 1.5 > S4-Q2 > 2 > S4-PRY8 > 2.5 > S4-Q4 > 4 > 5 > S4-C6
+        > 6 > S4-C8 > 8 > S4-C12 > 12""",
     'series_4_tenrai_only': """
         S4-Q0.5 > S4-PRY0.5 > S4-DR0.5 > S4-Q4 > S4-Q1 > S4-Q2 > S4-H0.5 > 0.5
         > S4-G4 > S4-G1.5 > 1 > S4-DR2.5 > S4-PRY2.5 > reset > S4-G2.5 > 1.5

diff --git a/webapp/packages/main/src/index.ts b/webapp/packages/main/src/index.ts
@@ -102,8 +102,9 @@ const createWindow = async () => {
     mainWindow?.isMaximized() ? mainWindow?.restore() : mainWindow?.maximize();
   });
   ipcMain.on('window-close', function () {
-    alas.kill();
-    setTimeout(() => mainWindow?.close(), 500); // Wait taskkill to finish
+    alas.kill(function () {
+      mainWindow?.close();
+    })
   });
 
   // Tray

diff --git a/webapp/packages/main/src/pyshell.ts b/webapp/packages/main/src/pyshell.ts
@@ -21,8 +21,8 @@ export class PyShell extends PythonShell {
     return this;
   }
 
-  kill(): this {
-    treeKill(this.childProcess.pid, 'SIGTERM');
+  kill(callback: (...args: any[]) => void): this {
+    treeKill(this.childProcess.pid, 'SIGTERM', callback);
     return this;
   }
 }