Merge pull request #339 from mrmin123/staging

7.2.0 to master

CHANGELOG.md

@@ -1,3 +1,8 @@
+#### 7.2.0
+
+* Preliminary pass of 2019 Winter Event support
+* Bugfix to Scheduled Stop section of webUI
+
 #### 7.1.1
 
 * Bugfix to config readers

docs-src/src/actions/config/index.jsx

@@ -56,7 +56,7 @@ export const setPythonConfig = config => (
       scheduledStopScriptStopTime = config.scheduledStopScriptStopTime
         ? `${String(config.scheduledStopScriptStopTime.getHours()).padStart(2, '0')}`
           + `${String(config.scheduledStopScriptStopTime.getMinutes()).padStart(2, '0')}`
-        : '0000'
+        : ''
     } catch (e) {
       scheduledStopScriptStopTime = ''
     }
@@ -65,7 +65,7 @@ export const setPythonConfig = config => (
       scheduledStopExpeditionStopTime = config.scheduledStopExpeditionStopTime
         ? `${String(config.scheduledStopExpeditionStopTime.getHours()).padStart(2, '0')}`
           + `${String(config.scheduledStopExpeditionStopTime.getMinutes()).padStart(2, '0')}`
-        : '0000'
+        : ''
     } catch (e) {
       scheduledStopExpeditionStopTime = ''
     }
@@ -74,14 +74,14 @@ export const setPythonConfig = config => (
       scheduledStopCombatStopTime = config.scheduledStopCombatStopTime
         ? `${String(config.scheduledStopCombatStopTime.getHours()).padStart(2, '0')}`
           + `${String(config.scheduledStopCombatStopTime.getMinutes()).padStart(2, '0')}`
-        : '0000'
+        : ''
     } catch (e) {
       scheduledStopCombatStopTime = ''
     }
     const combatRepairTimeLimit = config.combatRepairTimeLimit
       ? `${String(config.combatRepairTimeLimit.getHours()).padStart(2, '0')}`
         + `${String(config.combatRepairTimeLimit.getMinutes()).padStart(2, '0')}`
-      : '0000'
+      : ''
     const combatLBASGroup1Nodes = configTemp.combatLBASGroup1Node1 && configTemp.combatLBASGroup1Node2
       ? `${configTemp.combatLBASGroup1Node1.value},${configTemp.combatLBASGroup1Node2.value}`
       : ''

kcauto.sikuli/maps/E-1.json

@@ -0,0 +1,46 @@
+{
+	"world": "event",
+	"subworld": "1-1",
+	"quest_context": ["subs"],
+	"nodes": {
+		"B": {
+			"coords": [515, 228],
+			"types": ["sub"]
+		},
+		"C": {
+			"coords": [694, 345]
+		},
+		"D": {
+			"coords": [675, 403]
+		},
+		"E": {
+			"coords": [718, 436]
+		},
+		"F": {
+			"coords": [763, 464]
+		},
+		"G": {
+			"coords": [835, 431],
+			"altCoords": [
+				[764, 463]
+			],
+			"types": ["boss"]
+		},
+		"H": {
+			"coords": [677, 277]
+		},
+		"I": {
+			"coords": [776, 313]
+		},
+		"J": {
+			"coords": [849, 287]
+		},
+		"L": {
+			"coords": [850, 365],
+			"altCoords": [
+				[804, 346]
+			],
+			"types": ["boss"]
+		}
+	}
+}

kcauto.sikuli/maps/E-2.json

@@ -0,0 +1,82 @@
+{
+	"world": "event",
+	"subworld": "1-2",
+	"quest_context": ["carriers", "subs", "transports"],
+	"nodes": {
+		"A": {
+			"coords": [298, 378],
+			"types": ["air"]
+		},
+		"B": {
+			"coords": [353, 441],
+			"types": ["sub"]
+		},
+		"C": {
+			"coords": [389, 322]
+		},
+		"D": {
+			"coords": [413, 250]
+		},
+		"F": {
+			"coords": [463, 336]
+		},
+		"G": {
+			"coords": [584, 417],
+			"types": ["select"]
+		},
+		"I": {
+			"coords": [652, 366]
+		},
+		"J": {
+			"coords": [651, 462]
+		},
+		"K": {
+			"coords": [749, 481],
+			"altCoords": [
+				[701, 471]
+			],
+			"types": ["boss"]
+		},
+		"L": {
+			"coords": [781, 403],
+			"types": ["air"]
+		},
+		"M": {
+			"coords": [884, 368]
+		},
+		"N": {
+			"coords": [922, 442],
+			"types": ["air"]
+		},
+		"P": {
+			"coords": [1041, 443],
+			"altCoords": [
+				[979, 441]
+			],
+			"types": ["boss"]
+		},
+		"Q": {
+			"coords": [617, 290]
+		},
+		"R": {
+			"coords": [684, 211],
+			"types": ["air"]
+		},
+		"S": {
+			"coords": [748, 304]
+		},
+		"T": {
+			"coords": [797, 187]
+		},
+		"U": {
+			"coords": [813, 269]
+		},
+		"V": {
+			"coords": [906, 266],
+			"types": ["air"]
+		},
+		"W": {
+			"coords": [960, 176]
+		}
+	}
+}

kcauto.sikuli/maps/E-3.json

@@ -0,0 +1,91 @@
+{
+	"world": "event",
+	"subworld": "2-1",
+	"quest_context": ["carriers", "subs", "transports"],
+	"nodes": {
+        "A": {
+            "coords": [381, 338],
+            "types": ["select"]
+        },
+		"B": {
+			"coords": [474, 502]
+		},
+		"C": {
+			"coords": [478, 269]
+		},
+		"D": {
+            "coords": [484, 184],
+            "types": ["air"]
+		},
+		"E": {
+			"coords": [503, 421]
+		},
+		"F": {
+            "coords": [556, 339],
+            "types": ["air"]
+		},
+		"G": {
+            "coords": [575, 201],
+            "types": ["select"]
+		},
+		"I": {
+			"coords": [618, 394],
+			"types": ["air"]
+		},
+		"J": {
+			"coords": [651, 147]
+		},
+		"K": {
+			"coords": [666, 281],
+			"types": ["air"]
+		},
+		"L": {
+			"coords": [702, 465]
+		},
+		"N": {
+			"coords": [751, 358],
+			"types": ["air"]
+		},
+		"O": {
+			"coords": [763, 298]
+		},
+		"Q": {
+			"coords": [789, 396]
+		},
+		"R": {
+			"coords": [842, 445]
+		},
+		"S": {
+            "coords": [817, 518],
+			"altCoords": [
+				[774, 453]
+			],
+            "types": ["boss"]
+		},
+		"T": {
+			"coords": [739, 218],
+			"types": ["air"]
+		},
+		"U": {
+            "coords": [868, 154],
+            "types": ["air"]
+		},
+		"V": {
+			"coords": [854, 310]
+		},
+		"W": {
+			"coords": [925, 223]
+		},
+        "Z": {
+            "coords": [1006, 317],
+			"altCoords": [
+                [957, 257],
+                [923, 316]
+			],
+            "types": ["boss"]
+        },
+        "ZZ": {
+            "coords": [834, 251]
+        }
+	}
+}

package.json

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