Merge pull request #354 from mrmin123/staging

7.4.0 to master

CHANGELOG.md

@@ -1,3 +1,10 @@
+#### 7.4.0
+
+* Add support for 7-2 to kcauto core and webUI
+* Update asset in Resupply Module for February 2019 Kantai Collection update
+* Remove support for 2019 Setsubun PvP Quest
+* Further adjust crash detection functionality
+
 #### 7.3.1
 
 * Dial back the aggressiveness of whitescreen crash detection

docs-src/src/types/formOptions.jsx

@@ -37,7 +37,7 @@ export const COMBAT_ENGINES = [
   { value: 'legacy', label: <Localize field='bodyConfig.combatEngineLegacy' /> }]
 export const MAPS = ['1-1', '1-2', '1-3', '1-4', '1-5', '1-6', '2-1', '2-2', '2-3', '2-4', '2-5', '3-1', '3-2', '3-3',
   '3-4', '3-5', '4-1', '4-2', '4-3', '4-4', '4-5', '5-1', '5-2', '5-3', '5-4', '5-5', '6-1', '6-2', '6-3', '6-4', '6-5',
-  '7-1', 'E-1', 'E-2', 'E-3', 'E-4', 'E-5', 'E-6', 'E-7', 'E-8'].map(value => ({ value, label: value }))
+  '7-1', '7-2', 'E-1', 'E-2', 'E-3', 'E-4', 'E-5', 'E-6', 'E-7', 'E-8'].map(value => ({ value, label: value }))
 export const COMBINED_FLEET_MODES = [
   { value: '', label: <Localize field='bodyConfig.combatFleetModeStandard' /> },
   { value: 'ctf', label: <Localize field='bodyConfig.combatFleetModeCTF' /> },

kcauto.sikuli/combat.sikuli/combat.py

@@ -401,7 +401,7 @@ def _run_combat_logic(self):
                 if dialogue_check:
                     self._start_boss_dialogue_observer()
 
-                self._start_crash_observer()
+                self._start_crash_observer(start_delay=10)
                 while not self.regions['lower_right'].exists('next.png', 1):
                     if self.kc_region.exists('combat_nb_fight.png', 1):
                         self._select_night_battle(self._resolve_night_battle())

kcauto.sikuli/maps/7-2.json

@@ -0,0 +1,42 @@
+{
+	"world": 7,
+	"subworld": 2,
+	"quest_context": ["carriers", "subs"],
+	"nodes": {
+		"B": {
+			"coords": [472, 514]
+		},
+		"C": {
+            "coords": [563, 451],
+            "types": ["sub"]
+		},
+		"E": {
+			"coords": [675, 374],
+			"types": ["sub"]
+		},
+		"G": {
+            "coords": [582, 246],
+			"altCoords": [
+				[642, 320]
+			],
+            "types": ["boss", "sub"]
+		},
+		"H": {
+			"coords": [853, 506],
+			"types": ["air"]
+		},
+		"I": {
+			"coords": [914, 369]
+		},
+		"J": {
+			"coords": [978, 212]
+		},
+		"M": {
+			"coords": [1023, 471],
+			"altCoords": [
+				[963, 405]
+			],
+			"types": ["boss"]
+		}
+	}
+}

kcauto.sikuli/pvp.sikuli/pvp.py

@@ -81,8 +81,9 @@ def run_pvp_logic(self):
         Util.log_msg("Beginning PvP sortie.")
         Util.rejigger_mouse(self.regions, 'top')
         Util.wait_and_click(self.regions[formation], formation)
+        Util.rejigger_mouse(self.regions, 'top')
 
-        self._start_crash_observer()
+        self._start_crash_observer(start_delay=10)
         while not self.regions['lower_right_corner'].exists('next.png', 1):
             if self.kc_region.exists('combat_nb_fight.png', 1):
                 if night_battle:

kcauto.sikuli/quest.sikuli/quest.py

@@ -396,8 +396,7 @@ def _define_quest_list(self):
                 get_quest_info('c3'),
                 get_quest_info('c4'),
                 get_quest_info('c8'),
-                get_quest_info('c15'),
-                get_quest_info('c_sc01')])
+                get_quest_info('c15')])
         if self.config.expeditions['enabled']:
             # define expedition quests if expedition is enabled
             self.active_quest_types.append('d')
@@ -571,7 +570,3 @@ def get_quest_info(quest):
     elif quest == 'e4':
         return {
             'name': 'e4', 'wait': (15, 10, 15), 'rewards': (50, 50, 50, 50)}
-    elif quest == 'c_sc01':
-        # 2019 Setsubun daily PvP quest
-        return {
-            'name': 'c_sc01', 'wait': (0, 4, 0), 'rewards': (23, 23, 0, 0)}

kcauto.sikuli/recovery.py

@@ -269,10 +269,11 @@ class RecoverableModule:
 
     crash_detected = False
 
-    def _start_crash_observer(self):
+    def _start_crash_observer(self, start_delay=0):
         """Method that starts the observeInBackground to check for catbombs
         and chrome crashes.
         """
+        sleep(start_delay)
         self.kc_region.onAppear('catbomb.png', self._set_crash_detected)
         self.kc_region.onAppear('chrome_crash.png', self._set_crash_detected)
         self.kc_region.observeInBackground(FOREVER)

package.json

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