6.1.0 to master

CHANGELOG.md

@@ -1,8 +1,14 @@
+#### 6.1.0
+
+* Add recovery for Chrome tab crashes
+* Update Vanguard formation asset (thanks to @perryhuynh)
+
 #### 6.0.0
 
 * Add 2018 Early Fall Event assets
-  * Note: LBAS squad 3 still not supported
   * Note: Map data is currently incomplete
+* Event LBAS support (thanks to @ksks222)
+  * LBAS squad 3 still not supported
 * Event (Map Progress) Reset feature
   * Resets Event map progress by switching between specified difficulties at specified combat sortie frequency to facilitate Event map farming
   * Updated webUI to support Event Reset feature

kcauto.sikuli/recovery.py

@@ -58,6 +58,20 @@ def recover(kcauto, config, e):
                 kcauto.stats.increment_recoveries()
                 return True
 
+        # Chrome crash recovery
+        Region.type(kc_region, Key.F10)  # clear overlay?
+        if kc_region.exists('chrome_crash.png'):
+            Util.log_warning("** Chrome crash detected. **")
+            Region.type(kc_region, Key.F5)
+            sleep(5)
+            Util.wait_and_click(
+                kc_region, Pattern('game_start.png').similar(0.999), 60)
+            Util.log_success("Re-starting game.")
+            kc_region.wait('home_menu_resupply.png', 15)
+            Util.log_success("Chrome crash recovery successful.")
+            kcauto.stats.increment_recoveries()
+            return True
+
         # catbomb recovery
         if kc_region.exists('catbomb.png', 10):
             Util.log_warning("** Catbomb detected. **")
@@ -85,10 +99,11 @@ def recover(kcauto, config, e):
                     catbomb_n += 1
                 else:
                     catbombed = False
-            sleep(3)
+            sleep(5)
             Util.wait_and_click(
                 kc_region, Pattern('game_start.png').similar(0.999), 60)
-            sleep(5)
+            Util.log_success("Re-starting game.")
+            kc_region.wait('home_menu_resupply.png', 15)
             Util.log_success("Catbomb recovery successful.")
             kcauto.stats.increment_recoveries()
             return True

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kcauto",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "main": "index.js",
   "repository": "git@gitlab.com:mrmin123/kcauto.git",
   "author": "mrmin123 <minyoung.choi@gmail.com>",