Browse Source

Update 9069, 9920

Dmitry Shin 4 years ago
parent
commit
d2f8829aae
3 changed files with 102 additions and 21 deletions
  1. 68 7
      guides/9068.js
  2. 32 12
      guides/9920.js
  3. 2 2
      manifest.json

+ 68 - 7
guides/9068.js

@@ -6,6 +6,9 @@ module.exports = (dispatch, handlers, guide, lang) => {
 
 	let thirdboss_stacks_count = 0;
 	let thirdboss_stacks_timer = null;
+	let thirdboss_print_combo = true;
+	let thirdboss_print_bait = true;
+	let thirdboss_combo_count = 0;
 
 	function secondboss_floor_event(one, two) {
 		if (one && two) {
@@ -85,7 +88,20 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		],
 		"h-468-3000-60": [{ type: "text", sub_type: "message", message: "60%" }],
 		"h-468-3000-40": [{ type: "text", sub_type: "message", message: "40%" }],
-		"s-468-3000-130-0": [{ type: "text", sub_type: "message", message: "Left", message_RU: "Откид влево" }],
+		//
+		"s-468-3000-101-0": [
+			{ type: "event", check_func: () => thirdboss_print_combo, args: [
+				{ type: "text", sub_type: "message", message: "Combo soon", message_RU: "Скоро комба" },
+				{ type: "func", func: () => thirdboss_print_combo = false },
+				{ type: "func", func: () => thirdboss_print_combo = true, delay: 12000 }
+			] }
+		],
+		"s-468-3000-102-0": "s-468-3000-101-0",
+		//
+		"s-468-3000-130-0": [
+			{ type: "text", sub_type: "message", message: "Left", message_RU: "Откид влево" },
+			{ type: "func", func: () => thirdboss_combo_count++ }
+		],
 		"s-468-3000-105-0": [ // 130 -> 105
 			{ type: "spawn", func: "vector", args: [553, 0, 0, 180, 500, 0, 1500] },
 			{ type: "spawn", func: "vector", args: [553, 0, 0, 0, 500, 0, 1500] },
@@ -96,9 +112,13 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		],
 		"s-468-3000-106-0": [ // 128 -> 106
 			{ type: "text", sub_type: "message", message: "Back", message_RU: "Задний" },
-			{ type: "spawn", func: "circle", args: [false, 553, 180, 340, 12, 270, 0, 2600] }
+			{ type: "spawn", func: "circle", args: [false, 553, 180, 340, 12, 270, 0, 2600] },
+			{ type: "func", func: () => thirdboss_combo_count++ }
+		],
+		"s-468-3000-131-0": [
+			{ type: "text", sub_type: "message", message: "Right", message_RU: "Откид вправо" },
+			{ type: "func", func: () => thirdboss_combo_count++ }
 		],
-		"s-468-3000-131-0": [{ type: "text", sub_type: "message", message: "Right", message_RU: "Откид вправо" }],
 		"s-468-3000-107-0": [ // 131 -> 107
 			{ type: "spawn", func: "vector", args: [553, 0, 0, 180, 500, 0, 1500] },
 			{ type: "spawn", func: "vector", args: [553, 0, 0, 0, 500, 0, 1500] },
@@ -107,16 +127,21 @@ module.exports = (dispatch, handlers, guide, lang) => {
 			{ type: "spawn", func: "semicircle", args: [0, 180, 912, 0, 0, 10, 300, 0, 1500] },
 			{ type: "spawn", func: "semicircle", args: [0, 180, 912, 0, 0, 8, 360, 0, 1500] }
 		],
-		"s-468-3000-108-0": [{ type: "text", sub_type: "message", message: "Front", message_RU: "Передний" }],
+		"s-468-3000-108-0": [ // 129 > 108
+			{ type: "text", sub_type: "message", message: "Front", message_RU: "Передний" },
+			{ type: "func", func: () => thirdboss_combo_count++ }
+		],
 		"s-468-3000-109-0": "s-468-3000-106-0",
+		//
 		"s-468-3000-110-0": [{ type: "text", sub_type: "message", message: "Back Move", message_RU: "Рыыок назад" }],
 		"s-468-3000-111-0": [{ type: "text", sub_type: "message", message: "360 attack", message_RU: "Круговая" }],
 		"s-468-3000-114-0": [{ type: "text", sub_type: "message", message: "Pull", message_RU: "Притяжка" }], // 114 -> 111
 		"s-468-3000-115-0": [{ type: "text", sub_type: "message", message: "Circles", message_RU: "Круги" }], // 202/205 -> 115
-		"s-468-3000-115-1": [{ type: "text", sub_type: "message", message: "Dodge", message_RU: "Эвейд", delay: 200 }],
+		"s-468-3000-115-1": [{ type: "text", sub_type: "message", message: "Dodge", message_RU: "Эвейд", delay: 150 }],
 		"s-468-3000-117-0": [{ type: "text", sub_type: "message", message: "Jump", message_RU: "Прыжок" }], // 503 -> 117
 		"s-468-3000-134-0": [ // qb 468052 -> 134
 			{ type: "text", sub_type: "message", message: "Inner + AoE", message_RU: "Ближний + АоЕ" },
+			{ type: "text", sub_type: "message", message: "Get Debuff", message_RU: "Взять стак", class_position: "heal", delay: 2000 },
 			{ type: "spawn", func: "circle", args: [true, 553, 0, 75, 14, 175, 0, 1500] }
 		],
 		"s-468-3000-134-1": [
@@ -126,7 +151,10 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		"s-468-3000-202-0": [{ type: "text", sub_type: "message", message: "Target Throw", message_RU: "Бросок цели" }], // 503 -> 201 -> 202
 		"s-468-3000-205-0": [{ type: "text", sub_type: "message", message: "Target Throw", message_RU: "Бросок цели" }], // 503 -> 117 -> 203 -> 204 -> 205
 		"s-468-3000-206-0": [{ type: "text", sub_type: "message", message: "Pike (Target)", message_RU: "Копье (таргет)" }], // 206 -> 207
-		"s-468-3000-302-0": [{ type: "text", sub_type: "message", message: "Bait (Target)", message_RU: "Байт (таргет)" }],
+		"s-468-3000-302-0": [
+			{ type: "text", sub_type: "message", message: "Bait (Target)", message_RU: "Байт (таргет)" },
+			{ type: "func", func: () => thirdboss_combo_count = 0 }
+		],
 		"s-468-3000-302-1": [{ type: "text", sub_type: "message", message: "Dodge", message_RU: "Эвейд", delay: 1600 }],
 		"s-468-3000-501-0": [
 			{ type: "text", sub_type: "message", message: "Cage", message_RU: "Клетка" },
@@ -150,6 +178,39 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		"ae-0-0-468039-3": [{ type: "func", func: thirdboss_stacks_event, args: [3] }],
 		"ae-0-0-468039-2": [{ type: "func", func: thirdboss_stacks_event, args: [2] }],
 		"ae-0-0-468039-1": [{ type: "func", func: thirdboss_stacks_event, args: [1] }],
-		"ar-0-0-468039": [{ type: "func", func: thirdboss_stacks_event, args: [0] }]
+		"ar-0-0-468039": [{ type: "func", func: thirdboss_stacks_event, args: [0] }],
+		//
+		"give_bait": [
+			{ type: "event", check_func: () => thirdboss_print_bait, args: [
+				{ type: "text", sub_type: "message", message: "Give Bait", message_RU: "Дать байт", class_position: "heal" },
+				{ type: "func", func: () => thirdboss_print_bait = false },
+				{ type: "func", func: () => thirdboss_print_bait = true, delay: 6000 }
+			] }
+		],
+		"give_bait_combo": [
+			{ type: "event", check_func: () => thirdboss_combo_count >= 3, args: [
+				{ type: "text", sub_type: "message", message: "Give Bait", message_RU: "Дать байт", class_position: "heal" },
+				{ type: "func", func: () => thirdboss_combo_count = 0 }
+			] }
+		],
+		"e-468-3000-101": "give_bait",
+		"e-468-3000-102": "give_bait",
+		"e-468-3000-105": "give_bait_combo", // left
+		"e-468-3000-106": "give_bait_combo", // back
+		"e-468-3000-107": "give_bait_combo", // right
+		"e-468-3000-108": "give_bait_combo", // front
+		"e-468-3000-111": "give_bait", // 360 attack
+		"e-468-3000-114": "give_bait", // pull
+		"e-468-3000-115": "give_bait", // circles
+		"e-468-3000-117": "give_bait", // jump
+		"e-468-3000-202": "give_bait", // target throw
+		"e-468-3000-205": "give_bait", // target throw
+		"e-468-3000-207": "give_bait", // pike
+		"s-468-3000-122-2": "give_bait", // core pattern 1
+		"s-468-3000-123-2": "give_bait", // core pattern 2
+		"s-468-3000-124-2": "give_bait", // core pattern 3
+		"s-468-3000-127-2": "give_bait", // core pattern 4
+		"e-468-3000-136": "give_bait", // donut
+		"s-468-3000-506-1": "give_bait" // dissipation
 	};
 };

+ 32 - 12
guides/9920.js

@@ -5,10 +5,21 @@
 module.exports = (dispatch, handlers, guide, lang) => {
 	guide.type = SP;
 
+	let secondboss_mech_counter = 0;
 	let thirdboss_colour_to_use = null;
 	let thirdboss_counter = 0;
 	let thirdboss_timer = null;
 
+	function secondboss_stacks_event() {
+		secondboss_mech_counter++;
+
+		handlers.text({ sub_type: "notification", message: `${secondboss_mech_counter} stack`, message_RU: `Стак ${secondboss_mech_counter}`, speech: false });
+
+		if (secondboss_mech_counter >= 5) {
+			secondboss_mech_counter = 0;
+		}
+	}
+
 	function thirdboss_backattack_event() {
 		dispatch.clearTimeout(thirdboss_timer);
 		thirdboss_counter++;
@@ -24,6 +35,20 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		const colour_order = clockwise ? ["red", "yellow", "blue"] : ["blue", "yellow", "red"];
 		const colour_offsets = { "red": 0, "yellow": 120, "blue": 240 };
 
+		const colour_messages = {
+			"red": { message: "Red", message_RU: "Красный" },
+			"yellow": { message: "Yellow", message_RU: "Желтый" },
+			"blue": { message: "Blue", message_RU: "Синий" }
+		};
+
+		if (thirdboss_colour_to_use) {
+			handlers.text({
+				sub_type: "message",
+				message: colour_messages[thirdboss_colour_to_use].message,
+				message_RU: colour_messages[thirdboss_colour_to_use].message_RU
+			});
+		}
+
 		for (let i = 0; i < 3; i++) {
 			const current_colour = colour_order[(colour_order.indexOf(thirdboss_colour_to_use) + i) % 3];
 
@@ -54,12 +79,14 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		"s-920-1000-2109-0": "s-920-1000-1109-0",
 		"s-920-1000-2130-0": [{ type: "text", sub_type: "message", message: "Full > Inner > Outer", message_RU: "Общий > Внутренний > Внешний" }],
 		"s-920-1000-2220-0": "s-920-1000-1220-0",
+		"qb-920-1000-9201000": [{ type: "text", sub_type: "message", message: "Flying", message_RU: "Подлет" }],
 
 		// 2 BOSS
 		"nd-920-2000": [
 			{ type: "stop_timers" },
 			{ type: "despawn_all" }
 		],
+		"h-920-2000-99": [{ type: "func", func: () => secondboss_mech_counter = 0 }],
 		"h-920-2000-50": [{ type: "text", sub_type: "message", message: "50%", message_RU: "50%" }],
 		"h-920-2000-20": [{ type: "text", sub_type: "message", message: "20%", message_RU: "20%" }],
 		"s-920-2000-1104-0": [{ type: "text", sub_type: "message", message: "Random Jump", message_RU: "Прыжок (стан)" }],
@@ -105,6 +132,8 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		"s-920-2000-3116-0": [{ type: "text", sub_type: "message", message: "Circles", message_RU: "Круги" }],
 		"s-920-2000-3119-0": [{ type: "text", sub_type: "message", message: "Red: Out safe", message_RU: "Красный: Наружу сейф" }],
 		"s-920-2000-3220-0": [{ type: "text", sub_type: "message", message: "Blue: In safe", message_RU: "Синий: Внутрь сейф" }],
+		//
+		"dm-0-0-9202000": [{ type: "func", func: secondboss_stacks_event }],
 
 		// 3 BOSS
 		"nd-920-3000-0": [
@@ -173,17 +202,8 @@ module.exports = (dispatch, handlers, guide, lang) => {
 		"s-920-3000-2202-0": "s-920-3000-1202-0",
 		"s-920-3000-2206-0": "s-920-3000-1206-0",
 		"s-920-3000-1410-0": [{ type: "text", sub_type: "message", message: "Cage", message_RU: "Клетка" }],
-		"ae-0-0-9203037": [
-			{ type: "text", sub_type: "message", message: "Red", message_RU: "Красный" },
-			{ type: "func", func: () => thirdboss_colour_to_use = "red" }
-		],
-		"ae-0-0-9203038": [
-			{ type: "text", sub_type: "message", message: "Yellow", message_RU: "Желтый" },
-			{ type: "func", func: () => thirdboss_colour_to_use = "yellow" }
-		],
-		"ae-0-0-9203039": [
-			{ type: "text", sub_type: "message", message: "Blue", message_RU: "Синий" },
-			{ type: "func", func: () => thirdboss_colour_to_use = "blue" }
-		]
+		"ae-0-0-9203037": [{ type: "func", func: () => thirdboss_colour_to_use = "red" }],
+		"ae-0-0-9203038": [{ type: "func", func: () => thirdboss_colour_to_use = "yellow" }],
+		"ae-0-0-9203039": [{ type: "func", func: () => thirdboss_colour_to_use = "blue" }]
 	};
 };

+ 2 - 2
manifest.json

@@ -12,14 +12,14 @@
         "guides/7015.js": "f559103c9ac65a9f10f907f75bf5bb44a5e0ba700626a379411899d70057e179",
         "guides/9044.js": "00bfdae56f76b6d8f3fcd890ff40e841f7dafc287ce256e4cd3fd591bb3d3f7e",
         "guides/9056.js": "e6c9d69144e490414004d31122b71678f560ae8ee979d785de4e791ced216666",
-        "guides/9068.js": "6fe7bb7a56bf6d2abe67ff6cce19961bca8d4ba6fb35e1d68a9c17703ac4c69b",
+        "guides/9068.js": "85b7fbc1d2446e18149a0e470508b79e4c9ab9ab87bb36efd5684979959a0345",
         "guides/9070.js": "3c9d2840950949cfaa49f957a6c17c79fdeea29762ab68d86008d49de8719b0f",
         "guides/9735.js": "ad9e916e5f51839391879aae5de152e250cf5c8214f7dc53bef3c1b3f4dd8736",
         "guides/9739.js": "c1679a49c9e47f1cea731b27969290f24aee379bc6e97dd5a974c81b28b4ebb8",
         "guides/9770.js": "47263d3506101c870f59a94f49be8591a46c26d8c2603c5fcd95617bd0d175b5",
         "guides/9780.js": "ff30612942bf9986e09c3b8d8b17a5a8747352f23a05d9ba2c4b77a891aa3f10",
         "guides/9781.js": "0787d3650d5a8e9103821b2d574eae28f82d35fb120cd503331d1136a0e00653",
-        "guides/9920.js": "0efb05ff95381ecf4b0f4a36d171bbc36c8f5a42c2f4e7b421c7704c427d741f",
+        "guides/9920.js": "3967e251360f8f935cbcde14fa675984cdd34d492ec5ac5f25acfdd8c951cebe",
         "guides/9981.js": "ef7488159d9db364e4bc38f0d859250e2f919da1d4e9ea597f226bc30da06757",
         "guides/9982.js": "ed58663706bbff289e954d828fb0ccefcbb755048a746cd3941eb4749b6426df",
         "index.js": "0f7a4193238d859c8e356eecd3c7527a043e577c0f039b6e9e39384d89667517",