Merge pull request #341 from mrmin123/staging

7.2.1 to master

CHANGELOG.md

@@ -1,11 +1,18 @@
+#### 7.2.1
+
+* Add support for node ZZ to webUI
+* Revise 2019 Winter Event node information
+* Bugfix to FleetSwitcher not initializing properly
+* Better recovery reports
+
 #### 7.2.0
 
-* Preliminary pass of 2019 Winter Event support
+* Preliminary pass of 2019 Winter Event support (thanks to @perryhuynh)
 * Bugfix to Scheduled Stop section of webUI
 
 #### 7.1.1
 
-* Bugfix to config readers
+* Bugfix to config readers (thanks to @perryhuynh)
 
 #### 7.1.0
 

docs-src/src/types/formOptions.jsx

@@ -47,7 +47,7 @@ export const COMBINED_FLEET_MODES = [
 export const COMBAT_NODE_COUNTS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'].map(value => (
  { value, label: value }))
 export const NODES = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('').map(value => ({ value, label: value }))
-NODES.push(...['Z1', 'Z2', 'Z3', 'Z4', 'Z5', 'Z6', 'Z7', 'Z8', 'Z9', 'ZZ1', 'ZZ2', 'ZZ3'].map(value => (
+NODES.push(...['Z1', 'Z2', 'Z3', 'Z4', 'Z5', 'Z6', 'Z7', 'Z8', 'Z9', 'ZZ', 'ZZ1', 'ZZ2', 'ZZ3'].map(value => (
  { value, label: value })))
 export const FORMATIONS = [
  { value: 'line_ahead', label: <Localize field='bodyConfig.combatFormationLineAhead' /> },

kcauto.sikuli/config.sikuli/config_fleet_switcher.py

@@ -6,12 +6,7 @@ class ConfigFleetSwitcher(AbstractConfigModule):
  def parse_cfg(self):
  """Method to parse the PvP settings of the passed-in config.
  """
-
- if not self.config['enabled']:
- self.config.clear()
- self.config['enabled'] = False
- return
-
+ self.config.clear()
  self.config['enabled'] = True
 
  return self.config

kcauto.sikuli/maps/E-2.json

@@ -49,7 +49,7 @@
  "types": ["air"]
  },
  "P": {
- "coords": [1041, 443],
+ "coords": [1030, 438],
  "altCoords": [
  [979, 441]
  ],

kcauto.sikuli/maps/E-3.json

@@ -74,12 +74,13 @@
  "coords": [854, 310]
  },
  "W": {
- "coords": [925, 223]
+ "coords": [916, 203]
  },
  "Z": {
  "coords": [1006, 317],
  "altCoords": [
- [957, 257],
+ [957, 257],
+ [951, 243],
  [923, 316]
  ],
  "types": ["boss"]

kcauto.sikuli/recovery.py

@@ -67,8 +67,8 @@ def recover(kcauto, config, e):
  return True
 
  # Chrome crash recovery
- if ('chrome' in Globals.ENABLED_RECOVERIES):
- if kc_region.exists('chrome_crash.png'):
+ if kc_region.exists('chrome_crash.png', 30):
+ if ('chrome' in Globals.ENABLED_RECOVERIES):
  Util.log_warning("** Chrome crash detected. **")
  Region.type(kc_region, Key.F5)
  sleep(1)
@@ -80,10 +80,14 @@ def recover(kcauto, config, e):
  Util.log_success("Chrome crash recovery successful.")
  kcauto.stats.increment_recoveries()
  return True
+ else:
+ Util.log_error(
+ "** Chrome crash detected, but Chrome crash recovery is "
+ "disabled. **")
 
  # catbomb recovery
- if ('catbomb' in Globals.ENABLED_RECOVERIES):
- if kc_region.exists('catbomb.png', 60):
+ if kc_region.exists('catbomb.png', 30):
+ if ('catbomb' in Globals.ENABLED_RECOVERIES):
  Util.log_warning("** Catbomb detected. **")
  catbombed = True
  catbomb_n = 0
@@ -117,6 +121,9 @@ def recover(kcauto, config, e):
  Util.log_success("Catbomb recovery successful.")
  kcauto.stats.increment_recoveries()
  return True
+ else:
+ Util.log_error(
+ "** Catbomb detected, but catbomb recovery is disabled. **")
 
  # recovery failed
  Util.log_error("** Irrecoverable crash. **")

package.json

@@ -1,6 +1,6 @@
 {
  "name": "kcauto",
- "version": "7.2.0",
+ "version": "7.2.1",
  "main": "index.js",
  "repository": "[email protected]:mrmin123/kcauto.git",
  "author": "mrmin123 <[email protected]>",