From 67a640dbd1c8fbceaa2265e1916889b841b7f3fd Mon Sep 17 00:00:00 2001 From: Wotuu Date: Tue, 9 Oct 2018 15:05:55 +0200 Subject: [PATCH] #33 Fixes for Atal'Dazar and Shrine of the Storm. --- .../dungeondata/bfa/ataldazar/1/enemies.json | 52 ++-- .../bfa/ataldazar/1/enemy_packs.json | 28 ++ .../bfa/shrineofthestorm/1/enemies.json | 254 ++++++++++++++---- .../bfa/shrineofthestorm/1/enemy_packs.json | 148 +++++----- .../bfa/shrineofthestorm/1/enemy_patrols.json | 8 +- .../bfa/shrineofthestorm/2/enemies.json | 104 +++++++ .../bfa/shrineofthestorm/2/enemy_packs.json | 56 ++++ .../bfa/shrineofthestorm/npcs.json | 4 +- 8 files changed, 513 insertions(+), 141 deletions(-) diff --git a/database/seeds/dungeondata/bfa/ataldazar/1/enemies.json b/database/seeds/dungeondata/bfa/ataldazar/1/enemies.json index dfd148a2e..2a2a282ca 100644 --- a/database/seeds/dungeondata/bfa/ataldazar/1/enemies.json +++ b/database/seeds/dungeondata/bfa/ataldazar/1/enemies.json @@ -857,19 +857,6 @@ "id": 128435 } }, - { - "id": 259, - "enemy_pack_id": 50, - "floor_id": 41, - "teeming": null, - "faction": "any", - "enemy_forces_override": -1, - "lat": -141.38, - "lng": 208.56, - "npc": { - "id": 128434 - } - }, { "id": 260, "enemy_pack_id": 51, @@ -1459,7 +1446,7 @@ "id": 3095, "enemy_pack_id": 45, "floor_id": 41, - "teeming": "visible", + "teeming": null, "faction": "any", "enemy_forces_override": -1, "lat": -106.75, @@ -1509,52 +1496,52 @@ }, { "id": 3099, - "enemy_pack_id": -1, + "enemy_pack_id": 480, "floor_id": 41, "teeming": "visible", "faction": "any", "enemy_forces_override": -1, - "lat": -150.81, - "lng": 212.31, + "lat": -150.56, + "lng": 211, "npc": { "id": 128435 } }, { "id": 3100, - "enemy_pack_id": -1, + "enemy_pack_id": 480, "floor_id": 41, "teeming": "visible", "faction": "any", "enemy_forces_override": -1, - "lat": -152.13, - "lng": 212.25, + "lat": -150.69, + "lng": 212.69, "npc": { "id": 128435 } }, { "id": 3101, - "enemy_pack_id": -1, + "enemy_pack_id": 480, "floor_id": 41, "teeming": "visible", "faction": "any", "enemy_forces_override": -1, - "lat": -153.31, - "lng": 212.06, + "lat": -152.81, + "lng": 211, "npc": { "id": 128435 } }, { "id": 3102, - "enemy_pack_id": -1, + "enemy_pack_id": 480, "floor_id": 41, "teeming": "visible", "faction": "any", "enemy_forces_override": -1, - "lat": -152, - "lng": 210.06, + "lat": -151.94, + "lng": 209.94, "npc": { "id": 128434 } @@ -1584,5 +1571,18 @@ "npc": { "id": 122973 } + }, + { + "id": 3120, + "enemy_pack_id": 480, + "floor_id": 41, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -152.81, + "lng": 212.62, + "npc": { + "id": 128435 + } } ] \ No newline at end of file diff --git a/database/seeds/dungeondata/bfa/ataldazar/1/enemy_packs.json b/database/seeds/dungeondata/bfa/ataldazar/1/enemy_packs.json index e314a15a9..856a4d8af 100644 --- a/database/seeds/dungeondata/bfa/ataldazar/1/enemy_packs.json +++ b/database/seeds/dungeondata/bfa/ataldazar/1/enemy_packs.json @@ -632,5 +632,33 @@ "lng": -178.56 } ] + }, + { + "id": 480, + "floor_id": 41, + "faction": "any", + "label": "Enemy pack", + "vertices": [ + { + "id": 2711, + "lat": 209, + "lng": -149.69 + }, + { + "id": 2712, + "lat": 209.06, + "lng": -153.75 + }, + { + "id": 2713, + "lat": 213.81, + "lng": -153.88 + }, + { + "id": 2714, + "lat": 213.75, + "lng": -149.88 + } + ] } ] \ No newline at end of file diff --git a/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemies.json b/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemies.json index eff1a4c56..eca536890 100644 --- a/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemies.json +++ b/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemies.json @@ -150,7 +150,7 @@ "faction": "any", "enemy_forces_override": -1, "lat": -26.75, - "lng": 186.25, + "lng": 186.06, "npc": { "id": 136347 } @@ -162,8 +162,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -28.059999999999999, - "lng": 187.38, + "lat": -27.75, + "lng": 187.19, "npc": { "id": 136347 } @@ -175,8 +175,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -29.629999999999999, - "lng": 188.12, + "lat": -29, + "lng": 188, "npc": { "id": 136347 } @@ -188,7 +188,7 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -31.190000000000001, + "lat": -30.379999999999999, "lng": 188.5, "npc": { "id": 136347 @@ -209,7 +209,7 @@ }, { "id": 1125, - "enemy_pack_id": 450, + "enemy_pack_id": 479, "floor_id": 45, "teeming": null, "faction": "any", @@ -217,12 +217,12 @@ "lat": -44.630000000000003, "lng": 192.06, "npc": { - "id": 136347 + "id": 134137 } }, { "id": 1126, - "enemy_pack_id": 450, + "enemy_pack_id": 479, "floor_id": 45, "teeming": null, "faction": "any", @@ -230,7 +230,7 @@ "lat": -44.75, "lng": 194.19, "npc": { - "id": 136347 + "id": 134137 } }, { @@ -867,7 +867,7 @@ "lat": -86.310000000000002, "lng": 113.56, "npc": { - "id": 139800 + "id": 134137 } }, { @@ -1275,7 +1275,7 @@ }, { "id": 1208, - "enemy_pack_id": -1, + "enemy_pack_id": 481, "floor_id": 45, "teeming": null, "faction": "any", @@ -1371,8 +1371,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -156.38, - "lng": 127, + "lat": -157.12, + "lng": 124.94, "npc": { "id": 134418 } @@ -1384,8 +1384,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -158, - "lng": 125.94, + "lat": -158.56, + "lng": 124, "npc": { "id": 134418 } @@ -1439,7 +1439,7 @@ "lat": -190.56, "lng": 185.94, "npc": { - "id": 134514 + "id": 134418 } }, { @@ -1478,7 +1478,7 @@ "lat": -204.88, "lng": 205.19, "npc": { - "id": 134418 + "id": 134514 } }, { @@ -1535,7 +1535,7 @@ }, { "id": 2087, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1548,7 +1548,7 @@ }, { "id": 2088, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1561,7 +1561,7 @@ }, { "id": 2089, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1574,7 +1574,7 @@ }, { "id": 2090, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1587,7 +1587,7 @@ }, { "id": 2091, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1600,7 +1600,7 @@ }, { "id": 2092, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1613,7 +1613,7 @@ }, { "id": 2093, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1626,7 +1626,7 @@ }, { "id": 2094, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1639,7 +1639,7 @@ }, { "id": 2095, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -1652,7 +1652,7 @@ }, { "id": 2096, - "enemy_pack_id": 450, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", @@ -2250,7 +2250,7 @@ }, { "id": 2142, - "enemy_pack_id": -1, + "enemy_pack_id": 481, "floor_id": 45, "teeming": null, "faction": "any", @@ -2263,7 +2263,7 @@ }, { "id": 2143, - "enemy_pack_id": -1, + "enemy_pack_id": 481, "floor_id": 45, "teeming": null, "faction": "any", @@ -2276,7 +2276,7 @@ }, { "id": 2144, - "enemy_pack_id": -1, + "enemy_pack_id": 481, "floor_id": 45, "teeming": null, "faction": "any", @@ -2289,7 +2289,7 @@ }, { "id": 2145, - "enemy_pack_id": -1, + "enemy_pack_id": 481, "floor_id": 45, "teeming": null, "faction": "any", @@ -2307,8 +2307,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -135.06, - "lng": 134.75, + "lat": -135.56, + "lng": 133.12, "npc": { "id": 139626 } @@ -2320,7 +2320,7 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -136.44, + "lat": -136.5, "lng": 133.12, "npc": { "id": 139626 @@ -2333,8 +2333,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -138.13, - "lng": 134.56, + "lat": -137.69, + "lng": 133.19, "npc": { "id": 139626 } @@ -2346,8 +2346,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -136.56, - "lng": 136.25, + "lat": -134.69, + "lng": 134.75, "npc": { "id": 139626 } @@ -2463,8 +2463,8 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -135.25, - "lng": 136.12, + "lat": -134.75, + "lng": 133.69, "npc": { "id": 139626 } @@ -2476,34 +2476,34 @@ "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -138.06, - "lng": 136.25, + "lat": -138.25, + "lng": 134.12, "npc": { "id": 139626 } }, { "id": 2163, - "enemy_pack_id": 261, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -187.94, - "lng": 177.5, + "lat": -188.06, + "lng": 177.94, "npc": { "id": 136353 } }, { "id": 2166, - "enemy_pack_id": 261, + "enemy_pack_id": -1, "floor_id": 45, "teeming": null, "faction": "any", "enemy_forces_override": -1, - "lat": -190.38, - "lng": 176.25, + "lat": -190.56, + "lng": 176.56, "npc": { "id": 136353 } @@ -2611,5 +2611,161 @@ "npc": { "id": 134417 } + }, + { + "id": 3121, + "enemy_pack_id": 235, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -31.559999999999999, + "lng": 188.88, + "npc": { + "id": 136347 + } + }, + { + "id": 3122, + "enemy_pack_id": -1, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -43.439999999999998, + "lng": 192.19, + "npc": { + "id": 134173 + } + }, + { + "id": 3123, + "enemy_pack_id": -1, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -43.5, + "lng": 194.12, + "npc": { + "id": 134173 + } + }, + { + "id": 3140, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -159.81, + "lng": 128.38, + "npc": { + "id": 134423 + } + }, + { + "id": 3142, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -159.81, + "lng": 128.38, + "npc": { + "id": 134423 + } + }, + { + "id": 3145, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -161.75, + "lng": 126.75, + "npc": { + "id": 134423 + } + }, + { + "id": 3148, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -158.31, + "lng": 126.62, + "npc": { + "id": 134423 + } + }, + { + "id": 3151, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -155.75, + "lng": 125.81, + "npc": { + "id": 134423 + } + }, + { + "id": 3154, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -159.81, + "lng": 122.75, + "npc": { + "id": 134423 + } + }, + { + "id": 3157, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -154.88, + "lng": 121.88, + "npc": { + "id": 134423 + } + }, + { + "id": 3160, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -157.13, + "lng": 120.56, + "npc": { + "id": 134423 + } + }, + { + "id": 3163, + "enemy_pack_id": 260, + "floor_id": 45, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -161.81, + "lng": 120.06, + "npc": { + "id": 134423 + } } ] \ No newline at end of file diff --git a/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_packs.json b/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_packs.json index 5b5be0c1f..2fdd6d35b 100644 --- a/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_packs.json +++ b/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_packs.json @@ -690,22 +690,22 @@ "label": "Enemy pack", "vertices": [ { - "id": 1261, + "id": 2719, "lat": 127.81, "lng": -141.88 }, { - "id": 1262, - "lat": 129.31, - "lng": -139.44 + "id": 2720, + "lat": 129.19, + "lng": -139.75 }, { - "id": 1263, - "lat": 133.69, - "lng": -142.5 + "id": 2721, + "lat": 133.5, + "lng": -142.25 }, { - "id": 1264, + "id": 2722, "lat": 132, "lng": -144.38 } @@ -746,24 +746,24 @@ "label": "Enemy pack", "vertices": [ { - "id": 1269, - "lat": 124, - "lng": -158.25 + "id": 2743, + "lat": 116.31, + "lng": -160.81 }, { - "id": 1270, - "lat": 126.56, - "lng": -159.88 + "id": 2744, + "lat": 125.25, + "lng": -165.19 }, { - "id": 1271, - "lat": 128.81, - "lng": -155.88 + "id": 2745, + "lat": 131.12, + "lng": -157.06 }, { - "id": 1272, - "lat": 126.06, - "lng": -155.13 + "id": 2746, + "lat": 122.12, + "lng": -152.69 } ] }, @@ -774,24 +774,24 @@ "label": "Enemy pack", "vertices": [ { - "id": 1277, - "lat": 175.44, - "lng": -185.44 + "id": 2727, + "lat": 176.44, + "lng": -185.88 }, { - "id": 1278, - "lat": 178.75, - "lng": -186.69 + "id": 2728, + "lat": 178.25, + "lng": -186.56 }, { - "id": 1279, - "lat": 176.31, - "lng": -191.56 + "id": 2729, + "lat": 175.62, + "lng": -191.12 }, { - "id": 1280, - "lat": 173.25, - "lng": -190.5 + "id": 2730, + "lat": 173.81, + "lng": -190.44 } ] }, @@ -851,34 +851,6 @@ } ] }, - { - "id": 450, - "floor_id": 45, - "faction": "any", - "label": "Enemy pack", - "vertices": [ - { - "id": 2397, - "lat": 189.5, - "lng": -41.310000000000002 - }, - { - "id": 2398, - "lat": 189.44, - "lng": -45.5 - }, - { - "id": 2399, - "lat": 196.94, - "lng": -45.689999999999998 - }, - { - "id": 2400, - "lat": 196.81, - "lng": -41.310000000000002 - } - ] - }, { "id": 451, "floor_id": 45, @@ -1196,5 +1168,61 @@ "lng": -62.25 } ] + }, + { + "id": 479, + "floor_id": 45, + "faction": "any", + "label": "Enemy pack", + "vertices": [ + { + "id": 2707, + "lat": 191.38, + "lng": -44.060000000000002 + }, + { + "id": 2708, + "lat": 191.44, + "lng": -45.619999999999997 + }, + { + "id": 2709, + "lat": 195.38, + "lng": -45.619999999999997 + }, + { + "id": 2710, + "lat": 195.19, + "lng": -44.189999999999998 + } + ] + }, + { + "id": 481, + "floor_id": 45, + "faction": "any", + "label": "Enemy pack", + "vertices": [ + { + "id": 2715, + "lat": 126.62, + "lng": -112.25 + }, + { + "id": 2716, + "lat": 126.19, + "lng": -119.75 + }, + { + "id": 2717, + "lat": 129.25, + "lng": -119.81 + }, + { + "id": 2718, + "lat": 129.62, + "lng": -112.13 + } + ] } ] \ No newline at end of file diff --git a/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_patrols.json b/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_patrols.json index aef6efc7a..55a15cbbd 100644 --- a/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_patrols.json +++ b/database/seeds/dungeondata/bfa/shrineofthestorm/1/enemy_patrols.json @@ -288,14 +288,14 @@ "faction": "any", "vertices": [ { - "id": 573, + "id": 600, "lat": 119, "lng": -127.25 }, { - "id": 574, - "lat": 134.19, - "lng": -136.31 + "id": 601, + "lat": 126, + "lng": -112.5 } ] }, diff --git a/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemies.json b/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemies.json index f353945d2..4dddf9058 100644 --- a/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemies.json +++ b/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemies.json @@ -908,5 +908,109 @@ "npc": { "id": 136297 } + }, + { + "id": 3125, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -87.75, + "lng": 223.62, + "npc": { + "id": 140038 + } + }, + { + "id": 3127, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -88, + "lng": 227.12, + "npc": { + "id": 140038 + } + }, + { + "id": 3129, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -84.879999999999995, + "lng": 223.75, + "npc": { + "id": 140038 + } + }, + { + "id": 3130, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -85.129999999999995, + "lng": 227.38, + "npc": { + "id": 140038 + } + }, + { + "id": 3133, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -82.129999999999995, + "lng": 224.25, + "npc": { + "id": 140038 + } + }, + { + "id": 3135, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -82.379999999999995, + "lng": 227.5, + "npc": { + "id": 140038 + } + }, + { + "id": 3137, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -79.25, + "lng": 224.75, + "npc": { + "id": 140038 + } + }, + { + "id": 3138, + "enemy_pack_id": 483, + "floor_id": 46, + "teeming": null, + "faction": "any", + "enemy_forces_override": -1, + "lat": -79.629999999999995, + "lng": 228, + "npc": { + "id": 140038 + } } ] \ No newline at end of file diff --git a/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemy_packs.json b/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemy_packs.json index 05324f5ab..b7a744c26 100644 --- a/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemy_packs.json +++ b/database/seeds/dungeondata/bfa/shrineofthestorm/2/enemy_packs.json @@ -171,5 +171,61 @@ "lng": -102.5 } ] + }, + { + "id": 482, + "floor_id": 46, + "faction": "any", + "label": "Enemy pack", + "vertices": [ + { + "id": 2731, + "lat": 223.62, + "lng": -77.379999999999995 + }, + { + "id": 2732, + "lat": 221.25, + "lng": -89.75 + }, + { + "id": 2733, + "lat": 229.25, + "lng": -89.75 + }, + { + "id": 2734, + "lat": 230.25, + "lng": -77.879999999999995 + } + ] + }, + { + "id": 483, + "floor_id": 46, + "faction": "any", + "label": "Enemy pack", + "vertices": [ + { + "id": 2735, + "lat": 223.62, + "lng": -77.379999999999995 + }, + { + "id": 2736, + "lat": 221.25, + "lng": -89.75 + }, + { + "id": 2737, + "lat": 229.25, + "lng": -89.75 + }, + { + "id": 2738, + "lat": 230.25, + "lng": -77.879999999999995 + } + ] } ] \ No newline at end of file diff --git a/database/seeds/dungeondata/bfa/shrineofthestorm/npcs.json b/database/seeds/dungeondata/bfa/shrineofthestorm/npcs.json index 926014bf8..d26f024b4 100644 --- a/database/seeds/dungeondata/bfa/shrineofthestorm/npcs.json +++ b/database/seeds/dungeondata/bfa/shrineofthestorm/npcs.json @@ -185,7 +185,7 @@ "classification_id": 2, "name": "Colossal Tentacle", "base_health": 323769, - "enemy_forces": 9, + "enemy_forces": 10, "aggressiveness": "aggressive" }, { @@ -221,7 +221,7 @@ "classification_id": 2, "name": "Galecaller Apprentice", "base_health": 294335, - "enemy_forces": 1, + "enemy_forces": 9, "aggressiveness": "aggressive" }, {