From 5af69a78a2dd02b2514727559368e94b129cfe4b Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 14:46:23 +0100 Subject: [PATCH 01/27] fix(DB/Gameobject): Midsummer gameobject spawn cleanups (#18168) --- .../pending_db_world/rev_1705092713015591500.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1705092713015591500.sql diff --git a/data/sql/updates/pending_db_world/rev_1705092713015591500.sql b/data/sql/updates/pending_db_world/rev_1705092713015591500.sql new file mode 100644 index 000000000..38715befd --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1705092713015591500.sql @@ -0,0 +1,12 @@ +-- Midsummer gameobject spawn cleanups + +-- 181355, 'Standing, Exterior, Medium - MFF' +-- remove remaining invalid / duplicate spawns +DELETE FROM `gameobject` WHERE (`id` = 181355) AND (`guid` IN (21016, 51362, 51652, 51766, 51767, 51868, 51938, 52045, 52048, 52186, 52205, 52213, 78503, 78504, 78505, 78507, 78508, 78509, 78510, 78511, 78512, 78513)); +DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 1) AND (`guid` IN (21016, 51362, 51652, 51766, 51767, 51868, 51938, 52045, 52048, 52186, 52205, 52213, 78503, 78504, 78505, 78507, 78508, 78509, 78510, 78511, 78512, 78513)); + +-- 181605, 'Ribbon Pole' +-- manually add one missing spawn +DELETE FROM `gameobject` WHERE (`id` = 181605) AND (`guid` = 5); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(5, 181605, 571, 0, 0, 1, 1, 6163.2705078125, -1033.99853515625, 409.246368408203 , 5.777040958404541015, 0, 0, 0, 0, 120, 255, 1, "", 0, NULL); From 8900b2eb99cdf4ba1e3b025840f99688fc0950d3 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sun, 14 Jan 2024 14:46:33 +0100 Subject: [PATCH 02/27] fix(DB/Creature): Warlock trainers in Orgrimmar should talk orcish (#18166) * closes https://github.com/azerothcore/azerothcore-wotlk/issues/18041 --- data/sql/updates/pending_db_world/rev_1705189109284336800.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1705189109284336800.sql diff --git a/data/sql/updates/pending_db_world/rev_1705189109284336800.sql b/data/sql/updates/pending_db_world/rev_1705189109284336800.sql new file mode 100644 index 000000000..c7c3fcdae --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1705189109284336800.sql @@ -0,0 +1,2 @@ +-- +UPDATE `npc_text` SET `lang0` = 1 WHERE `ID` IN (5722, 5723); From 6afccfba326b5c551724449ccb0f5aac9b722b58 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 14:47:20 +0100 Subject: [PATCH 03/27] fix(DB/Gameobject): Sniffed Values for 181307 'Camp Mug' (#18160) --- .../rev_1705060650691801700.sql | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1705060650691801700.sql diff --git a/data/sql/updates/pending_db_world/rev_1705060650691801700.sql b/data/sql/updates/pending_db_world/rev_1705060650691801700.sql new file mode 100644 index 000000000..2ae5aed94 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1705060650691801700.sql @@ -0,0 +1,96 @@ +-- Update gameobject 181307 'Camp Mug' with sniffed values +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` = 181307) AND (`guid` IN (150731, 150863, 150989, 151006, 151022, 17824, 17850, 21482, 50900, 50901, 50902, 50903, 50904, 50905, 50906, 50907, 50908, 50909, 50910, 50911, 50912, 50913, 50914, 50915, 50916, 50917, 50918, 50919, 50920, 50921, 50922, 50923, 50924, 50925, 50926, 50927, 50928, 50929, 50930, 50931, 50932, 50933, 50934, 50935, 50936, 50937, 50938, 50939, 50942, 50943, 70545, 70578)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(150731, 181307, 1, 0, 0, 1, 1, 135.014862060546875, -4720.46337890625, 19.14356613159179687, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(150863, 181307, 530, 0, 0, 1, 1, 9376.181640625, -6771.9091796875, 14.77667236328125, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(150989, 181307, 530, 0, 0, 1, 1, 9792.115234375, -7253.43359375, 27.13817405700683593, 4.031712055206298828, 0, 0, -0.90258502960205078, 0.430511653423309326, 120, 255, 1, "", 50063, NULL), +(151006, 181307, 530, 0, 0, 1, 1, 7682.4931640625, -6835.72509765625, 79.96378326416015625, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(151022, 181307, 0, 0, 0, 1, 1, 2285.373046875, 444.476226806640625, 35.4397735595703125, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(17824, 181307, 0, 0, 0, 1, 1, -8257.9013671875, -2625.302978515625, 134.4690093994140625, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(17850, 181307, 0, 0, 0, 1, 1, 1009.08807373046875, -1446.8966064453125, 63.12607192993164062, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(21482, 181307, 530, 0, 0, 1, 1, 2286.54150390625, 6131.36767578125, 135.8866729736328125, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50900, 181307, 530, 0, 0, 1, 1, -1747.49658203125, 5335.703125, -11.4489698410034179, 4.764749526977539062, 0, 0, -0.6883544921875, 0.725374460220336914, 120, 255, 1, "", 50063, NULL), +(50901, 181307, 1, 0, 0, 1, 1, 951.56573486328125, 783.9849853515625, 105.805511474609375, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50902, 181307, 1, 0, 0, 1, 1, 9778.021484375, 1007.66357421875, 1300.2481689453125, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50903, 181307, 1, 0, 0, 1, 1, 2568.188720703125, -485.384429931640625, 109.9579391479492187, 2.70525527000427246, 0, 0, 0.97629547119140625, 0.216442063450813293, 120, 255, 1, "", 50063, NULL), +(50904, 181307, 1, 0, 0, 1, 1, 2014.7115478515625, -2350.572509765625, 90.602783203125, 0.855210542678833007, 0, 0, 0.414692878723144531, 0.909961462020874023, 120, 255, 1, "", 50063, NULL), +(50905, 181307, 1, 0, 0, 1, 1, 6312.158203125, 517.74151611328125, 19.26113319396972656, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50906, 181307, 1, 0, 0, 1, 1, -3447.23583984375, -4216.81005859375, 12.48501873016357421, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50907, 181307, 1, 0, 0, 1, 1, -1850.8590087890625, 3053.16162109375, 1.763731002807617187, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50908, 181307, 1, 0, 0, 1, 1, -4581.31884765625, 417.63336181640625, 42.63927078247070312, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50909, 181307, 1, 0, 0, 1, 1, -3113.580810546875, -2734.522705078125, 35.13381576538085937, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50910, 181307, 0, 0, 0, 1, 1, -10343.501953125, -3301.31201171875, 24.357391357421875, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50911, 181307, 530, 0, 0, 1, 1, 32.76497268676757812, 2596.850830078125, 70.8438568115234375, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50912, 181307, 530, 0, 0, 1, 1, -1211.66650390625, 7488.60498046875, 22.7712860107421875, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50913, 181307, 530, 0, 0, 1, 1, 210.671630859375, 7689.24560546875, 23.34831428527832031, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50914, 181307, 0, 0, 0, 1, 1, -9423.3720703125, -2117.627197265625, 67.91397857666015625, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50915, 181307, 0, 0, 0, 1, 1, 187.4019622802734375, -2127.026611328125, 104.0664215087890625, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50916, 181307, 0, 0, 0, 1, 1, -3439.131591796875, -946.6092529296875, 10.401123046875, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50917, 181307, 0, 0, 0, 1, 1, -10692.234375, -1151.123291015625, 26.50239753723144531, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50918, 181307, 0, 0, 0, 1, 1, -10941.4892578125, -3224.231201171875, 42.31972122192382812, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50919, 181307, 0, 0, 0, 1, 1, -6692.44482421875, -2202.873779296875, 249.93316650390625, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50920, 181307, 0, 0, 0, 1, 1, -5245.73095703125, -2893.34033203125, 339.192779541015625, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50921, 181307, 1, 0, 0, 1, 1, -5515.64111328125, -2288.085205078125, -57.2169456481933593, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50922, 181307, 1, 0, 0, 1, 1, -285.5216064453125, -2667.39697265625, 94.0708770751953125, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50923, 181307, 1, 0, 0, 1, 1, 1908.54345703125, -4349.16650390625, 22.10041236877441406, 3.752462387084960937, 0, 0, -0.95371627807617187, 0.300707906484603881, 120, 255, 1, "", 50063, NULL), +(50924, 181307, 0, 0, 0, 1, 1, 1800.2767333984375, 220.0803985595703125, 60.69551467895507812, 2.251473426818847656, 0, 0, 0.902585029602050781, 0.430511653423309326, 120, 255, 1, "", 50063, NULL), +(50925, 181307, 0, 0, 0, 1, 1, -4709.416015625, -1227.947021484375, 502.64544677734375, 1.518436193466186523, 0, 0, 0.6883544921875, 0.725374460220336914, 120, 255, 1, "", 50063, NULL), +(50926, 181307, 530, 0, 0, 1, 1, -1747.53662109375, 5337.31982421875, -11.4420251846313476, 3.298687219619750976, 0, 0, -0.99691677093505859, 0.078466430306434631, 120, 255, 1, "", 50063, NULL), +(50927, 181307, 530, 0, 0, 1, 1, -2549.703369140625, 4271.26318359375, 21.67704200744628906, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50928, 181307, 1, 0, 0, 1, 1, -57.3031158447265625, 1254.6488037109375, 91.0513916015625, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50929, 181307, 0, 0, 0, 1, 1, -618.56719970703125, -541.20159912109375, 36.50087356567382812, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50930, 181307, 0, 0, 0, 1, 1, -10645.142578125, 1061.9935302734375, 33.950653076171875, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50931, 181307, 0, 0, 0, 1, 1, -1216.30908203125, -2666.109375, 46.2885589599609375, 2.897245407104492187, 0, 0, 0.99254608154296875, 0.121869951486587524, 120, 255, 1, "", 50063, NULL), +(50932, 181307, 0, 0, 0, 1, 1, -1123.765625, -3539.56591796875, 51.46418380737304687, 4.625123500823974609, 0, 0, -0.73727703094482421, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50933, 181307, 0, 0, 0, 1, 1, -9383.0146484375, 22.88650131225585937, 62.15514373779296875, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50934, 181307, 0, 0, 0, 1, 1, -7593.345703125, -2080.203369140625, 126.9937362670898437, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50935, 181307, 530, 0, 0, 1, 1, -518.25787353515625, 2327.880859375, 39.36609268188476562, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50936, 181307, 0, 0, 0, 1, 1, -143.086151123046875, -813.64996337890625, 56.42293930053710937, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50937, 181307, 0, 0, 0, 1, 1, 587.798583984375, 1358.5865478515625, 91.685638427734375, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50938, 181307, 0, 0, 0, 1, 1, -460.311431884765625, -4533.529296875, 10.16275882720947265, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(50939, 181307, 0, 0, 0, 1, 1, 1801.4100341796875, 219.699432373046875, 60.71329116821289062, 5.009094715118408203, 0, 0, -0.59482288360595703, 0.80385679006576538, 120, 255, 1, "", 50063, NULL), +(50942, 181307, 0, 0, 0, 1, 1, -5422.189453125, -489.186859130859375, 397.918121337890625, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50943, 181307, 0, 0, 0, 1, 1, -4708.22314453125, -1229.39306640625, 502.64544677734375, 5.044002056121826171, 0, 0, -0.58070278167724609, 0.814115643501281738, 120, 255, 1, "", 50063, NULL), +(70545, 181307, 530, 0, 0, 1, 1, -4219.07275390625, -12304.1005859375, 3.637501955032348632, 0.017452461645007133, 0, 0, 0.008726119995117187, 0.999961912631988525, 120, 255, 1, "", 50063, NULL), +(70578, 181307, 530, 0, 0, 1, 1, 2018.828125, 6591.42041015625, 136.4854888916015625, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL); + +-- new spawns +DELETE FROM `gameobject` WHERE (`id` = 181307) AND (`guid` BETWEEN 26042 AND 26068); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(26042, 181307, 1, 0, 0, 1, 1, -2328.085205078125, -614.3531494140625, -7.84443283081054687, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(26043, 181307, 1, 0, 0, 1, 1, -4405.80224609375, 3471.757080078125, 13.31307220458984375, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(26044, 181307, 530, 0, 0, 1, 1, -2231.05908203125, -11892.90625, 28.34252166748046875, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(26045, 181307, 530, 0, 0, 1, 1, -2514.065673828125, 7557.3837890625, -0.90875899791717529, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(26046, 181307, 530, 0, 0, 1, 1, -3004.992919921875, 4161.3544921875, 5.038546085357666015, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(26047, 181307, 530, 0, 0, 1, 1, -3065.510986328125, 2394.628173828125, 62.86375808715820312, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(26048, 181307, 530, 0, 0, 1, 1, -3792.99658203125, -11518.4345703125, -133.938247680664062, 0.890116631984710693, 0, 0, 0.430510520935058593, 0.902585566043853759, 120, 255, 1, "", 50063, NULL), +(26049, 181307, 530, 0, 0, 1, 1, -3955.7705078125, 2051.697509765625, 96.00220489501953125, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(26050, 181307, 530, 0, 0, 1, 1, 194.25885009765625, 6011.87060546875, 24.25833511352539062, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(26051, 181307, 530, 0, 0, 1, 1, 2924.24755859375, 3696.760009765625, 144.9329986572265625, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50063, NULL), +(26052, 181307, 530, 0, 0, 1, 1, 3123.825439453125, 3737.893310546875, 143.2243194580078125, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(26053, 181307, 571, 0, 0, 1, 1, 2472.697509765625, -4897.9384765625, 265.178802490234375, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26054, 181307, 571, 0, 0, 1, 1, 2588.780517578125, -4335.06005859375, 277.443939208984375, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(26055, 181307, 571, 0, 0, 1, 1, 3372.037353515625, -2124.173095703125, 125.6790390014648437, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(26056, 181307, 571, 0, 0, 1, 1, 3402.567626953125, -2896.839111328125, 202.7926483154296875, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26057, 181307, 571, 0, 0, 1, 1, 3770.01953125, 1486.7061767578125, 92.75991058349609375, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(26058, 181307, 571, 0, 0, 1, 1, 3942.32470703125, -604.45245361328125, 242.379180908203125, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26059, 181307, 571, 0, 0, 1, 1, 4136.21337890625, 5387.9765625, 27.59144020080566406, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26060, 181307, 571, 0, 0, 1, 1, 4457.57421875, 5624.0224609375, 57.87839889526367187, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(26061, 181307, 571, 0, 0, 1, 1, 5137.4150390625, -680.00775146484375, 171.2934112548828125, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26062, 181307, 571, 0, 0, 1, 1, 5287.06884765625, -2769.227783203125, 293.376861572265625, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(26063, 181307, 571, 0, 0, 1, 1, 5354.765625, 4838.93017578125, -194.709548950195312, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26064, 181307, 571, 0, 0, 1, 1, 5503.5849609375, 4882.93115234375, -197.514755249023437, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(26065, 181307, 571, 0, 0, 1, 1, 5544.9775390625, -730.01458740234375, 151.2208404541015625, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL), +(26066, 181307, 571, 0, 0, 1, 1, 5628.09130859375, -2620.95166015625, 293.335174560546875, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26067, 181307, 571, 0, 0, 1, 1, 6082.34912109375, -1107.6632080078125, 420.3211669921875, 1.658061861991882324, 0, 0, 0.737277030944824218, 0.67559051513671875, 120, 255, 1, "", 50172, NULL), +(26068, 181307, 571, 0, 0, 1, 1, 6148.79443359375, -1032.64501953125, 410.02972412109375, 0.593410074710845947, 0, 0, 0.292370796203613281, 0.95630502700805664, 120, 255, 1, "", 50172, NULL); + +-- remove duplicate spawns +DELETE FROM `gameobject` WHERE (`id` = 181307) AND (`guid` IN (50941)); +DELETE FROM `gameobject_addon` WHERE (`guid` IN (50941)); +DELETE FROM `game_event_gameobject` WHERE (`guid` IN (50941)); + +-- enable all spawns for eventEntry 1 +DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 1) AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` = 181307)); +INSERT INTO `game_event_gameobject` (SELECT 1, `guid` FROM `gameobject` WHERE `id` = 181307); From 975ef5198058fde8b2f6b54d061bdcf8f851c133 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 13:47:34 +0000 Subject: [PATCH 04/27] chore(DB): import pending files Referenced commit(s): 8900b2eb99cdf4ba1e3b025840f99688fc0950d3 --- .../rev_1705060650691801700.sql => db_world/2024_01_14_00.sql} | 1 + .../rev_1705092713015591500.sql => db_world/2024_01_14_01.sql} | 1 + .../rev_1705189109284336800.sql => db_world/2024_01_14_02.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/rev_1705060650691801700.sql => db_world/2024_01_14_00.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1705092713015591500.sql => db_world/2024_01_14_01.sql} (96%) rename data/sql/updates/{pending_db_world/rev_1705189109284336800.sql => db_world/2024_01_14_02.sql} (59%) diff --git a/data/sql/updates/pending_db_world/rev_1705060650691801700.sql b/data/sql/updates/db_world/2024_01_14_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1705060650691801700.sql rename to data/sql/updates/db_world/2024_01_14_00.sql index 2ae5aed94..4baf284f8 100644 --- a/data/sql/updates/pending_db_world/rev_1705060650691801700.sql +++ b/data/sql/updates/db_world/2024_01_14_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_11_00 -> 2024_01_14_00 -- Update gameobject 181307 'Camp Mug' with sniffed values -- updated spawns DELETE FROM `gameobject` WHERE (`id` = 181307) AND (`guid` IN (150731, 150863, 150989, 151006, 151022, 17824, 17850, 21482, 50900, 50901, 50902, 50903, 50904, 50905, 50906, 50907, 50908, 50909, 50910, 50911, 50912, 50913, 50914, 50915, 50916, 50917, 50918, 50919, 50920, 50921, 50922, 50923, 50924, 50925, 50926, 50927, 50928, 50929, 50930, 50931, 50932, 50933, 50934, 50935, 50936, 50937, 50938, 50939, 50942, 50943, 70545, 70578)); diff --git a/data/sql/updates/pending_db_world/rev_1705092713015591500.sql b/data/sql/updates/db_world/2024_01_14_01.sql similarity index 96% rename from data/sql/updates/pending_db_world/rev_1705092713015591500.sql rename to data/sql/updates/db_world/2024_01_14_01.sql index 38715befd..7b656c927 100644 --- a/data/sql/updates/pending_db_world/rev_1705092713015591500.sql +++ b/data/sql/updates/db_world/2024_01_14_01.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_00 -> 2024_01_14_01 -- Midsummer gameobject spawn cleanups -- 181355, 'Standing, Exterior, Medium - MFF' diff --git a/data/sql/updates/pending_db_world/rev_1705189109284336800.sql b/data/sql/updates/db_world/2024_01_14_02.sql similarity index 59% rename from data/sql/updates/pending_db_world/rev_1705189109284336800.sql rename to data/sql/updates/db_world/2024_01_14_02.sql index c7c3fcdae..ec1bd985d 100644 --- a/data/sql/updates/pending_db_world/rev_1705189109284336800.sql +++ b/data/sql/updates/db_world/2024_01_14_02.sql @@ -1,2 +1,3 @@ +-- DB update 2024_01_14_01 -> 2024_01_14_02 -- UPDATE `npc_text` SET `lang0` = 1 WHERE `ID` IN (5722, 5723); From fa5053467c61320663430721d76d1cb2900c888b Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 14:47:54 +0100 Subject: [PATCH 05/27] fix(DB/Gameobject): Sniffed Values for 180046 'Chair' (#18145) --- .../rev_1704835582555070100.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1704835582555070100.sql diff --git a/data/sql/updates/pending_db_world/rev_1704835582555070100.sql b/data/sql/updates/pending_db_world/rev_1704835582555070100.sql new file mode 100644 index 000000000..056121a76 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1704835582555070100.sql @@ -0,0 +1,20 @@ +-- Update gameobject 180046 'Chair' with sniffed values + +-- remaining spawns (no sniffed values available) +-- (`guid` IN (13941, 13915, 13999, 13830, 43025, 42999, 42989, 42994)) + +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` = 180046) AND (`guid` IN (121699, 121700, 121701, 121702, 28527, 28559, 28561, 28590, 6123, 6132, 6136, 6146)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(121699, 180046, 1, 0, 0, 1, 1, -1472.1497802734375, 197.68414306640625, -7.79280281066894531, 2.72271275520324707, 0, 0, 0.978147506713867187, 0.207912087440490722, 120, 255, 1, "", 50250, NULL), +(121700, 180046, 1, 0, 0, 1, 1, -1474.1734619140625, 201.1930694580078125, -7.79280281066894531, 4.520402908325195312, 0, 0, -0.77162456512451171, 0.636078238487243652, 120, 255, 1, "", 50250, NULL), +(121701, 180046, 1, 0, 0, 1, 1, -1475.9130859375, 201.1984405517578125, -7.79280281066894531, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50250, NULL), +(121702, 180046, 1, 0, 0, 1, 1, -1477.009521484375, 197.7798919677734375, -7.79280281066894531, 0.436331570148468017, 0, 0, 0.216439247131347656, 0.976296067237854003, 120, 255, 1, "", 50250, NULL), +(28527, 180046, 0, 0, 0, 1, 1, -9572.6044921875, 33.3993072509765625, 61.25555419921875, 4.241150379180908203, 0, 0, -0.85264015197753906, 0.522498607635498046, 120, 255, 1, "", 45435, NULL), +(28559, 180046, 0, 0, 0, 1, 1, -9571.197265625, 28.78824806213378906, 61.49069595336914062, 2.548179388046264648, 0, 0, 0.956304550170898437, 0.292372345924377441, 120, 255, 1, "", 45435, NULL), +(28561, 180046, 0, 0, 0, 1, 1, -9577.1064453125, 28.93348503112792968, 61.05027389526367187, 0.767943859100341796, 0, 0, 0.374606132507324218, 0.927184045314788818, 120, 255, 1, "", 45435, NULL), +(28590, 180046, 0, 0, 0, 1, 1, -9574.4345703125, 33.59201431274414062, 61.1619873046875, 4.991643905639648437, 0, 0, -0.60181427001953125, 0.798636078834533691, 120, 255, 1, "", 45435, NULL), +(6123, 180046, 530, 0, 0, 1, 1, -2265.90966796875, 5235.77978515625, -9.97536945343017578, 5.253442287445068359, 0, 0, -0.49242305755615234, 0.870355963706970214, 120, 255, 1, "", 51943, NULL), +(6132, 180046, 530, 0, 0, 1, 1, -2262.236083984375, 5196.82666015625, -10.0033092498779296, 1.291541695594787597, 0, 0, 0.60181427001953125, 0.798636078834533691, 120, 255, 1, "", 51943, NULL), +(6136, 180046, 530, 0, 0, 1, 1, -2274.81591796875, 5227.59716796875, -9.97544479370117187, 5.969027042388916015, 0, 0, -0.1564340591430664, 0.987688362598419189, 120, 255, 1, "", 51943, NULL), +(6146, 180046, 530, 0, 0, 1, 1, -2267.725830078125, 5234.8681640625, -9.975311279296875, 5.201082706451416015, 0, 0, -0.51503753662109375, 0.857167601585388183, 120, 255, 1, "", 51943, NULL); From 061e0980f26600b83bcb5e7b97c8726f3e076e34 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 14:48:03 +0100 Subject: [PATCH 06/27] fix(DB/Gameobject): Sniffed Values for 181302 'Camp Crate' (#18158) --- .../rev_1705045773931139800.sql | 200 ++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1705045773931139800.sql diff --git a/data/sql/updates/pending_db_world/rev_1705045773931139800.sql b/data/sql/updates/pending_db_world/rev_1705045773931139800.sql new file mode 100644 index 000000000..cfb19c7fe --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1705045773931139800.sql @@ -0,0 +1,200 @@ +-- Update gameobject 181302 'Camp Crate' with sniffed values +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` = 181302) AND (`guid` IN (150734, 150735, 150865, 150866, 150991, 150992, 150993, 151008, 151009, 151024, 151025, 17820, 17821, 17846, 17847, 21478, 21479, 50697, 50698, 50699, 50700, 50701, 50702, 50703, 50704, 50706, 50707, 50708, 50711, 50712, 50713, 50714, 50715, 50716, 50717, 50718, 50719, 50720, 50721, 50722, 50723, 50724, 50725, 50726, 50727, 50728, 50729, 50730, 50731, 50732, 50733, 50734, 50735, 50736, 50737, 50738, 50739, 50742, 50744, 50745, 50746, 50748, 50749, 50751, 50752, 50753, 50754, 50755, 50756, 50757, 50758, 50759, 50760, 50761, 50762, 50763, 50764, 50765, 50766, 50767, 50768, 50769, 50770, 50771, 50772, 50773, 50774, 50775, 50776, 50777, 50778, 50779, 50780, 50781, 50782, 50783, 50786, 50787, 50788, 50789, 50790, 50791, 50792, 50793, 50794, 50795, 50796, 50797, 50798, 50799, 50800, 50801, 50804, 50805, 50806, 50807, 50808, 50809, 70541, 70542, 70574, 70575)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(150734, 181302, 1, 0, 0, 1, 1, 134.8065338134765625, -4713.8759765625, 18.52238273620605468, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(150735, 181302, 1, 0, 0, 1, 1, 135.466583251953125, -4715.68603515625, 18.40978431701660156, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50172, NULL), +(150865, 181302, 530, 0, 0, 1, 1, 9375.37109375, -6767.38037109375, 15.07124805450439453, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(150866, 181302, 530, 0, 0, 1, 1, 9376.7236328125, -6766.86767578125, 15.200714111328125, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(150991, 181302, 530, 0, 0, 1, 1, 9788.2744140625, -7253.78173828125, 26.12618255615234375, 4.869470596313476562, 0, 0, -0.64944744110107421, 0.760406434535980224, 120, 255, 1, "", 50063, NULL), +(150992, 181302, 530, 0, 0, 1, 1, 9794.4833984375, -7248.72314453125, 26.09469223022460937, 5.480334281921386718, 0, 0, -0.39073085784912109, 0.920504987239837646, 120, 255, 1, "", 50063, NULL), +(150993, 181302, 530, 0, 0, 1, 1, 9794.4892578125, -7248.68017578125, 27.33173561096191406, 5.218535900115966796, 0, 0, -0.507537841796875, 0.861629426479339599, 120, 255, 1, "", 50063, NULL), +(151008, 181302, 530, 0, 0, 1, 1, 7682.017578125, -6838.89453125, 79.09078216552734375, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(151009, 181302, 530, 0, 0, 1, 1, 7684.65478515625, -6840.8251953125, 79.14206695556640625, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(151024, 181302, 0, 0, 0, 1, 1, 2279.25390625, 443.731353759765625, 34.12160110473632812, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(151025, 181302, 0, 0, 0, 1, 1, 2279.26318359375, 442.134979248046875, 34.12934112548828125, 0.575957298278808593, 0, 0, 0.284014701843261718, 0.958819925785064697, 120, 255, 1, "", 50063, NULL), +(17820, 181302, 0, 0, 0, 1, 1, -8265.0703125, -2627.1435546875, 135.0536041259765625, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(17821, 181302, 0, 0, 0, 1, 1, -8263.3046875, -2627.121826171875, 134.5683135986328125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(17846, 181302, 0, 0, 0, 1, 1, 1004.42657470703125, -1443.6673583984375, 62.28302764892578125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(17847, 181302, 0, 0, 0, 1, 1, 1004.09698486328125, -1446.2684326171875, 61.95485305786132812, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(21478, 181302, 530, 0, 0, 1, 1, 2286.953125, 6131.72314453125, 135.8838043212890625, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(21479, 181302, 530, 0, 0, 1, 1, 2286.060791015625, 6134.22998046875, 136.069580078125, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50697, 181302, 1, 0, 0, 1, 1, 8706.96484375, 968.04229736328125, 12.4523477554321289, 5.532694816589355468, 0, 0, -0.3665008544921875, 0.93041771650314331, 120, 255, 1, "", 50063, NULL), +(50698, 181302, 1, 0, 0, 1, 1, -1007.5889892578125, 302.357086181640625, 135.745941162109375, 3.94444584846496582, 0, 0, -0.92050457000732421, 0.3907318115234375, 120, 255, 1, "", 50063, NULL), +(50699, 181302, 1, 0, 0, 1, 1, -3108.4140625, -2731.14111328125, 34.3019256591796875, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50700, 181302, 0, 0, 0, 1, 1, 1805.097900390625, 217.7008514404296875, 61.69276809692382812, 5.35816192626953125, 0, 0, -0.446197509765625, 0.894934535026550292, 120, 255, 1, "", 50063, NULL), +(50701, 181302, 1, 0, 0, 1, 1, 952.9249267578125, 783.8201904296875, 104.8732681274414062, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50702, 181302, 1, 0, 0, 1, 1, -6773.392578125, 541.70050048828125, -0.47682300209999084, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50703, 181302, 1, 0, 0, 1, 1, 9775.4326171875, 1011.67608642578125, 1299.2979736328125, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50704, 181302, 1, 0, 0, 1, 1, -6771.6142578125, 542.0146484375, -0.17543399333953857, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50706, 181302, 1, 0, 0, 1, 1, -6991.87646484375, 911.72491455078125, 9.325331687927246093, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50707, 181302, 1, 0, 0, 1, 1, -7224.587890625, -3852.66845703125, 12.27015590667724609, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50708, 181302, 1, 0, 0, 1, 1, -7226.125, -3853.4423828125, 12.11434745788574218, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50711, 181302, 1, 0, 0, 1, 1, 6843.33837890625, -4562.46728515625, 709.45257568359375, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50712, 181302, 1, 0, 0, 1, 1, -7113.57275390625, -3664.44091796875, 9.499933242797851562, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50713, 181302, 1, 0, 0, 1, 1, -7114.2919921875, -3666.123779296875, 9.4143218994140625, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50714, 181302, 1, 0, 0, 1, 1, 6844.60888671875, -4560.16796875, 709.4390869140625, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50715, 181302, 530, 0, 0, 1, 1, -2549.407958984375, 4270.67529296875, 20.42644882202148437, 6.021387100219726562, 0, 0, -0.13052558898925781, 0.991444945335388183, 120, 255, 1, "", 50063, NULL), +(50716, 181302, 1, 0, 0, 1, 1, 2574.597900390625, -482.55181884765625, 108.261383056640625, 5.009094715118408203, 0, 0, -0.59482288360595703, 0.80385679006576538, 120, 255, 1, "", 50063, NULL), +(50717, 181302, 1, 0, 0, 1, 1, 2575.6455078125, -484.4332275390625, 108.4585723876953125, 0.488691210746765136, 0, 0, 0.241921424865722656, 0.970295846462249755, 120, 255, 1, "", 50063, NULL), +(50718, 181302, 1, 0, 0, 1, 1, 2009.9051513671875, -2349.7607421875, 89.556732177734375, 1.535889506340026855, 0, 0, 0.694658279418945312, 0.719339847564697265, 120, 255, 1, "", 50063, NULL), +(50719, 181302, 1, 0, 0, 1, 1, 2011.9859619140625, -2349.964111328125, 89.51378631591796875, 0.575957298278808593, 0, 0, 0.284014701843261718, 0.958819925785064697, 120, 255, 1, "", 50063, NULL), +(50720, 181302, 1, 0, 0, 1, 1, 6315.9658203125, 513.4490966796875, 18.26840972900390625, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50721, 181302, 1, 0, 0, 1, 1, 6314.71337890625, 514.80938720703125, 18.350616455078125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50722, 181302, 1, 0, 0, 1, 1, -3441.65576171875, -4220.21728515625, 11.95842933654785156, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50723, 181302, 1, 0, 0, 1, 1, -1856.740478515625, 3050.81689453125, 1.226374983787536621, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50724, 181302, 1, 0, 0, 1, 1, -4577.140625, 419.06500244140625, 41.25206375122070312, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50725, 181302, 1, 0, 0, 1, 1, -5514.40087890625, -2289.927734375, -58.2692451477050781, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50726, 181302, 1, 0, 0, 1, 1, -284.4747314453125, -2659.440185546875, 93.31475067138671875, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50727, 181302, 1, 0, 0, 1, 1, -283.011566162109375, -2660.805419921875, 93.06735992431640625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50728, 181302, 1, 0, 0, 1, 1, 8707.9658203125, 969.35333251953125, 12.15101337432861328, 0.052358884364366531, 0, 0, 0.02617645263671875, 0.999657332897186279, 120, 255, 1, "", 50063, NULL), +(50729, 181302, 1, 0, 0, 1, 1, -3108.08056640625, -2729.659423828125, 34.179656982421875, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50730, 181302, 530, 0, 0, 1, 1, -518.07708740234375, 2333.610595703125, 38.07186508178710937, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50731, 181302, 530, 0, 0, 1, 1, -517.5279541015625, 2331.8837890625, 38.16144561767578125, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50063, NULL), +(50732, 181302, 0, 0, 0, 1, 1, -10343.7080078125, -3298.151123046875, 23.36631202697753906, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50733, 181302, 530, 0, 0, 1, 1, 39.07834243774414062, 2595.230224609375, 69.64998626708984375, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50734, 181302, 530, 0, 0, 1, 1, 211.9942169189453125, 7693.47216796875, 22.71973800659179687, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50735, 181302, 1, 0, 0, 1, 1, 951.623046875, 783.52728271484375, 104.5780792236328125, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50736, 181302, 0, 0, 0, 1, 1, 189.4441680908203125, -2123.916259765625, 103.5483169555664062, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50737, 181302, 0, 0, 0, 1, 1, -14372.9287109375, 126.7716522216796875, 2.307420015335083007, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50738, 181302, 0, 0, 0, 1, 1, -14373.0712890625, 126.9593124389648437, 1.083945035934448242, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50739, 181302, 0, 0, 0, 1, 1, -10651.2509765625, 1063.857666015625, 32.68108749389648437, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50742, 181302, 1, 0, 0, 1, 1, 9773.6064453125, 1010.7708740234375, 1299.1497802734375, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50744, 181302, 1, 0, 0, 1, 1, -6992.92822265625, 913.68304443359375, 9.485790252685546875, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50745, 181302, 0, 0, 0, 1, 1, -10941.7548828125, -3230.195556640625, 41.34749984741210937, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50746, 181302, 0, 0, 0, 1, 1, -6693.71923828125, -2205.78955078125, 249.2071990966796875, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50748, 181302, 0, 0, 0, 1, 1, -5424.63720703125, -494.8369140625, 397.65234375, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50749, 181302, 0, 0, 0, 1, 1, -5424.203125, -492.660552978515625, 397.424468994140625, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50751, 181302, 0, 0, 0, 1, 1, -5243.02197265625, -2899.205078125, 338.71588134765625, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50752, 181302, 0, 0, 0, 1, 1, -138.08544921875, -813.29840087890625, 55.23870468139648437, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50753, 181302, 0, 0, 0, 1, 1, -138.146163940429687, -811.3638916015625, 55.20621490478515625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50754, 181302, 1, 0, 0, 1, 1, 6851.73779296875, -4763.34130859375, 697.16241455078125, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50755, 181302, 1, 0, 0, 1, 1, 6853.29541015625, -4762.12890625, 696.99151611328125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50756, 181302, 0, 0, 0, 1, 1, 592.0902099609375, 1354.6768798828125, 90.62839508056640625, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50757, 181302, 0, 0, 0, 1, 1, 590.7008056640625, 1354.4923095703125, 90.69004058837890625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50758, 181302, 0, 0, 0, 1, 1, -453.822662353515625, -4532.423828125, 8.681563377380371093, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50759, 181302, 0, 0, 0, 1, 1, -455.476959228515625, -4531.3603515625, 8.907967567443847656, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50760, 181302, 1, 0, 0, 1, 1, -53.1268997192382812, 1255.6981201171875, 90.29813385009765625, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50761, 181302, 1, 0, 0, 1, 1, -3441.845947265625, -4218.458984375, 11.89546775817871093, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50762, 181302, 1, 0, 0, 1, 1, -1854.8939208984375, 3050.457763671875, 1.144623994827270507, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50763, 181302, 1, 0, 0, 1, 1, -4577.38671875, 420.683746337890625, 41.36140823364257812, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50764, 181302, 1, 0, 0, 1, 1, -5515.53125, -2287.79345703125, -58.4584426879882812, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50765, 181302, 1, 0, 0, 1, 1, 1900.6597900390625, -4349.32666015625, 22.39489173889160156, 3.316144466400146484, 0, 0, -0.99619388580322265, 0.087165042757987976, 120, 255, 1, "", 50063, NULL), +(50766, 181302, 1, 0, 0, 1, 1, -1010.711669921875, 303.13995361328125, 135.745941162109375, 2.792518377304077148, 0, 0, 0.984807014465332031, 0.173652306199073791, 120, 255, 1, "", 50063, NULL), +(50767, 181302, 0, 0, 0, 1, 1, -4695.07666015625, -1220.364990234375, 501.659393310546875, 2.809975385665893554, 0, 0, 0.986285209655761718, 0.165049895644187927, 120, 255, 1, "", 50063, NULL), +(50768, 181302, 0, 0, 0, 1, 1, -4696.18994140625, -1218.7703857421875, 501.659393310546875, 0, 0, 0, 0, 1, 120, 255, 1, "", 50063, NULL), +(50769, 181302, 530, 0, 0, 1, 1, -1737.1087646484375, 5338.857421875, -12.4281368255615234, 3.804818391799926757, 0, 0, -0.94551849365234375, 0.325568377971649169, 120, 255, 1, "", 50063, NULL), +(50770, 181302, 530, 0, 0, 1, 1, -1735.5203857421875, 5338.37890625, -12.4281396865844726, 5.654868602752685546, 0, 0, -0.30901622772216796, 0.95105677843093872, 120, 255, 1, "", 50063, NULL), +(50771, 181302, 530, 0, 0, 1, 1, -2548.390869140625, 4271.9326171875, 20.2852325439453125, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50772, 181302, 1, 0, 0, 1, 1, -52.3747291564941406, 1257.6920166015625, 90.33332061767578125, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50773, 181302, 1, 0, 0, 1, 1, 1900.5989990234375, -4349.31103515625, 21.15878105163574218, 2.094393253326416015, 0, 0, 0.866024971008300781, 0.50000077486038208, 120, 255, 1, "", 50063, NULL), +(50774, 181302, 1, 0, 0, 1, 1, -1009.272216796875, 301.921783447265625, 135.745941162109375, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50775, 181302, 0, 0, 0, 1, 1, -10344.0068359375, -3296.602783203125, 23.22263526916503906, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50776, 181302, 0, 0, 0, 1, 1, -611.89642333984375, -540.48101806640625, 36.48768997192382812, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50777, 181302, 0, 0, 0, 1, 1, -9422.9970703125, -2117.24609375, 66.69474029541015625, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50778, 181302, 0, 0, 0, 1, 1, -14292.380859375, 49.81944656372070312, 0.975275993347167968, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50779, 181302, 0, 0, 0, 1, 1, -9423.2158203125, -2115.341064453125, 66.66082763671875, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50780, 181302, 0, 0, 0, 1, 1, 188.2904205322265625, -2122.624267578125, 103.8283233642578125, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50781, 181302, 0, 0, 0, 1, 1, -14292.5947265625, 49.95388412475585937, 2.195329904556274414, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50782, 181302, 0, 0, 0, 1, 1, -3437.4853515625, -941.7491455078125, 10.39258861541748046, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50783, 181302, 0, 0, 0, 1, 1, -3439.7080078125, -941.54547119140625, 10.49172592163085937, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50786, 181302, 0, 0, 0, 1, 1, -1209.0203857421875, -2662.321533203125, 45.41328811645507812, 1.239183306694030761, 0, 0, 0.580702781677246093, 0.814115643501281738, 120, 255, 1, "", 50063, NULL), +(50787, 181302, 0, 0, 0, 1, 1, -1210.6712646484375, -2661.53173828125, 45.54581451416015625, 3.78736734390258789, 0, 0, -0.94832324981689453, 0.317305892705917358, 120, 255, 1, "", 50063, NULL), +(50788, 181302, 0, 0, 0, 1, 1, -10696.1767578125, -1158.826416015625, 24.94951629638671875, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50789, 181302, 0, 0, 0, 1, 1, -10693.701171875, -1157.4146728515625, 25.17403793334960937, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50790, 181302, 0, 0, 0, 1, 1, -1120.1900634765625, -3534.603271484375, 50.66500091552734375, 4.677483558654785156, 0, 0, -0.71933937072753906, 0.694658815860748291, 120, 255, 1, "", 50063, NULL), +(50791, 181302, 0, 0, 0, 1, 1, -1119.7786865234375, -3536.68017578125, 50.57762908935546875, 1.815141916275024414, 0, 0, 0.788010597229003906, 0.615661680698394775, 120, 255, 1, "", 50063, NULL), +(50792, 181302, 0, 0, 0, 1, 1, -9385.02734375, 30.13802146911621093, 60.43758010864257812, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50793, 181302, 0, 0, 0, 1, 1, -7593.03125, -2078.29150390625, 126.080718994140625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50794, 181302, 0, 0, 0, 1, 1, 1805.8570556640625, 217.77886962890625, 60.44863510131835937, 0.24434557557106018, 0, 0, 0.121869087219238281, 0.9925462007522583, 120, 255, 1, "", 50063, NULL), +(50795, 181302, 530, 0, 0, 1, 1, 37.333984375, 2597.098388671875, 69.85308837890625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50796, 181302, 530, 0, 0, 1, 1, -1207.16796875, 7481.87158203125, 22.05276679992675781, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(50797, 181302, 530, 0, 0, 1, 1, -1206.1090087890625, 7480.60009765625, 21.97401237487792968, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(50798, 181302, 0, 0, 0, 1, 1, -4695.69384765625, -1219.4342041015625, 502.9093017578125, 0.750490784645080566, 0, 0, 0.3665008544921875, 0.93041771650314331, 120, 255, 1, "", 50063, NULL), +(50799, 181302, 530, 0, 0, 1, 1, 212.9035186767578125, 7691.8271484375, 22.55512809753417968, 1.291541695594787597, 0, 0, 0.60181427001953125, 0.798636078834533691, 120, 255, 1, "", 50063, NULL), +(50800, 181302, 0, 0, 0, 1, 1, -611.0679931640625, -542.12774658203125, 36.56824874877929687, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50801, 181302, 0, 0, 0, 1, 1, -10652.57421875, 1062.9305419921875, 32.63768386840820312, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(50804, 181302, 0, 0, 0, 1, 1, -10939.88671875, -3228.94580078125, 41.34749984741210937, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50805, 181302, 0, 0, 0, 1, 1, -9382.9541015625, 29.57389259338378906, 60.63969039916992187, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50806, 181302, 0, 0, 0, 1, 1, -5242.26025390625, -2897.4521484375, 338.35699462890625, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(50807, 181302, 530, 0, 0, 1, 1, -1740.585693359375, 5338.294921875, -12.4281377792358398, 2.199114561080932617, 0, 0, 0.8910064697265625, 0.453990638256072998, 120, 255, 1, "", 50063, NULL), +(50808, 181302, 530, 0, 0, 1, 1, -1736.650390625, 5338.845703125, -11.1850824356079101, 1.884953022003173828, 0, 0, 0.809016227722167968, 0.587786316871643066, 120, 255, 1, "", 50063, NULL), +(50809, 181302, 0, 0, 0, 1, 1, 1804.21484375, 217.8170623779296875, 60.42298126220703125, 1.588248729705810546, 0, 0, 0.713250160217285156, 0.700909554958343505, 120, 255, 1, "", 50063, NULL), +(70541, 181302, 530, 0, 0, 1, 1, -4224.0302734375, -12301.59765625, 4.066880226135253906, 6.248279094696044921, 0, 0, -0.01745223999023437, 0.999847710132598876, 120, 255, 1, "", 50063, NULL), +(70542, 181302, 530, 0, 0, 1, 1, -4225.60400390625, -12301.4873046875, 4.273456096649169921, 1.937312245368957519, 0, 0, 0.824125289916992187, 0.566407561302185058, 120, 255, 1, "", 50063, NULL), +(70574, 181302, 530, 0, 0, 1, 1, 2023.80078125, 6594.56591796875, 135.50128173828125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(70575, 181302, 530, 0, 0, 1, 1, 2021.78125, 6590.525390625, 135.2786865234375, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50172, NULL); + +-- new spawns +DELETE FROM `gameobject` WHERE (`id` = 181302) AND (`guid` BETWEEN 76183 AND 76243); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(76183, 181302, 0, 0, 0, 1, 1, -6691.830078125, -2205.8203125, 249.2113189697265625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(76184, 181302, 0, 0, 0, 1, 1, -7593.26904296875, -2079.837158203125, 125.7967681884765625, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(76185, 181302, 0, 0, 0, 1, 1, -8833.4873046875, 878.150390625, 98.49544525146484375, 2.617989301681518554, 0, 0, 0.965925216674804687, 0.258821308612823486, 120, 255, 1, "", 50063, NULL), +(76186, 181302, 0, 0, 0, 1, 1, -8833.8818359375, 875.90313720703125, 98.54409027099609375, 5.532694816589355468, 0, 0, -0.3665008544921875, 0.93041771650314331, 120, 255, 1, "", 50063, NULL), +(76187, 181302, 0, 0, 0, 1, 1, -8836.9267578125, 866.6121826171875, 98.7047882080078125, 3.822272777557373046, 0, 0, -0.94264125823974609, 0.333807557821273803, 120, 255, 1, "", 50063, NULL), +(76188, 181302, 0, 0, 0, 1, 1, -8837.712890625, 865.33233642578125, 98.692413330078125, 0.453785061836242675, 0, 0, 0.224950790405273437, 0.974370121955871582, 120, 255, 1, "", 50063, NULL), +(76189, 181302, 1, 0, 0, 1, 1, -2324.091552734375, -613.20245361328125, -9.05979156494140625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(76190, 181302, 1, 0, 0, 1, 1, -2325.46240234375, -612.76788330078125, -8.91627311706542968, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(76191, 181302, 1, 0, 0, 1, 1, -4400.79150390625, 3469.044189453125, 11.76598072052001953, 4.694936752319335937, 0, 0, -0.71325016021728515, 0.700909554958343505, 120, 255, 1, "", 50063, NULL), +(76192, 181302, 1, 0, 0, 1, 1, -4405.50634765625, 3474.66015625, 12.44817543029785156, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(76193, 181302, 530, 0, 0, 1, 1, -2237.229248046875, -11893.677734375, 27.14657020568847656, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(76194, 181302, 530, 0, 0, 1, 1, -2238.056396484375, -11892.1162109375, 27.564239501953125, 1.989672422409057617, 0, 0, 0.838669776916503906, 0.544640243053436279, 120, 255, 1, "", 50063, NULL), +(76195, 181302, 530, 0, 0, 1, 1, -2516.2802734375, 7561.79345703125, -1.97192394733428955, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(76196, 181302, 530, 0, 0, 1, 1, -2517.572509765625, 7560.88525390625, -1.99716496467590332, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76197, 181302, 530, 0, 0, 1, 1, -3007.27783203125, 4165.3095703125, 3.916898012161254882, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(76198, 181302, 530, 0, 0, 1, 1, -3008.2734375, 4163.89501953125, 3.852447986602783203, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50063, NULL), +(76199, 181302, 530, 0, 0, 1, 1, -3060.705810546875, 2390.42138671875, 62.33280563354492187, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(76200, 181302, 530, 0, 0, 1, 1, -3062.057861328125, 2391.952392578125, 62.13649368286132812, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(76201, 181302, 530, 0, 0, 1, 1, -3798.819091796875, -11509.3642578125, -134.815994262695312, 2.862335443496704101, 0, 0, 0.990267753601074218, 0.139175355434417724, 120, 255, 1, "", 50063, NULL), +(76202, 181302, 530, 0, 0, 1, 1, -3799.016845703125, -11510.056640625, -133.567428588867187, 4.747295856475830078, 0, 0, -0.69465827941894531, 0.719339847564697265, 120, 255, 1, "", 50063, NULL), +(76203, 181302, 530, 0, 0, 1, 1, -3799.34716796875, -11510.98046875, -134.836044311523437, 5.410521507263183593, 0, 0, -0.42261791229248046, 0.906307935714721679, 120, 255, 1, "", 50063, NULL), +(76204, 181302, 530, 0, 0, 1, 1, -3951.089111328125, 2050.404296875, 95.06470489501953125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(76205, 181302, 530, 0, 0, 1, 1, -3951.9375, 2052.20703125, 95.06470489501953125, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50063, NULL), +(76206, 181302, 530, 0, 0, 1, 1, 188.0206451416015625, 6012.25537109375, 23.58553695678710937, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50063, NULL), +(76207, 181302, 530, 0, 0, 1, 1, 188.9560546875, 6009.599609375, 23.90727615356445312, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(76208, 181302, 530, 0, 0, 1, 1, 2924.20458984375, 3696.30419921875, 143.683746337890625, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50063, NULL), +(76209, 181302, 530, 0, 0, 1, 1, 2925.7958984375, 3695.99267578125, 143.7349853515625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50063, NULL), +(76210, 181302, 530, 0, 0, 1, 1, 3122.182861328125, 3736.185302734375, 142.1844635009765625, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50063, NULL), +(76211, 181302, 530, 0, 0, 1, 1, 3123.459228515625, 3737.779052734375, 141.9783172607421875, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50063, NULL), +(76212, 181302, 571, 0, 0, 1, 1, 2470.2919921875, -4902.30712890625, 264.212921142578125, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76213, 181302, 571, 0, 0, 1, 1, 2471.3037109375, -4900.357421875, 264.2857666015625, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76214, 181302, 571, 0, 0, 1, 1, 2589.153564453125, -4330.10205078125, 277.317535400390625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(76215, 181302, 571, 0, 0, 1, 1, 2590.58984375, -4330.33251953125, 277.491729736328125, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50172, NULL), +(76216, 181302, 571, 0, 0, 1, 1, 3365.486572265625, -2121.5673828125, 124.9821395874023437, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50172, NULL), +(76217, 181302, 571, 0, 0, 1, 1, 3365.9140625, -2123.15673828125, 124.9776535034179687, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(76218, 181302, 571, 0, 0, 1, 1, 3408.29052734375, -2894.600830078125, 201.691314697265625, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76219, 181302, 571, 0, 0, 1, 1, 3409.72900390625, -2896.10205078125, 201.9228057861328125, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76220, 181302, 571, 0, 0, 1, 1, 3772.91796875, 1481.8626708984375, 92.1890411376953125, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50172, NULL), +(76221, 181302, 571, 0, 0, 1, 1, 3774.033447265625, 1483.2371826171875, 92.03250885009765625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(76222, 181302, 571, 0, 0, 1, 1, 3929.76611328125, -591.72247314453125, 241.3097686767578125, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76223, 181302, 571, 0, 0, 1, 1, 3931.06689453125, -589.9395751953125, 241.0223236083984375, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76224, 181302, 571, 0, 0, 1, 1, 4136.1474609375, 5388.24072265625, 26.362884521484375, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76225, 181302, 571, 0, 0, 1, 1, 4137.3837890625, 5390.54248046875, 26.72762298583984375, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76226, 181302, 571, 0, 0, 1, 1, 4462.52099609375, 5627.224609375, 57.96071243286132812, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(76227, 181302, 571, 0, 0, 1, 1, 4462.57666015625, 5625.8603515625, 57.83119583129882812, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50172, NULL), +(76228, 181302, 571, 0, 0, 1, 1, 5134.75634765625, -683.46221923828125, 170.7422637939453125, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76229, 181302, 571, 0, 0, 1, 1, 5136.64599609375, -684.31219482421875, 170.6110076904296875, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76230, 181302, 571, 0, 0, 1, 1, 5292.29150390625, -2768.984130859375, 292.3184814453125, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50172, NULL), +(76231, 181302, 571, 0, 0, 1, 1, 5292.47509765625, -2770.343017578125, 292.301910400390625, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(76232, 181302, 571, 0, 0, 1, 1, 5352.67041015625, 4832.91650390625, -195.247909545898437, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76233, 181302, 571, 0, 0, 1, 1, 5353.85009765625, 4834.48291015625, -195.45416259765625, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76234, 181302, 571, 0, 0, 1, 1, 5503.6865234375, 4878.72509765625, -198.073165893554687, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(76235, 181302, 571, 0, 0, 1, 1, 5504.19091796875, 4877.22216796875, -197.989273071289062, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 50172, NULL), +(76236, 181302, 571, 0, 0, 1, 1, 5547.11865234375, -734.31097412109375, 150.57244873046875, 3.473210096359252929, 0, 0, -0.98628520965576171, 0.165049895644187927, 120, 255, 1, "", 50172, NULL), +(76237, 181302, 571, 0, 0, 1, 1, 5548.38525390625, -732.41241455078125, 150.8041839599609375, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL), +(76238, 181302, 571, 0, 0, 1, 1, 5627.58447265625, -2626.33447265625, 292.318511962890625, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76239, 181302, 571, 0, 0, 1, 1, 5629.53173828125, -2624.82177734375, 292.085845947265625, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76240, 181302, 571, 0, 0, 1, 1, 6085.775390625, -1112.75537109375, 419.687652587890625, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 50172, NULL), +(76241, 181302, 571, 0, 0, 1, 1, 6087.263671875, -1111.9832763671875, 419.469146728515625, 2.949595451354980468, 0, 0, 0.995395660400390625, 0.095851235091686248, 120, 255, 1, "", 50172, NULL), +(76242, 181302, 571, 0, 0, 1, 1, 6147.53515625, -1034.9718017578125, 410.43841552734375, 3.473210096359252929, 0, 0, -0.98628520965576171, 0.165049895644187927, 120, 255, 1, "", 50172, NULL), +(76243, 181302, 571, 0, 0, 1, 1, 6147.54736328125, -1034.9752197265625, 409.2025146484375, 4.782202720642089843, 0, 0, -0.68199825286865234, 0.731353819370269775, 120, 255, 1, "", 50172, NULL); + +-- remove duplicate spawns +DELETE FROM `gameobject` WHERE (`id` = 181302) AND (`guid` IN (50802, 50803, 50785, 50784, 50741, 50740, 50705, 50743, 50747, 50750, 50709, 50710)); +DELETE FROM `gameobject_addon` WHERE (`guid` IN (50802, 50803, 50785, 50784, 50741, 50740, 50705, 50743, 50747, 50750, 50709, 50710)); +DELETE FROM `game_event_gameobject` WHERE (`guid` IN (50802, 50803, 50785, 50784, 50741, 50740, 50705, 50743, 50747, 50750, 50709, 50710)); + +-- enable all spawns for eventEntry 1 +DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 1) AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` = 181302)); +INSERT INTO `game_event_gameobject` (SELECT 1, `guid` FROM `gameobject` WHERE `id` = 181302); From 2fd5e93ad33e42e0dfe25c512fc46fddefaec339 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 14:48:17 +0100 Subject: [PATCH 07/27] fix(DB/Gameobject): Sniffed Values for 181306 'Camp Jug' (#18159) --- .../rev_1705047627268701300.sql | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1705047627268701300.sql diff --git a/data/sql/updates/pending_db_world/rev_1705047627268701300.sql b/data/sql/updates/pending_db_world/rev_1705047627268701300.sql new file mode 100644 index 000000000..e9cec399c --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1705047627268701300.sql @@ -0,0 +1,96 @@ +-- Update gameobject 181306 'Camp Jug' with sniffed values +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` = 181306) AND (`guid` IN (150732, 150856, 150994, 151014, 17823, 17849, 21481, 50850, 50851, 50853, 50855, 50856, 50857, 50858, 50859, 50860, 50861, 50862, 50863, 50864, 50865, 50866, 50867, 50868, 50869, 50870, 50873, 50874, 50876, 50877, 50878, 50879, 50880, 50881, 50882, 50883, 50884, 50885, 50886, 50887, 50888, 50889, 50890, 50891, 50892, 50893, 50894, 50895, 50896, 50898, 50899, 70544, 70577)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(150732, 181306, 1, 0, 0, 1, 1, 133.390625, -4716.14697265625, 18.43707084655761718, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(150856, 181306, 530, 0, 0, 1, 1, 9376.6005859375, -6768.2255859375, 14.83368778228759765, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(150994, 181306, 530, 0, 0, 1, 1, 7683.7412109375, -6838.73681640625, 79.044281005859375, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(151014, 181306, 0, 0, 0, 1, 1, 2280.96337890625, 443.0460205078125, 34.20271682739257812, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(17823, 181306, 0, 0, 0, 1, 1, -8262.3271484375, -2628.302001953125, 134.26654052734375, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(17849, 181306, 0, 0, 0, 1, 1, 1002.77178955078125, -1445.21484375, 62.09950637817382812, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(21481, 181306, 530, 0, 0, 1, 1, 2289.730712890625, 6131.17724609375, 135.6796112060546875, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50850, 181306, 1, 0, 0, 1, 1, -6773.0810546875, 543.3126220703125, 0.168991997838020324, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50851, 181306, 1, 0, 0, 1, 1, -6990.94873046875, 912.9356689453125, 9.544574737548828125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50853, 181306, 1, 0, 0, 1, 1, -7226.18115234375, -3851.489501953125, 12.22726154327392578, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50855, 181306, 1, 0, 0, 1, 1, -7116.39892578125, -3664.870361328125, 9.250508308410644531, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50856, 181306, 1, 0, 0, 1, 1, 6852.8779296875, -4764.857421875, 697.13262939453125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50857, 181306, 1, 0, 0, 1, 1, 2572.0986328125, -480.7265625, 108.22052001953125, 4.625123500823974609, 0, 0, -0.73727703094482421, 0.67559051513671875, 120, 255, 1, "", 50063, NULL), +(50858, 181306, 1, 0, 0, 1, 1, 2010.8465576171875, -2351.84716796875, 89.48606109619140625, 4.799657344818115234, 0, 0, -0.67558956146240234, 0.737277925014495849, 120, 255, 1, "", 50063, NULL), +(50859, 181306, 1, 0, 0, 1, 1, -4575.45166015625, 420.458221435546875, 41.25612258911132812, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50860, 181306, 1, 0, 0, 1, 1, -5513.82666015625, -2288.081298828125, -58.28057861328125, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50861, 181306, 1, 0, 0, 1, 1, -3109.96826171875, -2730.352783203125, 34.1054229736328125, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50862, 181306, 530, 0, 0, 1, 1, -520.1912841796875, 2331.667236328125, 38.1494140625, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50863, 181306, 0, 0, 0, 1, 1, -10342.0517578125, -3296.921142578125, 23.09260749816894531, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50864, 181306, 530, 0, 0, 1, 1, 211.392333984375, 7694.94384765625, 22.85190200805664062, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50865, 181306, 1, 0, 0, 1, 1, 953.72430419921875, 785.190673828125, 105.22528076171875, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50866, 181306, 0, 0, 0, 1, 1, -613.47076416015625, -541.61297607421875, 36.34727859497070312, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50867, 181306, 0, 0, 0, 1, 1, -9424.6337890625, -2117.275634765625, 66.5191497802734375, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50868, 181306, 0, 0, 0, 1, 1, -14290.9296875, 50.25830078125, 0.818799972534179687, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50869, 181306, 0, 0, 0, 1, 1, -14372.146484375, 128.5262298583984375, 1.13560497760772705, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50870, 181306, 0, 0, 0, 1, 1, -10651.0888671875, 1062.3636474609375, 32.59815597534179687, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50873, 181306, 1, 0, 0, 1, 1, 9778.6826171875, 1005.3167724609375, 1299.109130859375, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50874, 181306, 0, 0, 0, 1, 1, -5417.87109375, -490.78570556640625, 397.053131103515625, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50876, 181306, 0, 0, 0, 1, 1, -7594.783203125, -2079.193115234375, 125.9508895874023437, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50877, 181306, 1, 0, 0, 1, 1, 6842.4765625, -4561.033203125, 709.5623779296875, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50878, 181306, 0, 0, 0, 1, 1, -455.33892822265625, -4533.84716796875, 8.705859184265136718, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50879, 181306, 1, 0, 0, 1, 1, -1857.01611328125, 3049.098388671875, 1.573428988456726074, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50880, 181306, 1, 0, 0, 1, 1, -285.081939697265625, -2661.312255859375, 93.264617919921875, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50881, 181306, 1, 0, 0, 1, 1, -1016.401123046875, 305.17535400390625, 135.745941162109375, 4.328419685363769531, 0, 0, -0.82903671264648437, 0.559194147586822509, 120, 255, 1, "", 50063, NULL), +(50882, 181306, 530, 0, 0, 1, 1, -2547.83935546875, 4268.3193359375, 19.59874343872070312, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50883, 181306, 1, 0, 0, 1, 1, -54.8665924072265625, 1257.6571044921875, 90.334320068359375, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50884, 181306, 1, 0, 0, 1, 1, 6317.49609375, 512.949951171875, 18.21179389953613281, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50885, 181306, 1, 0, 0, 1, 1, -3443.264404296875, -4219.177734375, 11.92147445678710937, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50886, 181306, 0, 0, 0, 1, 1, 187.826385498046875, -2120.929443359375, 104.1431732177734375, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50887, 181306, 0, 0, 0, 1, 1, -3439.45849609375, -943.0770263671875, 10.21065711975097656, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50888, 181306, 0, 0, 0, 1, 1, -1214.646728515625, -2662.35546875, 45.57818603515625, 2.530723094940185546, 0, 0, 0.953716278076171875, 0.300707906484603881, 120, 255, 1, "", 50063, NULL), +(50889, 181306, 0, 0, 0, 1, 1, -1124.3548583984375, -3532.189208984375, 50.70863723754882812, 0.27925160527229309, 0, 0, 0.139172554016113281, 0.990268170833587646, 120, 255, 1, "", 50063, NULL), +(50890, 181306, 0, 0, 0, 1, 1, -10939.1923828125, -3226.337890625, 41.34749984741210937, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50891, 181306, 0, 0, 0, 1, 1, -9384.0732421875, 27.68462562561035156, 60.64604949951171875, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50892, 181306, 0, 0, 0, 1, 1, -5244.10400390625, -2897.7802734375, 338.32501220703125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50893, 181306, 0, 0, 0, 1, 1, -136.410049438476562, -813.05938720703125, 55.16337966918945312, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50894, 181306, 0, 0, 0, 1, 1, 589.41485595703125, 1355.64697265625, 90.750457763671875, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50895, 181306, 530, 0, 0, 1, 1, -1208.573974609375, 7488.83349609375, 21.90335273742675781, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50896, 181306, 0, 0, 0, 1, 1, -10690.5869140625, -1154.2674560546875, 25.49131011962890625, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(50898, 181306, 0, 0, 0, 1, 1, -6688.55712890625, -2203.81689453125, 248.9901275634765625, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50899, 181306, 530, 0, 0, 1, 1, 36.37131118774414062, 2595.357177734375, 69.6620635986328125, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(70544, 181306, 530, 0, 0, 1, 1, -4224.27978515625, -12299.6171875, 4.223074913024902343, 2.478367090225219726, 0, 0, 0.94551849365234375, 0.325568377971649169, 120, 255, 1, "", 50063, NULL), +(70577, 181306, 530, 0, 0, 1, 1, 2022.450927734375, 6595.767578125, 135.6440582275390625, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL); + +-- new spawns +DELETE FROM `gameobject` WHERE (`id` = 181306) AND (`guid` BETWEEN 24399 AND 24424); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(24399, 181306, 1, 0, 0, 1, 1, -2322.56689453125, -613.108642578125, -9.20786476135253906, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(24400, 181306, 1, 0, 0, 1, 1, -4405.0009765625, 3476.316162109375, 12.39224052429199218, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(24401, 181306, 530, 0, 0, 1, 1, -2237.12060546875, -11886.7890625, 28.9581298828125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(24402, 181306, 530, 0, 0, 1, 1, -2516.125244140625, 7559.64404296875, -2.02154803276062011, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24403, 181306, 530, 0, 0, 1, 1, -3006.3681640625, 4163.9521484375, 4.066896915435791015, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(24404, 181306, 530, 0, 0, 1, 1, -3060.13525390625, 2392.196533203125, 62.05850601196289062, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(24405, 181306, 530, 0, 0, 1, 1, -3949.811279296875, 2052.33837890625, 95.06470489501953125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(24406, 181306, 530, 0, 0, 1, 1, 190.1271209716796875, 6010.93310546875, 23.73722648620605468, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(24407, 181306, 530, 0, 0, 1, 1, 2922.666259765625, 3696.724853515625, 143.5906982421875, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(24408, 181306, 530, 0, 0, 1, 1, 3122.188720703125, 3739.353271484375, 141.9458465576171875, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50063, NULL), +(24409, 181306, 571, 0, 0, 1, 1, 2472.223388671875, -4902.35693359375, 264.365509033203125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24410, 181306, 571, 0, 0, 1, 1, 2589.838623046875, -4328.51416015625, 277.512603759765625, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(24411, 181306, 571, 0, 0, 1, 1, 3366.80419921875, -2127.405517578125, 124.796630859375, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(24412, 181306, 571, 0, 0, 1, 1, 3405.554931640625, -2894.453857421875, 201.651153564453125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24413, 181306, 571, 0, 0, 1, 1, 3767.688720703125, 1486.2794189453125, 91.857757568359375, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(24414, 181306, 571, 0, 0, 1, 1, 3931.75732421875, -591.57421875, 241.1102142333984375, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24415, 181306, 571, 0, 0, 1, 1, 4139.0859375, 5391.19677734375, 27.02344512939453125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24416, 181306, 571, 0, 0, 1, 1, 4460.45556640625, 5629.18994140625, 57.8947906494140625, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(24417, 181306, 571, 0, 0, 1, 1, 5136.8173828125, -682.67510986328125, 170.5223388671875, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24418, 181306, 571, 0, 0, 1, 1, 5290.974609375, -2769.950439453125, 292.41851806640625, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(24419, 181306, 571, 0, 0, 1, 1, 5353.1689453125, 4836.52587890625, -195.259307861328125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24420, 181306, 571, 0, 0, 1, 1, 5502.13525390625, 4881.791015625, -198.27069091796875, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(24421, 181306, 571, 0, 0, 1, 1, 5549.09716796875, -733.79217529296875, 150.9401397705078125, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL), +(24422, 181306, 571, 0, 0, 1, 1, 5629.79248046875, -2626.63134765625, 292.2657470703125, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24423, 181306, 571, 0, 0, 1, 1, 6085.23828125, -1114.6424560546875, 419.919647216796875, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(24424, 181306, 571, 0, 0, 1, 1, 6147.54541015625, -1031.9027099609375, 409.8323974609375, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50172, NULL); + +-- remove duplicate spawns +DELETE FROM `gameobject` WHERE (`id` = 181306) AND (`guid` IN (50897, 50871, 50872, 50852, 50875, 50854)); +DELETE FROM `gameobject_addon` WHERE (`guid` IN (50897, 50871, 50872, 50852, 50875, 50854)); +DELETE FROM `game_event_gameobject` WHERE (`guid` IN (50897, 50871, 50872, 50852, 50875, 50854)); + +-- enable all spawns for eventEntry 1 +DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 1) AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` = 181306)); +INSERT INTO `game_event_gameobject` (SELECT 1, `guid` FROM `gameobject` WHERE `id` = 181306); From 7edec4200ba3c8c0e4b09392573d0ac40be67ce4 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 14:48:31 +0100 Subject: [PATCH 08/27] =?UTF-8?q?fix(DB/Creature):=20Update=20'Magical=20M?= =?UTF-8?q?enagerie'=20Cosmetic=20creature=20spawns=E2=80=A6=20(#18152)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(DB/Creature): Update 'Magical Menagerie' Cosmetic creature spawns with sniffed values' --- .../rev_1704916944244599500.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1704916944244599500.sql diff --git a/data/sql/updates/pending_db_world/rev_1704916944244599500.sql b/data/sql/updates/pending_db_world/rev_1704916944244599500.sql new file mode 100644 index 000000000..b4a4d0d19 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1704916944244599500.sql @@ -0,0 +1,19 @@ +-- Update 'Magical Menagerie' Cosmetic creature spawns with sniffed values +DELETE FROM `creature` WHERE (`id1` IN (31795, 31796, 31709, 31710, 31711, 31714, 31719, 31728, 31729, 31730, 31732, 31733, 31735, 31740, 31741, 31742)) AND (`guid` IN (100693, 100774, 117101, 117166, 117221, 117622, 117880, 118577, 118687, 118745, 118867, 118880, 119351, 120256, 120411, 120515)); +INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES +(100693, 31795, 571, 1, 1, 0, 5843.26123046875, 563.841796875, 653.23895263671875, 0.226892799139022827, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(100774, 31796, 571, 1, 1, 0, 5853.2626953125, 576.4080810546875, 653.99591064453125, 5.654866695404052734, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(117101, 31709, 571, 1, 1, 0, 5841.44091796875, 561.623291015625, 653.25286865234375, 4.747295379638671875, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(117166, 31710, 571, 1, 1, 0, 5853.4375, 563.98089599609375, 653.25286865234375, 1.256637096405029296, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(117221, 31711, 571, 1, 1, 0, 5849.7724609375, 571.70831298828125, 653.4473876953125, 3.96189737319946289, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(117622, 31714, 571, 1, 1, 0, 5851.6484375, 561.7413330078125, 653.24591064453125, 4.084070205688476562, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(117880, 31719, 571, 1, 1, 0, 5838.8857421875, 554.9130859375, 654.69732666015625, 5.567600250244140625, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(118577, 31728, 571, 1, 1, 0, 5858.50830078125, 570.294921875, 654.00286865234375, 2.600540637969970703, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(118687, 31729, 571, 1, 1, 0, 5853.3984375, 564.296630859375, 653.8431396484375, 3.490658521652221679, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(118745, 31730, 571, 1, 1, 0, 5847.25, 554.0838623046875, 654.0306396484375, 0.855211317539215087, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(118867, 31732, 571, 1, 1, 0, 5859.31005859375, 573.16375732421875, 653.7667236328125, 3.839724302291870117, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(118880, 31733, 571, 1, 1, 0, 5851.462890625, 574.11517333984375, 653.42645263671875, 0.506145477294921875, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(119351, 31735, 571, 1, 1, 0, 5859.35791015625, 573.21661376953125, 652.75982666015625, 2.58308720588684082, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(120256, 31740, 571, 1, 1, 0, 5858.958984375, 570.02239990234375, 654.961181640625, 2.932153224945068359, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(120411, 31741, 571, 1, 1, 0, 5859.6298828125, 569.32440185546875, 654.00286865234375, 4.764749050140380859, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL), +(120515, 31742, 571, 1, 1, 0, 5838.4833984375, 558.2471923828125, 654.00286865234375, 0, 120, 0, 0, 0, 0, 0, "", 48632, 1, NULL); From 8c33fba96462c73d21c6bf998de635385c369733 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 13:48:39 +0000 Subject: [PATCH 09/27] chore(DB): import pending files Referenced commit(s): 975ef5198058fde8b2f6b54d061bdcf8f851c133 --- .../rev_1704835582555070100.sql => db_world/2024_01_14_03.sql} | 1 + .../rev_1704916944244599500.sql => db_world/2024_01_14_04.sql} | 1 + .../rev_1705045773931139800.sql => db_world/2024_01_14_05.sql} | 1 + .../rev_1705047627268701300.sql => db_world/2024_01_14_06.sql} | 1 + 4 files changed, 4 insertions(+) rename data/sql/updates/{pending_db_world/rev_1704835582555070100.sql => db_world/2024_01_14_03.sql} (98%) rename data/sql/updates/{pending_db_world/rev_1704916944244599500.sql => db_world/2024_01_14_04.sql} (98%) rename data/sql/updates/{pending_db_world/rev_1705045773931139800.sql => db_world/2024_01_14_05.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1705047627268701300.sql => db_world/2024_01_14_06.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1704835582555070100.sql b/data/sql/updates/db_world/2024_01_14_03.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1704835582555070100.sql rename to data/sql/updates/db_world/2024_01_14_03.sql index 056121a76..30e06d1e2 100644 --- a/data/sql/updates/pending_db_world/rev_1704835582555070100.sql +++ b/data/sql/updates/db_world/2024_01_14_03.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_02 -> 2024_01_14_03 -- Update gameobject 180046 'Chair' with sniffed values -- remaining spawns (no sniffed values available) diff --git a/data/sql/updates/pending_db_world/rev_1704916944244599500.sql b/data/sql/updates/db_world/2024_01_14_04.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1704916944244599500.sql rename to data/sql/updates/db_world/2024_01_14_04.sql index b4a4d0d19..c675496f0 100644 --- a/data/sql/updates/pending_db_world/rev_1704916944244599500.sql +++ b/data/sql/updates/db_world/2024_01_14_04.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_03 -> 2024_01_14_04 -- Update 'Magical Menagerie' Cosmetic creature spawns with sniffed values DELETE FROM `creature` WHERE (`id1` IN (31795, 31796, 31709, 31710, 31711, 31714, 31719, 31728, 31729, 31730, 31732, 31733, 31735, 31740, 31741, 31742)) AND (`guid` IN (100693, 100774, 117101, 117166, 117221, 117622, 117880, 118577, 118687, 118745, 118867, 118880, 119351, 120256, 120411, 120515)); INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1705045773931139800.sql b/data/sql/updates/db_world/2024_01_14_05.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1705045773931139800.sql rename to data/sql/updates/db_world/2024_01_14_05.sql index cfb19c7fe..7c1d9a401 100644 --- a/data/sql/updates/pending_db_world/rev_1705045773931139800.sql +++ b/data/sql/updates/db_world/2024_01_14_05.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_04 -> 2024_01_14_05 -- Update gameobject 181302 'Camp Crate' with sniffed values -- updated spawns DELETE FROM `gameobject` WHERE (`id` = 181302) AND (`guid` IN (150734, 150735, 150865, 150866, 150991, 150992, 150993, 151008, 151009, 151024, 151025, 17820, 17821, 17846, 17847, 21478, 21479, 50697, 50698, 50699, 50700, 50701, 50702, 50703, 50704, 50706, 50707, 50708, 50711, 50712, 50713, 50714, 50715, 50716, 50717, 50718, 50719, 50720, 50721, 50722, 50723, 50724, 50725, 50726, 50727, 50728, 50729, 50730, 50731, 50732, 50733, 50734, 50735, 50736, 50737, 50738, 50739, 50742, 50744, 50745, 50746, 50748, 50749, 50751, 50752, 50753, 50754, 50755, 50756, 50757, 50758, 50759, 50760, 50761, 50762, 50763, 50764, 50765, 50766, 50767, 50768, 50769, 50770, 50771, 50772, 50773, 50774, 50775, 50776, 50777, 50778, 50779, 50780, 50781, 50782, 50783, 50786, 50787, 50788, 50789, 50790, 50791, 50792, 50793, 50794, 50795, 50796, 50797, 50798, 50799, 50800, 50801, 50804, 50805, 50806, 50807, 50808, 50809, 70541, 70542, 70574, 70575)); diff --git a/data/sql/updates/pending_db_world/rev_1705047627268701300.sql b/data/sql/updates/db_world/2024_01_14_06.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1705047627268701300.sql rename to data/sql/updates/db_world/2024_01_14_06.sql index e9cec399c..c641a9fd5 100644 --- a/data/sql/updates/pending_db_world/rev_1705047627268701300.sql +++ b/data/sql/updates/db_world/2024_01_14_06.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_05 -> 2024_01_14_06 -- Update gameobject 181306 'Camp Jug' with sniffed values -- updated spawns DELETE FROM `gameobject` WHERE (`id` = 181306) AND (`guid` IN (150732, 150856, 150994, 151014, 17823, 17849, 21481, 50850, 50851, 50853, 50855, 50856, 50857, 50858, 50859, 50860, 50861, 50862, 50863, 50864, 50865, 50866, 50867, 50868, 50869, 50870, 50873, 50874, 50876, 50877, 50878, 50879, 50880, 50881, 50882, 50883, 50884, 50885, 50886, 50887, 50888, 50889, 50890, 50891, 50892, 50893, 50894, 50895, 50896, 50898, 50899, 70544, 70577)); From 4ab9e5b301d09311d71bfd426e027e93253ee078 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 14:48:47 +0100 Subject: [PATCH 10/27] fix(DB/Gameobject): Sniffed Values for 180045 'Stormwind Gypsy Wagon' (#18144) * fix(DB/Gameobject): Sniffed Values for 180045 'Stormwind Gypsy Wagon' * reorder for sql code style check --- .../rev_1704833818090519400.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1704833818090519400.sql diff --git a/data/sql/updates/pending_db_world/rev_1704833818090519400.sql b/data/sql/updates/pending_db_world/rev_1704833818090519400.sql new file mode 100644 index 000000000..1e86694f2 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1704833818090519400.sql @@ -0,0 +1,17 @@ +-- Update gameobject 180045 'Stormwind Gypsy Wagon' with sniffed values + +-- remaining spawns (no sniffed values available) +-- (`guid` IN (14004, 13837, 31876, 31919, 29934, 29953, 29966)) + +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` = 180045) AND (`guid` IN (121696, 121697, 121698, 28543, 28556, 28588, 5833, 5843, 5846)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(121696, 180045, 1, 0, 0, 1, 1, -1468.20166015625, 195.7496185302734375, -7.79279518127441406, 1.134462952613830566, 0, 0, 0.537299156188964843, 0.843391716480255126, 120, 255, 1, "", 50250, NULL), +(121697, 180045, 1, 0, 0, 1, 1, -1475.001953125, 206.0911407470703125, -7.79280376434326171, 3.071766138076782226, 0, 0, 0.999390602111816406, 0.034906134009361267, 120, 255, 1, "", 50250, NULL), +(121698, 180045, 1, 0, 0, 1, 1, -1480.6953125, 194.7397003173828125, -7.79280281066894531, 5.288348197937011718, 0, 0, -0.4771585464477539, 0.878817260265350341, 120, 255, 1, "", 50250, NULL), +(28543, 180045, 0, 0, 0, 1, 1, -9580.794921875, 28.32736587524414062, 60.66270065307617187, 4.97418975830078125, 0, 0, -0.60876083374023437, 0.793353796005249023, 120, 255, 1, "", 45435, NULL), +(28556, 180045, 0, 0, 0, 1, 1, -9573.2958984375, 37.07242965698242187, 60.46746063232421875, 3.001946926116943359, 0, 0, 0.997563362121582031, 0.069766148924827575, 120, 255, 1, "", 45435, NULL), +(28588, 180045, 0, 0, 0, 1, 1, -9568.8466796875, 26.181640625, 61.27640914916992187, 0.767943859100341796, 0, 0, 0.374606132507324218, 0.927184045314788818, 120, 255, 1, "", 45435, NULL), +(5833, 180045, 530, 0, 0, 1, 1, -2277.489501953125, 5228.88525390625, -9.97542953491210937, 4.398232460021972656, 0, 0, -0.80901622772216796, 0.587786316871643066, 120, 255, 1, "", 49345, NULL), +(5843, 180045, 530, 0, 0, 1, 1, -2268.447998046875, 5238.1875, -9.97545337677001953, 3.595378875732421875, 0, 0, -0.97437000274658203, 0.224951311945915222, 120, 255, 1, "", 49345, NULL), +(5846, 180045, 530, 0, 0, 1, 1, -2261.482666015625, 5193.23291015625, -10.0657358169555664, 6.14356088638305664, 0, 0, -0.06975555419921875, 0.997564136981964111, 120, 255, 1, "", 49345, NULL); From c44e250256eddb9a4ef938cf4bb25628abebf73e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 13:48:58 +0000 Subject: [PATCH 11/27] chore(DB): import pending files Referenced commit(s): fa5053467c61320663430721d76d1cb2900c888b --- .../rev_1704833818090519400.sql => db_world/2024_01_14_07.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1704833818090519400.sql => db_world/2024_01_14_07.sql} (98%) diff --git a/data/sql/updates/pending_db_world/rev_1704833818090519400.sql b/data/sql/updates/db_world/2024_01_14_07.sql similarity index 98% rename from data/sql/updates/pending_db_world/rev_1704833818090519400.sql rename to data/sql/updates/db_world/2024_01_14_07.sql index 1e86694f2..acb916a68 100644 --- a/data/sql/updates/pending_db_world/rev_1704833818090519400.sql +++ b/data/sql/updates/db_world/2024_01_14_07.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_06 -> 2024_01_14_07 -- Update gameobject 180045 'Stormwind Gypsy Wagon' with sniffed values -- remaining spawns (no sniffed values available) From 8844bcf6cf1ff1515c4cdc29ab97f59dfc99bc28 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 15:07:23 +0100 Subject: [PATCH 12/27] fix(DB/Gameobject): Sniffed Values for 181305 'Camp Table' (#18138) --- .../rev_1704746597169225900.sql | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1704746597169225900.sql diff --git a/data/sql/updates/pending_db_world/rev_1704746597169225900.sql b/data/sql/updates/pending_db_world/rev_1704746597169225900.sql new file mode 100644 index 000000000..0d95de68f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1704746597169225900.sql @@ -0,0 +1,90 @@ +-- Update gameobject 181305 'Camp Table' with sniffed values +-- updated spawns +DELETE FROM `gameobject` WHERE (`id` = 181305) AND (`guid` IN (150733, 150864, 150990, 151007, 151023, 17822, 17848, 21480, 50811, 50812, 50813, 50814, 50815, 50816, 50817, 50818, 50819, 50820, 50821, 50822, 50823, 50824, 50825, 50826, 50827, 50829, 50830, 50831, 50832, 50833, 50834, 50835, 50836, 50837, 50838, 50839, 50840, 50841, 50842, 50843, 50844, 50846, 50847, 50848, 50849, 70543, 70576)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(150733, 181305, 1, 0, 0, 1, 1, 134.53570556640625, -4719.62744140625, 18.14628982543945312, 0.523597896099090576, 0, 0, 0.258818626403808593, 0.965925931930541992, 120, 255, 1, "", 50172, NULL), +(150864, 181305, 530, 0, 0, 1, 1, 9376.2392578125, -6771.01318359375, 13.82097816467285156, 4.555310726165771484, 0, 0, -0.76040554046630859, 0.649448513984680175, 120, 255, 1, "", 50063, NULL), +(150990, 181305, 530, 0, 0, 1, 1, 9793.015625, -7251.93505859375, 26.12847328186035156, 2.094393253326416015, 0, 0, 0.866024971008300781, 0.50000077486038208, 120, 255, 1, "", 50063, NULL), +(151007, 181305, 530, 0, 0, 1, 1, 7682.28125, -6835.9404296875, 78.99625396728515625, 4.555310726165771484, 0, 0, -0.76040554046630859, 0.649448513984680175, 120, 255, 1, "", 50063, NULL), +(151023, 181305, 0, 0, 0, 1, 1, 2284.567138671875, 444.1817626953125, 34.46105575561523437, 0.139624491333961486, 0, 0, 0.06975555419921875, 0.997564136981964111, 120, 255, 1, "", 50063, NULL), +(17822, 181305, 0, 0, 0, 1, 1, -8258.5439453125, -2624.803466796875, 133.4995880126953125, 5.986480236053466796, 0, 0, -0.14780902862548828, 0.989015936851501464, 120, 255, 1, "", 50063, NULL), +(17848, 181305, 0, 0, 0, 1, 1, 1009.86572265625, -1446.94873046875, 62.1637725830078125, 3.490667104721069335, 0, 0, -0.98480701446533203, 0.173652306199073791, 120, 255, 1, "", 50063, NULL), +(21480, 181305, 530, 0, 0, 1, 1, 2290.526123046875, 6135.18994140625, 135.97705078125, 4.59021615982055664, 0, 0, -0.74895572662353515, 0.662620067596435546, 120, 255, 1, "", 50063, NULL), +(50811, 181305, 1, 0, 0, 1, 1, 8703.1123046875, 965.84808349609375, 12.66894817352294921, 3.141592741012573242, 0, 0, -1, 0, 120, 255, 1, "", 50063, NULL), +(50812, 181305, 1, 0, 0, 1, 1, 2569.31982421875, -485.136138916015625, 108.9625015258789062, 3.577930212020874023, 0, 0, -0.97629547119140625, 0.216442063450813293, 120, 255, 1, "", 50063, NULL), +(50813, 181305, 1, 0, 0, 1, 1, 2014.9407958984375, -2349.852294921875, 89.628692626953125, 2.967041015625, 0, 0, 0.996193885803222656, 0.087165042757987976, 120, 255, 1, "", 50063, NULL), +(50814, 181305, 1, 0, 0, 1, 1, 6311.67822265625, 516.79144287109375, 18.25182533264160156, 5.986480236053466796, 0, 0, -0.14780902862548828, 0.989015936851501464, 120, 255, 1, "", 50063, NULL), +(50815, 181305, 1, 0, 0, 1, 1, -1016.1024169921875, 302.197906494140625, 135.745941162109375, 5.410521507263183593, 0, 0, -0.42261791229248046, 0.906307935714721679, 120, 255, 1, "", 50063, NULL), +(50816, 181305, 1, 0, 0, 1, 1, -3112.232177734375, -2734.434326171875, 34.1605377197265625, 1.535889506340026855, 0, 0, 0.694658279418945312, 0.719339847564697265, 120, 255, 1, "", 50063, NULL), +(50817, 181305, 530, 0, 0, 1, 1, 210.447540283203125, 7688.73291015625, 22.38297843933105468, 2.286378860473632812, 0, 0, 0.909960746765136718, 0.414694398641586303, 120, 255, 1, "", 50063, NULL), +(50818, 181305, 0, 0, 0, 1, 1, -617.8497314453125, -540.88067626953125, 35.5422515869140625, 2.70525527000427246, 0, 0, 0.97629547119140625, 0.216442063450813293, 120, 255, 1, "", 50063, NULL), +(50819, 181305, 0, 0, 0, 1, 1, -9424.0361328125, -2112.414794921875, 66.29156494140625, 1.134462952613830566, 0, 0, 0.537299156188964843, 0.843391716480255126, 120, 255, 1, "", 50063, NULL), +(50820, 181305, 0, 0, 0, 1, 1, 187.3526458740234375, -2126.194091796875, 103.10650634765625, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50821, 181305, 0, 0, 0, 1, 1, -10644.9609375, 1062.4444580078125, 33.02141189575195312, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50822, 181305, 0, 0, 0, 1, 1, -9383.357421875, 23.51568031311035156, 61.18290328979492187, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50823, 181305, 0, 0, 0, 1, 1, -5245.28857421875, -2894.12744140625, 338.2174072265625, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50824, 181305, 0, 0, 0, 1, 1, -142.7412109375, -813.46002197265625, 55.44543838500976562, 4.049167633056640625, 0, 0, -0.89879322052001953, 0.438372820615768432, 120, 255, 1, "", 50063, NULL), +(50825, 181305, 1, 0, 0, 1, 1, -56.7182083129882812, 1255.084716796875, 90.08145904541015625, 4.59021615982055664, 0, 0, -0.74895572662353515, 0.662620067596435546, 120, 255, 1, "", 50063, NULL), +(50826, 181305, 1, 0, 0, 1, 1, -3446.838623046875, -4217.35205078125, 11.53194046020507812, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50827, 181305, 1, 0, 0, 1, 1, -1850.7742919921875, 3052.09814453125, 0.7935829758644104, 3.22885894775390625, 0, 0, -0.99904823303222656, 0.043619260191917419, 120, 255, 1, "", 50063, NULL), +(50829, 181305, 1, 0, 0, 1, 1, -4581.1748046875, 418.045318603515625, 41.67034530639648437, 2.076939344406127929, 0, 0, 0.861628532409667968, 0.50753939151763916, 120, 255, 1, "", 50063, NULL), +(50830, 181305, 1, 0, 0, 1, 1, -286.08544921875, -2666.46435546875, 93.1140289306640625, 0.523597896099090576, 0, 0, 0.258818626403808593, 0.965925931930541992, 120, 255, 1, "", 50063, NULL), +(50831, 181305, 0, 0, 0, 1, 1, 1800.5274658203125, 219.4934844970703125, 59.75299072265625, 1.308995485305786132, 0, 0, 0.608760833740234375, 0.793353796005249023, 120, 255, 1, "", 50063, NULL), +(50832, 181305, 1, 0, 0, 1, 1, 9778.279296875, 1008.69317626953125, 1299.334228515625, 5.986480236053466796, 0, 0, -0.14780902862548828, 0.989015936851501464, 120, 255, 1, "", 50063, NULL), +(50833, 181305, 1, 0, 0, 1, 1, 1908.404541015625, -4349.06787109375, 21.13221931457519531, 5.777040958404541015, 0, 0, -0.25037956237792968, 0.968147754669189453, 120, 255, 1, "", 50063, NULL), +(50834, 181305, 0, 0, 0, 1, 1, -10342.74609375, -3301.149658203125, 23.40356063842773437, 3.595378875732421875, 0, 0, -0.97437000274658203, 0.224951311945915222, 120, 255, 1, "", 50063, NULL), +(50835, 181305, 0, 0, 0, 1, 1, -3439.260009765625, -945.92578125, 9.482163429260253906, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50836, 181305, 0, 0, 0, 1, 1, -1215.3941650390625, -2666.462158203125, 45.34893417358398437, 5.986480236053466796, 0, 0, -0.14780902862548828, 0.989015936851501464, 120, 255, 1, "", 50063, NULL), +(50837, 181305, 0, 0, 0, 1, 1, -10692.818359375, -1151.77587890625, 25.53472137451171875, 0.767943859100341796, 0, 0, 0.374606132507324218, 0.927184045314788818, 120, 255, 1, "", 50063, NULL), +(50838, 181305, 0, 0, 0, 1, 1, -1123.3819580078125, -3538.667236328125, 50.49688339233398437, 4.956737518310546875, 0, 0, -0.61566066741943359, 0.788011372089385986, 120, 255, 1, "", 50063, NULL), +(50839, 181305, 0, 0, 0, 1, 1, -6693.69677734375, -2202.817626953125, 248.9908294677734375, 4.59021615982055664, 0, 0, -0.74895572662353515, 0.662620067596435546, 120, 255, 1, "", 50063, NULL), +(50840, 181305, 530, 0, 0, 1, 1, -518.78057861328125, 2327.31591796875, 38.41185379028320312, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50841, 181305, 0, 0, 0, 1, 1, 588.7791748046875, 1358.4661865234375, 90.74591064453125, 3.595378875732421875, 0, 0, -0.97437000274658203, 0.224951311945915222, 120, 255, 1, "", 50063, NULL), +(50842, 181305, 0, 0, 0, 1, 1, -459.71441650390625, -4533.1943359375, 9.203335762023925781, 3.595378875732421875, 0, 0, -0.97437000274658203, 0.224951311945915222, 120, 255, 1, "", 50063, NULL), +(50843, 181305, 530, 0, 0, 1, 1, 33.37651824951171875, 2596.220947265625, 69.87420654296875, 2.356194972991943359, 0, 0, 0.923879623413085937, 0.382683247327804565, 120, 255, 1, "", 50063, NULL), +(50844, 181305, 530, 0, 0, 1, 1, -1211.8892822265625, 7487.9375, 21.78719711303710937, 1.396261811256408691, 0, 0, 0.642786979675292968, 0.766044974327087402, 120, 255, 1, "", 50063, NULL), +(50846, 181305, 0, 0, 0, 1, 1, -10942.3173828125, -3224.309814453125, 41.34749984741210937, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(50847, 181305, 0, 0, 0, 1, 1, -5421.57373046875, -489.313751220703125, 396.97027587890625, 4.59021615982055664, 0, 0, -0.74895572662353515, 0.662620067596435546, 120, 255, 1, "", 50063, NULL), +(50848, 181305, 530, 0, 0, 1, 1, -1746.6666259765625, 5336.02197265625, -12.4281368255615234, 3.94444584846496582, 0, 0, -0.92050457000732421, 0.3907318115234375, 120, 255, 1, "", 50063, NULL), +(50849, 181305, 0, 0, 0, 1, 1, -4708.73828125, -1228.8980712890625, 501.659332275390625, 2.827429771423339843, 0, 0, 0.987688064575195312, 0.156436234712600708, 120, 255, 1, "", 50063, NULL), +(70543, 181305, 530, 0, 0, 1, 1, -4219.08837890625, -12304.9443359375, 2.689529895782470703, 0.139624491333961486, 0, 0, 0.06975555419921875, 0.997564136981964111, 120, 255, 1, "", 50063, NULL), +(70576, 181305, 530, 0, 0, 1, 1, 2018.8953857421875, 6592.3291015625, 135.51385498046875, 6.12610626220703125, 0, 0, -0.07845878601074218, 0.996917366981506347, 120, 255, 1, "", 50063, NULL); + +-- new spawns +DELETE FROM `gameobject` WHERE (`id` = 181305) AND (`guid` BETWEEN 23863 AND 23888); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(23863, 181305, 0, 0, 0, 1, 1, -8828.34375, 873.07867431640625, 98.66424560546875, 1.291541695594787597, 0, 0, 0.60181427001953125, 0.798636078834533691, 120, 255, 1, "", 50063, NULL), +(23864, 181305, 1, 0, 0, 1, 1, -2327.7861328125, -614.86181640625, -8.80324554443359375, 2.565631866455078125, 0, 0, 0.958819389343261718, 0.284016460180282592, 120, 255, 1, "", 50063, NULL), +(23865, 181305, 1, 0, 0, 1, 1, -4405.46337890625, 3471.098876953125, 12.37083911895751953, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(23866, 181305, 530, 0, 0, 1, 1, -2231.282958984375, -11892.50390625, 27.38209915161132812, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(23867, 181305, 530, 0, 0, 1, 1, -2513.366455078125, 7558.064453125, -1.87656104564666748, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50172, NULL), +(23868, 181305, 530, 0, 0, 1, 1, -3005.37060546875, 4160.82470703125, 4.061088085174560546, 0.645771682262420654, 0, 0, 0.317304611206054687, 0.948323667049407958, 120, 255, 1, "", 50063, NULL), +(23869, 181305, 530, 0, 0, 1, 1, -3066.062744140625, 2394.056884765625, 61.9068145751953125, 1.832594871520996093, 0, 0, 0.793353080749511718, 0.608761727809906005, 120, 255, 1, "", 50063, NULL), +(23870, 181305, 530, 0, 0, 1, 1, -3793.71533203125, -11519.271484375, -134.923294067382812, 3.036838293075561523, 0, 0, 0.998628616333007812, 0.052353221923112869, 120, 255, 1, "", 50063, NULL), +(23871, 181305, 530, 0, 0, 1, 1, -3954.71875, 2052.718994140625, 95.06470489501953125, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50063, NULL), +(23872, 181305, 530, 0, 0, 1, 1, 193.4375762939453125, 6011.8115234375, 23.30001640319824218, 1.588248729705810546, 0, 0, 0.713250160217285156, 0.700909554958343505, 120, 255, 1, "", 50063, NULL), +(23873, 181305, 571, 0, 0, 1, 1, 2473.552978515625, -4898.2900390625, 264.216644287109375, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50172, NULL), +(23874, 181305, 571, 0, 0, 1, 1, 2589.429443359375, -4334.33056640625, 276.48724365234375, 4.066620349884033203, 0, 0, -0.89493370056152343, 0.44619917869567871, 120, 255, 1, "", 50172, NULL), +(23875, 181305, 571, 0, 0, 1, 1, 3371.319091796875, -2123.723876953125, 124.6873626708984375, 4.066620349884033203, 0, 0, -0.89493370056152343, 0.44619917869567871, 120, 255, 1, "", 50172, NULL), +(23876, 181305, 571, 0, 0, 1, 1, 3403.288330078125, -2897.456298828125, 201.8392333984375, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50172, NULL), +(23877, 181305, 571, 0, 0, 1, 1, 3770.50439453125, 1485.262939453125, 91.80987548828125, 4.066620349884033203, 0, 0, -0.89493370056152343, 0.44619917869567871, 120, 255, 1, "", 50172, NULL), +(23878, 181305, 571, 0, 0, 1, 1, 3941.099365234375, -603.547119140625, 241.427734375, 0.27925160527229309, 0, 0, 0.139172554016113281, 0.990268170833587646, 120, 255, 1, "", 50172, NULL), +(23879, 181305, 571, 0, 0, 1, 1, 4132.41064453125, 5387.60693359375, 26.70518875122070312, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50172, NULL), +(23880, 181305, 571, 0, 0, 1, 1, 4456.98681640625, 5625.58251953125, 56.89117431640625, 4.066620349884033203, 0, 0, -0.89493370056152343, 0.44619917869567871, 120, 255, 1, "", 50172, NULL), +(23881, 181305, 571, 0, 0, 1, 1, 5136.84912109375, -679.55743408203125, 170.3193206787109375, 2.775068521499633789, 0, 0, 0.983254432678222656, 0.182238012552261352, 120, 255, 1, "", 50172, NULL), +(23882, 181305, 571, 0, 0, 1, 1, 5285.86572265625, -2768.2275390625, 292.41851806640625, 4.066620349884033203, 0, 0, -0.89493370056152343, 0.44619917869567871, 120, 255, 1, "", 50172, NULL), +(23883, 181305, 571, 0, 0, 1, 1, 5354.986328125, 4838.82666015625, -195.66400146484375, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50172, NULL), +(23884, 181305, 571, 0, 0, 1, 1, 5505.31982421875, 4882.78515625, -198.511764526367187, 2.007128477096557617, 0, 0, 0.84339141845703125, 0.537299633026123046, 120, 255, 1, "", 50172, NULL), +(23885, 181305, 571, 0, 0, 1, 1, 5546.03125, -730.34136962890625, 150.2369384765625, 4.066620349884033203, 0, 0, -0.89493370056152343, 0.44619917869567871, 120, 255, 1, "", 50172, NULL), +(23886, 181305, 571, 0, 0, 1, 1, 5628.98193359375, -2621.128173828125, 292.409759521484375, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50172, NULL), +(23887, 181305, 571, 0, 0, 1, 1, 6081.8359375, -1109.1539306640625, 419.368865966796875, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 50172, NULL), +(23888, 181305, 571, 0, 0, 1, 1, 6147.9169921875, -1031.86572265625, 409.07110595703125, 4.066620349884033203, 0, 0, -0.89493370056152343, 0.44619917869567871, 120, 255, 1, "", 50172, NULL); + +-- remove duplicate spawns +DELETE FROM `gameobject` WHERE (`id` = 181305) AND (`guid` IN (50845)); +DELETE FROM `gameobject_addon` WHERE (`guid` IN (50845)); +DELETE FROM `game_event_gameobject` WHERE (`guid` IN (50845)); + +-- enable all spawns for eventEntry 1 +DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 1) AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` = 181305)); +INSERT INTO `game_event_gameobject` (SELECT 1, `guid` FROM `gameobject` WHERE `id` = 181305); From da63cc0c6137a637da505b8031083226f60b698b Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 15:07:38 +0100 Subject: [PATCH 13/27] fix(DB/Gameobject): Sniffed Values for 180665 'Draconic for Dummies' (#18137) --- data/sql/updates/pending_db_world/rev_1704744571249555200.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1704744571249555200.sql diff --git a/data/sql/updates/pending_db_world/rev_1704744571249555200.sql b/data/sql/updates/pending_db_world/rev_1704744571249555200.sql new file mode 100644 index 000000000..ae646982e --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1704744571249555200.sql @@ -0,0 +1,4 @@ +-- Update gameobject 180665 'Draconic for Dummies' with sniffed values +DELETE FROM `gameobject` WHERE (`id` = 180665) AND (`guid` IN (268645)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(268645, 180665, 0, 0, 0, 1, 1, -8340.1962890625, 413.749908447265625, 124.4896774291992187, 2.827429771423339843, 0, 0, 0.987688064575195312, 0.156436234712600708, 120, 255, 1, "", 50664, NULL); From 1785df7117f9d522b243870ed83588383e9d2b2b Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 15:07:52 +0100 Subject: [PATCH 14/27] fix(Core/Player): Fix Player not starting at full health (#18136) * fix(Core/Player): Fix Player not starting at full health * remove first call to UpdateMaxHealth() and SetFullHealth() --- src/server/game/Entities/Player/Player.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6ff88bd2e..11f7178a3 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -587,8 +587,6 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo InitPrimaryProfessions(); // to max set before any spell added // apply original stats mods before spell loading or item equipment that call before equip _RemoveStatsMods() - UpdateMaxHealth(); // Update max Health (for add bonus from stamina) - SetFullHealth(); if (getPowerType() == POWER_MANA) { UpdateMaxPower(POWER_MANA); // Update max Mana (for add bonus from intellect) @@ -686,6 +684,10 @@ bool Player::Create(ObjectGuid::LowType guidlow, CharacterCreateInfo* createInfo } // all item positions resolved + // ensure player starts with full health + UpdateAllStats(); + SetFullHealth(); + CheckAllAchievementCriteria(); return true; From 8720e08da8409178938f1974b85f46f650452b07 Mon Sep 17 00:00:00 2001 From: sudlud Date: Sun, 14 Jan 2024 15:08:18 +0100 Subject: [PATCH 15/27] fix(DB/SAI): Move GameObjectScript go_midsummer_bonfire to SAI (#18135) --- .../rev_1704713347931310000.sql | 246 ++++++++++++++++++ src/server/scripts/Events/midsummer.cpp | 15 -- 2 files changed, 246 insertions(+), 15 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1704713347931310000.sql diff --git a/data/sql/updates/pending_db_world/rev_1704713347931310000.sql b/data/sql/updates/pending_db_world/rev_1704713347931310000.sql new file mode 100644 index 000000000..97418b7fb --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1704713347931310000.sql @@ -0,0 +1,246 @@ +-- Move GameObjectScript go_midsummer_bonfire to SAI +-- Alliance Bonfires +SET @GO1 := 187944; +SET @GO2 := 187920; +SET @GO3 := 187926; +SET @GO4 := 187564; +SET @GO5 := 187934; +SET @GO6 := 187928; +SET @GO7 := 187922; +SET @GO8 := 187925; +SET @GO9 := 187932; +SET @GO10 := 187940; +SET @GO11 := 187914; +SET @GO12 := 187931; +SET @GO13 := 187938; +SET @GO14 := 187939; +SET @GO15 := 187945; +SET @GO16 := 187943; +SET @GO17 := 187929; +SET @GO18 := 187927; +SET @GO19 := 187924; +SET @GO20 := 187916; +SET @GO21 := 187923; +SET @GO22 := 187946; +SET @GO23 := 187936; +SET @GO24 := 187917; +SET @GO25 := 187935; +SET @GO26 := 187937; +SET @GO27 := 187933; +SET @GO28 := 187921; +SET @GO29 := 187930; +SET @GO30 := 187941; +SET @GO31 := 187919; +SET @GO32 := 187942; +SET @GO33 := 194038; +SET @GO34 := 194040; +SET @GO35 := 194036; +SET @GO36 := 194032; +SET @GO37 := 194045; +SET @GO38 := 194035; +SET @GO39 := 194049; +SET @GO40 := 194044; + +-- Horde Bonfires +SET @GO41 := 187951; +SET @GO42 := 187969; +SET @GO43 := 187956; +SET @GO44 := 187954; +SET @GO45 := 187947; +SET @GO46 := 187972; +SET @GO47 := 187964; +SET @GO48 := 187559; +SET @GO49 := 187974; +SET @GO50 := 187952; +SET @GO51 := 187950; +SET @GO52 := 187973; +SET @GO53 := 187961; +SET @GO54 := 187959; +SET @GO55 := 187965; +SET @GO56 := 187957; +SET @GO57 := 187971; +SET @GO58 := 187958; +SET @GO59 := 187968; +SET @GO60 := 187948; +SET @GO61 := 187953; +SET @GO62 := 187967; +SET @GO63 := 187970; +SET @GO64 := 187966; +SET @GO65 := 187963; +SET @GO66 := 187975; +SET @GO67 := 187955; +SET @GO68 := 187949; +SET @GO69 := 187962; +SET @GO70 := 187960; +SET @GO71 := 194039; +SET @GO72 := 194042; +SET @GO73 := 194037; +SET @GO74 := 194033; +SET @GO75 := 194048; +SET @GO76 := 194034; +SET @GO77 := 194046; +SET @GO78 := 194043; + +UPDATE `gameobject_template` SET `ScriptName` = '', `AIName` = 'SmartGameObjectAI' WHERE (`entry` IN (@GO1, @GO2, @GO3, @GO4, @GO5, @GO6, @GO7, @GO8, @GO9, @GO10, @GO11, @GO12, @GO13, @GO14, @GO15, @GO16, @GO17, @GO18, @GO19, @GO20, @GO21, @GO22, @GO23, @GO24, @GO25, @GO26, @GO27, @GO28, @GO29, @GO30, @GO31, @GO32, @GO33, @GO34, @GO35, @GO36, @GO37, @GO38, @GO39, @GO40, @GO41, @GO42, @GO43, @GO44, @GO45, @GO46, @GO47, @GO48, @GO49, @GO50, @GO51, @GO52, @GO53, @GO54, @GO55, @GO56, @GO57, @GO58, @GO59, @GO60, @GO61, @GO62, @GO63, @GO64, @GO65, @GO66, @GO67, @GO68, @GO69, @GO70, @GO71, @GO72, @GO73, @GO74, @GO75, @GO76, @GO77, @GO78)); + +DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` IN (@GO1, @GO2, @GO3, @GO4, @GO5, @GO6, @GO7, @GO8, @GO9, @GO10, @GO11, @GO12, @GO13, @GO14, @GO15, @GO16, @GO17, @GO18, @GO19, @GO20, @GO21, @GO22, @GO23, @GO24, @GO25, @GO26, @GO27, @GO28, @GO29, @GO30, @GO31, @GO32, @GO33, @GO34, @GO35, @GO36, @GO37, @GO38, @GO39, @GO40, @GO41, @GO42, @GO43, @GO44, @GO45, @GO46, @GO47, @GO48, @GO49, @GO50, @GO51, @GO52, @GO53, @GO54, @GO55, @GO56, @GO57, @GO58, @GO59, @GO60, @GO61, @GO62, @GO63, @GO64, @GO65, @GO66, @GO67, @GO68, @GO69, @GO70, @GO71, @GO72, @GO73, @GO74, @GO75, @GO76, @GO77, @GO78)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +-- Alliance Bonfires +(@GO1 , 1, 0, 1, 62, 0, 100, 0, 9411, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO2 , 1, 0, 1, 62, 0, 100, 0, 9386, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO3 , 1, 0, 1, 62, 0, 100, 0, 9392, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO4 , 1, 0, 1, 62, 0, 100, 0, 9406, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO5 , 1, 0, 1, 62, 0, 100, 0, 9400, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO6 , 1, 0, 1, 62, 0, 100, 0, 9394, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO7 , 1, 0, 1, 62, 0, 100, 0, 9388, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO8 , 1, 0, 1, 62, 0, 100, 0, 9391, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO9 , 1, 0, 1, 62, 0, 100, 0, 9398, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO10, 1, 0, 1, 62, 0, 100, 0, 9407, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO11, 1, 0, 1, 62, 0, 100, 0, 9352, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO12, 1, 0, 1, 62, 0, 100, 0, 9397, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO13, 1, 0, 1, 62, 0, 100, 0, 9404, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO14, 1, 0, 1, 62, 0, 100, 0, 9405, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO15, 1, 0, 1, 62, 0, 100, 0, 9412, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO16, 1, 0, 1, 62, 0, 100, 0, 9410, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO17, 1, 0, 1, 62, 0, 100, 0, 9395, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO18, 1, 0, 1, 62, 0, 100, 0, 9393, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO19, 1, 0, 1, 62, 0, 100, 0, 9390, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO20, 1, 0, 1, 62, 0, 100, 0, 9354, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO21, 1, 0, 1, 62, 0, 100, 0, 9389, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO22, 1, 0, 1, 62, 0, 100, 0, 9413, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO23, 1, 0, 1, 62, 0, 100, 0, 9402, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO24, 1, 0, 1, 62, 0, 100, 0, 9384, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO25, 1, 0, 1, 62, 0, 100, 0, 9401, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO26, 1, 0, 1, 62, 0, 100, 0, 9403, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO27, 1, 0, 1, 62, 0, 100, 0, 9399, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO28, 1, 0, 1, 62, 0, 100, 0, 9387, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO29, 1, 0, 1, 62, 0, 100, 0, 9396, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO30, 1, 0, 1, 62, 0, 100, 0, 9408, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO31, 1, 0, 1, 62, 0, 100, 0, 9385, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO32, 1, 0, 1, 62, 0, 100, 0, 9409, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO33, 1, 0, 1, 62, 0, 100, 0, 10234, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO34, 1, 0, 1, 62, 0, 100, 0, 10237, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO35, 1, 0, 1, 62, 0, 100, 0, 10233, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO36, 1, 0, 1, 62, 0, 100, 0, 10227, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO37, 1, 0, 1, 62, 0, 100, 0, 10240, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO38, 1, 0, 1, 62, 0, 100, 0, 10230, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO39, 1, 0, 1, 62, 0, 100, 0, 10243, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO40, 1, 0, 1, 62, 0, 100, 0, 10238, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +-- Horde Bonfires +(@GO41, 1, 0, 1, 62, 0, 100, 0, 9381, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO42, 1, 0, 1, 62, 0, 100, 0, 9372, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO43, 1, 0, 1, 62, 0, 100, 0, 9358, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO44, 1, 0, 1, 62, 0, 100, 0, 9356, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO45, 1, 0, 1, 62, 0, 100, 0, 9353, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO46, 1, 0, 1, 62, 0, 100, 0, 9375, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO47, 1, 0, 1, 62, 0, 100, 0, 9366, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO48, 1, 0, 1, 62, 0, 100, 0, 9370, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO49, 1, 0, 1, 62, 0, 100, 0, 9377, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO50, 1, 0, 1, 62, 0, 100, 0, 9382, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO51, 1, 0, 1, 62, 0, 100, 0, 9380, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO52, 1, 0, 1, 62, 0, 100, 0, 9376, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO53, 1, 0, 1, 62, 0, 100, 0, 9363, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO54, 1, 0, 1, 62, 0, 100, 0, 9361, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO55, 1, 0, 1, 62, 0, 100, 0, 9367, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO56, 1, 0, 1, 62, 0, 100, 0, 9359, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO57, 1, 0, 1, 62, 0, 100, 0, 9374, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO58, 1, 0, 1, 62, 0, 100, 0, 9360, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO59, 1, 0, 1, 62, 0, 100, 0, 9371, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO60, 1, 0, 1, 62, 0, 100, 0, 9355, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO61, 1, 0, 1, 62, 0, 100, 0, 9383, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO62, 1, 0, 1, 62, 0, 100, 0, 9369, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO63, 1, 0, 1, 62, 0, 100, 0, 9373, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO64, 1, 0, 1, 62, 0, 100, 0, 9368, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO65, 1, 0, 1, 62, 0, 100, 0, 9365, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO66, 1, 0, 1, 62, 0, 100, 0, 9378, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO67, 1, 0, 1, 62, 0, 100, 0, 9357, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO68, 1, 0, 1, 62, 0, 100, 0, 9379, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO69, 1, 0, 1, 62, 0, 100, 0, 9364, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO70, 1, 0, 1, 62, 0, 100, 0, 9362, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO71, 1, 0, 1, 62, 0, 100, 0, 10235, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO72, 1, 0, 1, 62, 0, 100, 0, 10236, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO73, 1, 0, 1, 62, 0, 100, 0, 10232, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO74, 1, 0, 1, 62, 0, 100, 0, 10228, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO75, 1, 0, 1, 62, 0, 100, 0, 10242, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO76, 1, 0, 1, 62, 0, 100, 0, 10231, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO77, 1, 0, 1, 62, 0, 100, 0, 10241, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +(@GO78, 1, 0, 1, 62, 0, 100, 0, 10239, 0, 0, 0, 0, 0, 134, 45437, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Invoker Cast \'Stamp Out Bonfire\''), +-- +(@GO1 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO2 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO3 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO4 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO5 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO6 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO7 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO8 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO9 , 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO10, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO11, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO12, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO13, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO14, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO15, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO16, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO17, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO18, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO19, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO20, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO21, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO22, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO23, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO24, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO25, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO26, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO27, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO28, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO29, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO30, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO31, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO32, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO33, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO34, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO35, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO36, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO37, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO38, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO39, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO40, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Alliance Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO41, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO42, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO43, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO44, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO45, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO46, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO47, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO48, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO49, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO50, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO51, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO52, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO53, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO54, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO55, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO56, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO57, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO58, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO59, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO60, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO61, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO62, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO63, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO64, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO65, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO66, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO67, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO68, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO69, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO70, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO71, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO72, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO73, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO74, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO75, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO76, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO77, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'), +(@GO78, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Horde Bonfire - On Gossip Option 0 Selected - Close Gossip'); diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 64ba84c21..0650c044c 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -55,20 +55,6 @@ enum eBonfire COUNT_GO_BONFIRE_CITY = 9, }; -class go_midsummer_bonfire : public GameObjectScript -{ -public: - go_midsummer_bonfire() : GameObjectScript("go_midsummer_bonfire") { } - - bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) override - { - CloseGossipMenuFor(player); - // we know that there is only one gossip. - player->CastSpell(player, SPELL_STAMP_OUT_BONFIRE, true); - return true; - } -}; - static bool BonfireStampedOutState[COUNT_GO_BONFIRE_ALLIANCE + COUNT_GO_BONFIRE_HORDE]; // , @@ -1215,7 +1201,6 @@ void AddSC_event_midsummer_scripts() new MidsummerPlayerScript(); // NPCs - new go_midsummer_bonfire(); RegisterCreatureAI(npc_midsummer_bonfire); RegisterCreatureAI(npc_midsummer_torch_target); RegisterCreatureAI(npc_midsummer_ribbon_pole_target); From e8c45a447fff79fe92268cb5f91908ee9521ab90 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 14:08:26 +0000 Subject: [PATCH 16/27] chore(DB): import pending files Referenced commit(s): 8844bcf6cf1ff1515c4cdc29ab97f59dfc99bc28 --- .../rev_1704713347931310000.sql => db_world/2024_01_14_08.sql} | 1 + .../rev_1704744571249555200.sql => db_world/2024_01_14_09.sql} | 1 + .../rev_1704746597169225900.sql => db_world/2024_01_14_10.sql} | 1 + 3 files changed, 3 insertions(+) rename data/sql/updates/{pending_db_world/rev_1704713347931310000.sql => db_world/2024_01_14_08.sql} (99%) rename data/sql/updates/{pending_db_world/rev_1704744571249555200.sql => db_world/2024_01_14_09.sql} (93%) rename data/sql/updates/{pending_db_world/rev_1704746597169225900.sql => db_world/2024_01_14_10.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1704713347931310000.sql b/data/sql/updates/db_world/2024_01_14_08.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1704713347931310000.sql rename to data/sql/updates/db_world/2024_01_14_08.sql index 97418b7fb..767dbb9f0 100644 --- a/data/sql/updates/pending_db_world/rev_1704713347931310000.sql +++ b/data/sql/updates/db_world/2024_01_14_08.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_07 -> 2024_01_14_08 -- Move GameObjectScript go_midsummer_bonfire to SAI -- Alliance Bonfires SET @GO1 := 187944; diff --git a/data/sql/updates/pending_db_world/rev_1704744571249555200.sql b/data/sql/updates/db_world/2024_01_14_09.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1704744571249555200.sql rename to data/sql/updates/db_world/2024_01_14_09.sql index ae646982e..4a2793bf4 100644 --- a/data/sql/updates/pending_db_world/rev_1704744571249555200.sql +++ b/data/sql/updates/db_world/2024_01_14_09.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_08 -> 2024_01_14_09 -- Update gameobject 180665 'Draconic for Dummies' with sniffed values DELETE FROM `gameobject` WHERE (`id` = 180665) AND (`guid` IN (268645)); INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES diff --git a/data/sql/updates/pending_db_world/rev_1704746597169225900.sql b/data/sql/updates/db_world/2024_01_14_10.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1704746597169225900.sql rename to data/sql/updates/db_world/2024_01_14_10.sql index 0d95de68f..9f6f01a7f 100644 --- a/data/sql/updates/pending_db_world/rev_1704746597169225900.sql +++ b/data/sql/updates/db_world/2024_01_14_10.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_09 -> 2024_01_14_10 -- Update gameobject 181305 'Camp Table' with sniffed values -- updated spawns DELETE FROM `gameobject` WHERE (`id` = 181305) AND (`guid` IN (150733, 150864, 150990, 151007, 151023, 17822, 17848, 21480, 50811, 50812, 50813, 50814, 50815, 50816, 50817, 50818, 50819, 50820, 50821, 50822, 50823, 50824, 50825, 50826, 50827, 50829, 50830, 50831, 50832, 50833, 50834, 50835, 50836, 50837, 50838, 50839, 50840, 50841, 50842, 50843, 50844, 50846, 50847, 50848, 50849, 70543, 70576)); From bd296db80c8958921b4afa6f3fd79bf1d7afd97c Mon Sep 17 00:00:00 2001 From: daobashun <49193927+fangshun2004@users.noreply.github.com> Date: Sun, 14 Jan 2024 22:09:04 +0800 Subject: [PATCH 17/27] fix(Scripts/IcecrownCitadel): Lich King Whispers uses localized languages (#18125) --- .../rev_1704518041243129300.sql | 62 +++++++++++++++++++ .../instance_icecrown_citadel.cpp | 19 ++++-- 2 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1704518041243129300.sql diff --git a/data/sql/updates/pending_db_world/rev_1704518041243129300.sql b/data/sql/updates/pending_db_world/rev_1704518041243129300.sql new file mode 100644 index 000000000..1f45b5d5d --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1704518041243129300.sql @@ -0,0 +1,62 @@ +-- SOULS_LICH_KING_RAND_WHISPER +-- quest "A Feast of Souls" quest id 24547 + +DELETE FROM `creature_text` WHERE `CreatureID`=37181 AND `GroupID` BETWEEN 20 AND 35; + +DELETE +FROM `creature_text` +WHERE `CreatureID`=37181 AND `GroupID`=5; + +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(37181, 5, 0, 'Take them mortal! These souls will again be mine soon enough...', 15, 0, 100, 0, 0, 17235, 37899, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 1, 'Soon, mortal, you too shall have a blade for a prison.', 15, 0, 100, 0, 0, 17236, 37900, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 2, 'Remember hero: I, too, once sought a weapon of great power...', 15, 0, 100, 0, 0, 17237, 37901, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 3, 'I see you too are gathering souls for your own ends. Are we really so different, champion?', 15, 0, 100, 0, 0, 17238, 37902, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 4, 'Yes, do it! Create your monstrous new weapon. It too will serve me when your soul is mine!', 15, 0, 100, 0, 0, 17239, 37903, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 5, 'Bring me your weapon champion and I might feed it with the souls of its master...', 15, 0, 100, 0, 0, 17240, 37904, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 6, 'Look at you, child; would-be wielder of souls... You cannot fathom the power that lies at my command.', 15, 0, 100, 0, 0, 17241, 37905, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 7, 'Come to me, pretender! Feed MY blade!', 15, 0, 100, 0, 0, 17242, 37906, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 8, 'My challenges have strengthened you champion, you shall serve me well!', 15, 0, 100, 0, 0, 17243, 37907, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 9, 'Never have I had cause to regret sparing your life, mortal. Always, you find ways to amuse me.', 15, 0, 100, 0, 0, 17244, 37908, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 10, 'The moment is soon at hand mortal. You shall toil for eternity in a new Azeroth!', 15, 0, 100, 0, 0, 17245, 37909, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 11, 'More souls, yes, more! You will find it hard to stop.', 15, 0, 100, 0, 0, 17246, 37910, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 12, 'The hunger your weapon feels is but a shade of what awaits. Do you want to see real hunger? Real power? continue onwards hero! I am waiting.', 15, 0, 100, 0, 0, 17247, 37911, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 13, 'You stumble about in darkness. There is no light here. No mercy. Icecrown has claimed the souls of better heroes than you.', 15, 0, 100, 0, 0, 17248, 37912, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 14, 'Your heart... its incessant drumming disgusts me. I will silence it, as I did my own.', 15, 0, 100, 0, 0, 17249, 37913, 0, 'A Feast of Souls Lich King (Also ICC Intro)'), +(37181, 5, 15, 'The Light will abandon you, hero, just as it did me.', 15, 0, 100, 0, 0, 17250, 37914, 0, 'A Feast of Souls Lich King (Also ICC Intro)'); + + +UPDATE `creature_text` SET `BroadcastTextId`=37027 +WHERE `CreatureID`=37119 AND `GroupID`=0 AND `ID`=0; +UPDATE `creature_text` SET `BroadcastTextId`=37105 +WHERE `CreatureID`=37503 AND `GroupID`=0 AND `ID`=0; +UPDATE `creature_text` SET `BroadcastTextId`=36129 +WHERE `CreatureID`=34996 AND `GroupID`=17 AND `ID`=0; + +-- I appear to have lost my ring. +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38227 +WHERE `MenuID`=10996 AND `OptionID`=6; +-- You must not approach the Frost Queen. Quickly, stop them! +UPDATE `creature_text` SET `BroadcastTextId`=37105 +WHERE `CreatureID`=37503 AND `GroupID`=0 AND `ID`=0; +-- +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=0; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=1; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=2; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=3; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=4; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=5; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=6; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=7; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=8; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=9; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=10; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=11; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=12; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=13; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=14; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=15; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=16; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=17; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=18; +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=38229 WHERE `MenuID`=10995 AND `OptionID`=19; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 4c7d353ab..4acfb822b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -64,6 +64,11 @@ enum Spells VOID_ZONE_VISUAL = 69422 }; +enum Say +{ + SAY_SOULS_LICH_KING_RAND_WHISPER = 5 +}; + BossBoundaryData const boundaries = { { DATA_LORD_MARROWGAR, new CircleBoundary(Position(-428.0f,2211.0f), 95.0) }, @@ -461,6 +466,9 @@ public: case NPC_THE_LICH_KING_VALITHRIA: ValithriaLichKingGUID = creature->GetGUID(); break; + case NPC_THE_LICH_KING_LH: + TheLichKingLhGUID = creature->GetGUID(); + break; case NPC_GREEN_DRAGON_COMBAT_TRIGGER: ValithriaTriggerGUID = creature->GetGUID(); break; @@ -1694,12 +1702,10 @@ public: if (Player* player = players.begin()->GetSource()) if (player->GetQuestStatus(QUEST_A_FEAST_OF_SOULS) == QUEST_STATUS_INCOMPLETE) { - uint8 id = urand(0, 15); - std::string const& text = sCreatureTextMgr->GetLocalizedChatString(NPC_THE_LICH_KING_LH, 0, 20 + id, 0, LOCALE_enUS); - WorldPacket data; - ChatHandler::BuildChatPacket(data, CHAT_MSG_MONSTER_WHISPER, LANG_UNIVERSAL, ObjectGuid::Empty, player->GetGUID(), text, CHAT_TAG_NONE, "The Lich King"); - player->PlayDirectSound(17235 + id); - player->SendDirectMessage(&data); + if (Creature* theLichKing = instance->GetCreature(TheLichKingLhGUID)) + { + theLichKing->AI()->Talk(SAY_SOULS_LICH_KING_RAND_WHISPER, player); + } } } else @@ -1981,6 +1987,7 @@ public: ObjectGuid RimefangGUID; ObjectGuid TheLichKingTeleportGUID; ObjectGuid TheLichKingGUID; + ObjectGuid TheLichKingLhGUID; ObjectGuid HighlordTirionFordringGUID; ObjectGuid TerenasMenethilGUID; ObjectGuid ArthasPlatformGUID; From c2fe9626ae4025227b73ecacf95f1f60d86147ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 14:09:17 +0000 Subject: [PATCH 18/27] chore(DB): import pending files Referenced commit(s): 8720e08da8409178938f1974b85f46f650452b07 --- .../rev_1704518041243129300.sql => db_world/2024_01_14_11.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1704518041243129300.sql => db_world/2024_01_14_11.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1704518041243129300.sql b/data/sql/updates/db_world/2024_01_14_11.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1704518041243129300.sql rename to data/sql/updates/db_world/2024_01_14_11.sql index 1f45b5d5d..05081ca14 100644 --- a/data/sql/updates/pending_db_world/rev_1704518041243129300.sql +++ b/data/sql/updates/db_world/2024_01_14_11.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_10 -> 2024_01_14_11 -- SOULS_LICH_KING_RAND_WHISPER -- quest "A Feast of Souls" quest id 24547 From c666a0c360eb9936facb914a67f0eada3295451e Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sun, 14 Jan 2024 15:09:28 +0100 Subject: [PATCH 19/27] fix(DB/Creature): Update all commoneer talking intervals to 300s (#18165) * fix(DB/Creature): Update all commoneer talking intervals to 300s * closes https://github.com/azerothcore/azerothcore-wotlk/issues/18050 * kek wrong dir --- .../sql/updates/pending_db_world/rev_1705186167693993300.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1705186167693993300.sql diff --git a/data/sql/updates/pending_db_world/rev_1705186167693993300.sql b/data/sql/updates/pending_db_world/rev_1705186167693993300.sql new file mode 100644 index 000000000..3372d206b --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1705186167693993300.sql @@ -0,0 +1,5 @@ +-- +UPDATE `smart_scripts` SET `event_param3` = 300000, `event_param4` = 300000 WHERE `entryorguid` IN (18927,19148,19172,19173,19176,19177,19178) AND `source_type` = 0 AND `id` IN (0,6,8); +UPDATE `smart_scripts` SET `event_param3` = 300000, `event_param4` = 300000 WHERE `entryorguid` IN (19169) AND `source_type` = 0 AND `id` IN (0,4,6,8); +UPDATE `smart_scripts` SET `event_param3` = 300000, `event_param4` = 300000 WHERE `entryorguid` IN (19171,19175) AND `source_type` = 0 AND `id` IN (0,5,6,8); +UPDATE `smart_scripts` SET `event_param3` = 300000, `event_param4` = 300000 WHERE `entryorguid` IN (20102) AND `source_type` = 0 AND `id` IN (0,1,6,8); From e5a130d67f43cacd1d4889168dba70b41f7e1cb7 Mon Sep 17 00:00:00 2001 From: Alethrion <54462221+Alethrion@users.noreply.github.com> Date: Sun, 14 Jan 2024 09:09:50 -0500 Subject: [PATCH 20/27] fix(Scripts/Karazhan): Add cleave and threat resets to Nightbane (#18133) * Threat_Reset_Cleave * Minor_Fix * Fix_Threat_Timing * Fix_Cleave_Targeting --- .../scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index e53e28c32..9393086c7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -26,6 +26,7 @@ enum Spells { // phase 1 SPELL_BELLOWING_ROAR = 39427, + SPELL_CLEAVE = 30131, SPELL_CHARRED_EARTH = 30129, SPELL_DISTRACTING_ASH = 30130, SPELL_SMOLDERING_BREATH = 30210, @@ -145,6 +146,10 @@ struct boss_nightbane : public BossAI { DoCastRandomTarget(SPELL_SEARING_CINDERS); context.Repeat(10s); + }).Schedule(1500ms, GROUP_GROUND, [this](TaskContext context) + { + DoCastVictim(SPELL_CLEAVE); + context.Repeat(1500ms, 45s); }); } @@ -154,6 +159,7 @@ struct boss_nightbane : public BossAI scheduler.Schedule(2s, GROUP_FLYING, [this](TaskContext) { + DoResetThreatList(); DoCastVictim(SPELL_RAIN_OF_BONES); _skeletonscheduler.Schedule(50ms, [this](TaskContext context) { @@ -320,6 +326,7 @@ struct boss_nightbane : public BossAI if (_movePhase >= 7) { me->SetDisableGravity(false); + DoResetThreatList(); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_PC); me->GetMotionMaster()->MovePoint(8, IntroWay[7][0], IntroWay[7][1], IntroWay[7][2]); From 851472fd1af8dd9809ee210c6a55fcdf9dcf76bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 14:10:09 +0000 Subject: [PATCH 21/27] chore(DB): import pending files Referenced commit(s): bd296db80c8958921b4afa6f3fd79bf1d7afd97c --- .../rev_1705186167693993300.sql => db_world/2024_01_14_12.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1705186167693993300.sql => db_world/2024_01_14_12.sql} (93%) diff --git a/data/sql/updates/pending_db_world/rev_1705186167693993300.sql b/data/sql/updates/db_world/2024_01_14_12.sql similarity index 93% rename from data/sql/updates/pending_db_world/rev_1705186167693993300.sql rename to data/sql/updates/db_world/2024_01_14_12.sql index 3372d206b..8a4f7e828 100644 --- a/data/sql/updates/pending_db_world/rev_1705186167693993300.sql +++ b/data/sql/updates/db_world/2024_01_14_12.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_11 -> 2024_01_14_12 -- UPDATE `smart_scripts` SET `event_param3` = 300000, `event_param4` = 300000 WHERE `entryorguid` IN (18927,19148,19172,19173,19176,19177,19178) AND `source_type` = 0 AND `id` IN (0,6,8); UPDATE `smart_scripts` SET `event_param3` = 300000, `event_param4` = 300000 WHERE `entryorguid` IN (19169) AND `source_type` = 0 AND `id` IN (0,4,6,8); From 390ade5d81f718b3e91fbf8f961bdc1ac02c2514 Mon Sep 17 00:00:00 2001 From: Stepan Makhorin Date: Sun, 14 Jan 2024 17:39:18 +0300 Subject: [PATCH 22/27] fix(DB/IcecrownCitadel): Fix Rotface resetting behaviour (#17878) Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com> --- data/sql/updates/pending_db_world/rev_1701079229296730800.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1701079229296730800.sql diff --git a/data/sql/updates/pending_db_world/rev_1701079229296730800.sql b/data/sql/updates/pending_db_world/rev_1701079229296730800.sql new file mode 100644 index 000000000..aec3126db --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1701079229296730800.sql @@ -0,0 +1,2 @@ +-- Rotface +UPDATE `creature_template` SET `flags_extra` = `flags_extra`|2147483648 WHERE `entry` IN (36627, 38390, 38549, 38550); From e30d904ae7c83e69ea37dd57c1ab83b926674106 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 14:40:18 +0000 Subject: [PATCH 23/27] chore(DB): import pending files Referenced commit(s): 390ade5d81f718b3e91fbf8f961bdc1ac02c2514 --- .../rev_1701079229296730800.sql => db_world/2024_01_14_13.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1701079229296730800.sql => db_world/2024_01_14_13.sql} (74%) diff --git a/data/sql/updates/pending_db_world/rev_1701079229296730800.sql b/data/sql/updates/db_world/2024_01_14_13.sql similarity index 74% rename from data/sql/updates/pending_db_world/rev_1701079229296730800.sql rename to data/sql/updates/db_world/2024_01_14_13.sql index aec3126db..a8a0d2688 100644 --- a/data/sql/updates/pending_db_world/rev_1701079229296730800.sql +++ b/data/sql/updates/db_world/2024_01_14_13.sql @@ -1,2 +1,3 @@ +-- DB update 2024_01_14_12 -> 2024_01_14_13 -- Rotface UPDATE `creature_template` SET `flags_extra` = `flags_extra`|2147483648 WHERE `entry` IN (36627, 38390, 38549, 38550); From 2c7c3b6832d9054ce47c56796917c6cc34a278cb Mon Sep 17 00:00:00 2001 From: Pedro Antonio <37176834+Valdifer@users.noreply.github.com> Date: Sun, 14 Jan 2024 18:00:53 +0100 Subject: [PATCH 24/27] fix(CORE/OPvP): Halaa Mechanics not working properly (#15634) --- .../rev_1680005777631310400.sql | 225 ++++++++++ src/server/game/Miscellaneous/Language.h | 1 + .../scripts/OutdoorPvP/OutdoorPvPNA.cpp | 404 ++++++++++++++---- src/server/scripts/OutdoorPvP/OutdoorPvPNA.h | 129 +++--- 4 files changed, 602 insertions(+), 157 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1680005777631310400.sql diff --git a/data/sql/updates/pending_db_world/rev_1680005777631310400.sql b/data/sql/updates/pending_db_world/rev_1680005777631310400.sql new file mode 100644 index 000000000..21a4c0366 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1680005777631310400.sql @@ -0,0 +1,225 @@ +-- Fire Bomb (Halaa) +DELETE FROM `spell_custom_attr` WHERE `spell_id` = 31961; +INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES +(31961, 2048); + +-- NPC CREATURE +SET @NPC := 12608; +DELETE FROM `creature` WHERE `guid` IN (@NPC+1, @NPC+2, @NPC+3, @NPC+4, @NPC+5, @NPC+6, @NPC+7, @NPC+8, @NPC+9, @NPC+10, @NPC+11, @NPC+12, @NPC+13, @NPC+14, @NPC+15, @NPC+16, @NPC+17, @NPC+18, @NPC+19, @NPC+20, @NPC+21, @NPC+22, @NPC+23, @NPC+24, @NPC+25, @NPC+26, @NPC+27, @NPC+28, @NPC+29, @NPC+30, @NPC+31, @NPC+32, @NPC+33, @NPC+34, @NPC+35, @NPC+36, @NPC+37, @NPC+38, @NPC+39, @NPC+40); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +-- HORDE +(@NPC+1, 18816, 0, 0, 530, 0, 0, 1, 1, 0, -1523.92, 7951.76, -17.6942, 3.51172, 300, 0, 0, 59130, 0, 0, 3, 4096, 0, "outdoorpvp_na_halaa_creatures", 0), +(@NPC+2, 18821, 0, 0, 530, 0, 0, 1, 1, 0, -1527.75, 7952.46, -17.6948, 3.99317, 300, 0, 0, 70965, 2790, 0, 128, 4096, 0, "", 0), +(@NPC+3, 21474, 0, 0, 530, 0, 0, 1, 1, 0, -1520.14, 7927.11, -20.2527, 3.39389, 300, 0, 0, 104790, 0, 0, 4224, 4096, 0, "", 0), +(@NPC+4, 21484, 0, 0, 530, 0, 0, 1, 1, 0, -1524.84, 7930.34, -20.182, 3.6405, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+5, 21483, 0, 0, 530, 0, 0, 1, 1, 0, -1570.01, 7993.8, -22.4505, 5.02655, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+6, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1654.06, 8000.46, -26.59, 3.37, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+7, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1487.18, 7899.1, -19.53, 0.954, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+8, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1480.88, 7908.79, -19.19, 4.485, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+9, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1540.56, 7995.44, -20.45, 0.947, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+10, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1546.95, 8000.85, -20.72, 6.035, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+11, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1595.31, 7860.53, -21.51, 3.747, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+12, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1651.54, 7988.56, -26.5289, 2.98451, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+13, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1602.46, 7866.43, -22.1177, 4.74729, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+14, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1586.58, 7932.62, -24.76, 1.00684, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+15, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1545.57, 7935.83, -21.13, 3.448, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+16, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1585.73, 7994.68, -23.29, 4.439, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+17, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1578.2544, 7942.152, -22.726915, 3.317, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 1 +(@NPC+18, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1601.5521, 7950.475, -25.48774, 1.094, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 2 +(@NPC+19, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1611.6683, 7957.6304, -27.328438, 5.567, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 3 +(@NPC+20, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1593.7784, 7988.3916, -23.511473, 4.34587, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 4 +-- ALLIANCE +(@NPC+21, 18817, 0, 0, 530, 0, 0, 1, 1, 0, -1591.18, 8020.39, -22.2042, 4.59022, 300, 0, 0, 59130, 0, 0, 3, 4096, 0, "", 0), +(@NPC+22, 18822, 0, 0, 530, 0, 0, 1, 1, 0, -1588.00, 8019.00, -22.2042, 4.06662, 300, 0, 0, 70965, 2790, 0, 128, 4096, 0, "", 0), +(@NPC+23, 21485, 0, 0, 530, 0, 0, 1, 1, 0, -1521.93, 7927.37, -20.2299, 3.24631, 300, 0, 0, 104790, 0, 0, 4224, 4096, 0, "", 0), +(@NPC+24, 21487, 0, 0, 530, 0, 0, 1, 1, 0, -1540.33, 7971.95, -20.7186, 3.07178, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+25, 21488, 0, 0, 530, 0, 0, 1, 1, 0, -1570.01, 7993.8, -22.4505, 5.02655, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+26, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1654.06, 8000.46, -26.59, 3.37, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+27, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1487.18, 7899.1, -19.53, 0.954, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+28, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1480.88, 7908.79, -19.19, 4.485, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+29, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1540.56, 7995.44, -20.45, 0.947, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+30, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1546.95, 8000.85, -20.72, 6.035, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+31, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1595.31, 7860.53, -21.51, 3.747, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+32, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1651.54, 7988.56, -26.5289, 2.98451, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+33, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1602.46, 7866.43, -22.1177, 4.74729, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+34, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1586.58, 7932.62, -24.76, 1.00684, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+35, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1545.57, 7935.83, -21.13, 3.448, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+36, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1585.73, 7994.68, -23.29, 4.439, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+37, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1578.2544, 7942.152, -22.726915, 3.317, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 1 +(@NPC+38, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1601.5521, 7950.475, -25.48774, 1.094, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 2 +(@NPC+39, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1611.6683, 7957.6304, -27.328438, 5.567, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 3 +(@NPC+40, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1593.7784, 7988.3916, -23.511473, 4.34587, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0); -- PATROL 4 + +-- HORDE +SET @NPCPAT1 := @NPC+17; +SET @PATH := @NPCPAT1 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT1; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT1,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1578.2544,7942.152,-22.726915,NULL,0,0,0,100,0), +(@PATH,2,-1604.801,7950.809,-26.352486,NULL,0,0,0,100,0), +(@PATH,3,-1618.2837,7972.56,-24.741226,NULL,0,0,0,100,0), +(@PATH,4,-1620.6606,7986.165,-24.407974,NULL,0,0,0,100,0), +(@PATH,5,-1627.0247,7987.222,-24.741226,NULL,7500,0,0,100,0), +(@PATH,6,-1616.4249,7964.83,-26.525581,NULL,0,0,0,100,0), +(@PATH,7,-1593.1031,7986.29,-23.556028,NULL,0,0,0,100,0), +(@PATH,8,-1560.4299,7990.434,-21.372875,NULL,7500,0,0,100,0), +(@PATH,9,-1563.902,7951.0166,-22.608301,NULL,0,0,0,100,0), +(@PATH,10,-1544.69,7929.014,-21.267084,NULL,7500,0,0,100,0), +(@PATH,11,-1525.14,7920.1685,-20.322586,NULL,0,0,0,100,0), +(@PATH,12,-1548.2592,7915.58,-21.267084,NULL,0,0,0,100,0), +(@PATH,13,-1561.5724,7908.538,-21.979242,NULL,0,0,0,100,0), +(@PATH,14,-1567.437,7901.1885,-21.979645,NULL,7500,0,0,100,0), +(@PATH,15,-1570.1881,7924.743,-22.589752,NULL,0,0,0,100,0); + +SET @NPCPAT2 := @NPC+18; +SET @PATH := @NPCPAT2 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT2; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT2,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1601.5521,7950.475,-25.48774,NULL,0,0,0,100,0), +(@PATH,2,-1605.7198,7958.928,-25.589912,NULL,0,0,0,100,0), +(@PATH,3,-1603.0267,7970.598,-24.292007,NULL,0,0,0,100,0), +(@PATH,4,-1597.1958,7988.6084,-23.727415,NULL,0,0,0,100,0), +(@PATH,5,-1563.0417,7984.9004,-21.805859,NULL,0,0,0,100,0), +(@PATH,6,-1552.0924,7971.6025,-21.340649,NULL,0,0,0,100,0), +(@PATH,7,-1552.6584,7939.8413,-21.864893,NULL,0,0,0,100,0), +(@PATH,8,-1559.9021,7927.2256,-21.687494,NULL,0,0,0,100,0), +(@PATH,9,-1580.1727,7940.029,-23.01732,NULL,0,0,0,100,0); + +SET @NPCPAT3 := @NPC+19; +SET @PATH := @NPCPAT3 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT3; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT3,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1611.6683,7957.6304,-27.328438,NULL,0,0,0,100,0), +(@PATH,2,-1618.0887,7983.4497,-24.41481,NULL,0,0,0,100,0), +(@PATH,3,-1643.7819,7986.462,-25.064526,NULL,0,0,0,100,0), +(@PATH,4,-1643.5465,7995.867,-25.810375,NULL,0,0,0,100,0), +(@PATH,5,-1611.7173,7997.099,-24.491226,NULL,0,0,0,100,0), +(@PATH,6,-1583.7445,7990.3584,-23.042845,NULL,0,0,0,100,0), +(@PATH,7,-1560.121,7988.5166,-21.37434,NULL,0,0,0,100,0), +(@PATH,8,-1556.1189,7971.6978,-21.897045,NULL,0,0,0,100,0), +(@PATH,9,-1549.7915,7950.7188,-21.270655,NULL,0,0,0,100,0), +(@PATH,10,-1552.4308,7934.078,-21.739405,NULL,0,0,0,100,0), +(@PATH,11,-1519.6771,7925.7915,-20.246414,NULL,0,0,0,100,0), +(@PATH,12,-1500.88,7916.9707,-19.072586,NULL,0,0,0,100,0), +(@PATH,13,-1509.5591,7915.889,-19.447586,NULL,0,0,0,100,0), +(@PATH,14,-1538.3795,7922.952,-21.060053,NULL,0,0,0,100,0), +(@PATH,15,-1562.6403,7908.5366,-21.892084,NULL,0,0,0,100,0), +(@PATH,16,-1582.8197,7893.7847,-22.548172,NULL,0,0,0,100,0), +(@PATH,17,-1598.5696,7887.1675,-24.116043,NULL,0,0,0,100,0), +(@PATH,18,-1582.957,7910.1274,-24.712067,NULL,0,0,0,100,0), +(@PATH,19,-1582.636,7940.633,-23.45592,NULL,0,0,0,100,0), +(@PATH,20,-1604.9592,7940.441,-26.098213,NULL,0,0,0,100,0), +(@PATH,21,-1631.5454,7947.5947,-35.980537,NULL,0,0,0,100,0); + +SET @NPCPAT4 := @NPC+20; +SET @PATH := @NPCPAT4 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT4; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT4,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1593.7784,7988.3916,-23.511473,NULL,0,0,0,100,0), +(@PATH,2,-1559.4581,7970.869,-22.18391,NULL,0,0,0,100,0), +(@PATH,3,-1554.2388,7945.5103,-22.054346,NULL,0,0,0,100,0), +(@PATH,4,-1564.365,7929.291,-21.630976,NULL,0,0,0,100,0), +(@PATH,5,-1586.477,7942.994,-24.06981,NULL,0,0,0,100,0), +(@PATH,6,-1614.7969,7949.1113,-29.484688,NULL,0,0,0,100,0), +(@PATH,7,-1619.6309,7963.3203,-27.734688,NULL,0,0,0,100,0), +(@PATH,8,-1607.4355,7971.2866,-24.57106,NULL,0,0,0,100,0); + +-- ALLIANCE +SET @NPCPAT5 := @NPC+37; +SET @PATH := @NPCPAT5 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT5; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT5,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1578.2544,7942.152,-22.726915,NULL,0,0,0,100,0), +(@PATH,2,-1604.801,7950.809,-26.352486,NULL,0,0,0,100,0), +(@PATH,3,-1618.2837,7972.56,-24.741226,NULL,0,0,0,100,0), +(@PATH,4,-1620.6606,7986.165,-24.407974,NULL,0,0,0,100,0), +(@PATH,5,-1627.0247,7987.222,-24.741226,NULL,7500,0,0,100,0), +(@PATH,6,-1616.4249,7964.83,-26.525581,NULL,0,0,0,100,0), +(@PATH,7,-1593.1031,7986.29,-23.556028,NULL,0,0,0,100,0), +(@PATH,8,-1560.4299,7990.434,-21.372875,NULL,7500,0,0,100,0), +(@PATH,9,-1563.902,7951.0166,-22.608301,NULL,0,0,0,100,0), +(@PATH,10,-1544.69,7929.014,-21.267084,NULL,7500,0,0,100,0), +(@PATH,11,-1525.14,7920.1685,-20.322586,NULL,0,0,0,100,0), +(@PATH,12,-1548.2592,7915.58,-21.267084,NULL,0,0,0,100,0), +(@PATH,13,-1561.5724,7908.538,-21.979242,NULL,0,0,0,100,0), +(@PATH,14,-1567.437,7901.1885,-21.979645,NULL,7500,0,0,100,0), +(@PATH,15,-1570.1881,7924.743,-22.589752,NULL,0,0,0,100,0); + +SET @NPCPAT6 := @NPC+38; +SET @PATH := @NPCPAT6 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT6; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT6,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1601.5521,7950.475,-25.48774,NULL,0,0,0,100,0), +(@PATH,2,-1605.7198,7958.928,-25.589912,NULL,0,0,0,100,0), +(@PATH,3,-1603.0267,7970.598,-24.292007,NULL,0,0,0,100,0), +(@PATH,4,-1597.1958,7988.6084,-23.727415,NULL,0,0,0,100,0), +(@PATH,5,-1563.0417,7984.9004,-21.805859,NULL,0,0,0,100,0), +(@PATH,6,-1552.0924,7971.6025,-21.340649,NULL,0,0,0,100,0), +(@PATH,7,-1552.6584,7939.8413,-21.864893,NULL,0,0,0,100,0), +(@PATH,8,-1559.9021,7927.2256,-21.687494,NULL,0,0,0,100,0), +(@PATH,9,-1580.1727,7940.029,-23.01732,NULL,0,0,0,100,0); + +SET @NPCPAT7 := @NPC+39; +SET @PATH := @NPCPAT7 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT7; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT7,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1611.6683,7957.6304,-27.328438,NULL,0,0,0,100,0), +(@PATH,2,-1618.0887,7983.4497,-24.41481,NULL,0,0,0,100,0), +(@PATH,3,-1643.7819,7986.462,-25.064526,NULL,0,0,0,100,0), +(@PATH,4,-1643.5465,7995.867,-25.810375,NULL,0,0,0,100,0), +(@PATH,5,-1611.7173,7997.099,-24.491226,NULL,0,0,0,100,0), +(@PATH,6,-1583.7445,7990.3584,-23.042845,NULL,0,0,0,100,0), +(@PATH,7,-1560.121,7988.5166,-21.37434,NULL,0,0,0,100,0), +(@PATH,8,-1556.1189,7971.6978,-21.897045,NULL,0,0,0,100,0), +(@PATH,9,-1549.7915,7950.7188,-21.270655,NULL,0,0,0,100,0), +(@PATH,10,-1552.4308,7934.078,-21.739405,NULL,0,0,0,100,0), +(@PATH,11,-1519.6771,7925.7915,-20.246414,NULL,0,0,0,100,0), +(@PATH,12,-1500.88,7916.9707,-19.072586,NULL,0,0,0,100,0), +(@PATH,13,-1509.5591,7915.889,-19.447586,NULL,0,0,0,100,0), +(@PATH,14,-1538.3795,7922.952,-21.060053,NULL,0,0,0,100,0), +(@PATH,15,-1562.6403,7908.5366,-21.892084,NULL,0,0,0,100,0), +(@PATH,16,-1582.8197,7893.7847,-22.548172,NULL,0,0,0,100,0), +(@PATH,17,-1598.5696,7887.1675,-24.116043,NULL,0,0,0,100,0), +(@PATH,18,-1582.957,7910.1274,-24.712067,NULL,0,0,0,100,0), +(@PATH,19,-1582.636,7940.633,-23.45592,NULL,0,0,0,100,0), +(@PATH,20,-1604.9592,7940.441,-26.098213,NULL,0,0,0,100,0), +(@PATH,21,-1631.5454,7947.5947,-35.980537,NULL,0,0,0,100,0); + +SET @NPCPAT8 := @NPC+40; +SET @PATH := @NPCPAT8 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT8; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT8,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1593.7784,7988.3916,-23.511473,NULL,0,0,0,100,0), +(@PATH,2,-1559.4581,7970.869,-22.18391,NULL,0,0,0,100,0), +(@PATH,3,-1554.2388,7945.5103,-22.054346,NULL,0,0,0,100,0), +(@PATH,4,-1564.365,7929.291,-21.630976,NULL,0,0,0,100,0), +(@PATH,5,-1586.477,7942.994,-24.06981,NULL,0,0,0,100,0), +(@PATH,6,-1614.7969,7949.1113,-29.484688,NULL,0,0,0,100,0), +(@PATH,7,-1619.6309,7963.3203,-27.734688,NULL,0,0,0,100,0), +(@PATH,8,-1607.4355,7971.2866,-24.57106,NULL,0,0,0,100,0); + +-- ACORE STRING +SET @ENTRY := 10074; +DELETE FROM `acore_string` WHERE `entry` = @ENTRY; +INSERT INTO `acore_string` (`entry`, `content_default`, `locale_esES`, `locale_esMX`) VALUES +(@ENTRY, 'Halaa is defenseless!', '¡Halaa está indefenso!', '¡Halaa está indefenso!'); + +-- NPC MODEL ID +UPDATE `creature_model_info` SET `DisplayID_Other_Gender` = 0 WHERE `DisplayID` IN (18254, 18255, 18256, 18257); +UPDATE `gameobject` SET `phaseMask` = 2 WHERE `guid` IN (100343, 100342, 100341); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index d69f612f0..bf1911b72 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1241,6 +1241,7 @@ enum AcoreStrings LANG_OPVP_NA_CAPTURE_A = 10026, LANG_OPVP_NA_LOSE_H = 10027, LANG_OPVP_NA_LOSE_A = 10028, + LANG_OPVP_NA_DEFENSELESS = 10074, // opvp tf LANG_OPVP_TF_CAPTURE_H = 10029, LANG_OPVP_TF_CAPTURE_A = 10030, diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index fe17a7759..a1b9cfbc2 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -17,6 +17,8 @@ #include "OutdoorPvPNA.h" #include "CreatureScript.h" +#include "GridNotifiers.h" +#include "ScriptedCreature.h" #include "GameGraveyard.h" #include "Language.h" #include "MapMgr.h" @@ -33,6 +35,43 @@ OutdoorPvPNA::OutdoorPvPNA() m_obj = nullptr; } +// SpawnIds from creatures +HalaaNPCS halaaNPCHorde; +HalaaNPCS halaaNPCAlly; + +void OutdoorPvPNA::HandleKill(Player* killer, Unit* killed) +{ + if (Group* group = killer->GetGroup()) + { + for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) + { + Player* groupGuy = itr->GetSource(); + + if (!groupGuy) + continue; + + // skip if too far away + if (!groupGuy->IsAtGroupRewardDistance(killed) && killer != groupGuy) + continue; + + // creature kills must be notified, even if not inside objective / not outdoor pvp active + // player kills only count if active and inside objective + if ((groupGuy->IsOutdoorPvPActive() && groupGuy->GetAreaId() == NA_HALAA_ZONE_ID) || killed->GetTypeId() == TYPEID_UNIT) + { + HandleKillImpl(groupGuy, killed); + } + } + } + else + { + // creature kills must be notified, even if not inside objective / not outdoor pvp active + if (killer && ((killer->IsOutdoorPvPActive() && killer->ToPlayer()->GetAreaId() == NA_HALAA_ZONE_ID) || killed->GetTypeId() == TYPEID_UNIT)) + { + HandleKillImpl(killer, killed); + } + } +} + void OutdoorPvPNA::HandleKillImpl(Player* player, Unit* killed) { if (killed->GetTypeId() == TYPEID_PLAYER && player->GetTeamId() != killed->ToPlayer()->GetTeamId()) @@ -42,40 +81,36 @@ void OutdoorPvPNA::HandleKillImpl(Player* player, Unit* killed) } } -uint32 OPvPCapturePointNA::GetAliveGuardsCount() +void UpdateCreatureHalaa(ObjectGuid::LowType spawnId, Map* map, float x, float y) { - uint32 cnt = 0; - for (auto itr = _creatures.begin(); itr != _creatures.end(); ++itr) + CreatureData& data = sObjectMgr->NewOrExistCreatureData(spawnId); + + sObjectMgr->AddCreatureToGrid(spawnId, &data); + + // Spawn if necessary (loaded grids only) + if (!map->Instanceable() && !map->IsRemovalGrid(x, y)) { - switch (itr->first) + Creature* creature = new Creature(); + if (!creature->LoadCreatureFromDB(spawnId, map, true, false, true)) { - case NA_NPC_GUARD_01: - case NA_NPC_GUARD_02: - case NA_NPC_GUARD_03: - case NA_NPC_GUARD_04: - case NA_NPC_GUARD_05: - case NA_NPC_GUARD_06: - case NA_NPC_GUARD_07: - case NA_NPC_GUARD_08: - case NA_NPC_GUARD_09: - case NA_NPC_GUARD_10: - case NA_NPC_GUARD_11: - case NA_NPC_GUARD_12: - case NA_NPC_GUARD_13: - case NA_NPC_GUARD_14: - case NA_NPC_GUARD_15: - { - auto bounds = _pvp->GetMap()->GetCreatureBySpawnIdStore().equal_range(itr->second); - for (auto itr2 = bounds.first; itr2 != bounds.second; ++itr2) - if (itr2->second->IsAlive()) - ++cnt; - break; - } - default: - break; + LOG_ERROR("sql.sql", "AddCreature: Cannot add creature spawnId {} to map", spawnId); + delete creature; + return; } } - return cnt; +} + +uint32 OPvPCapturePointNA::GetAliveGuardsCount() +{ + uint32 count = 0; + for (auto itr = _creatures.begin(); itr != _creatures.end(); ++itr) + { + auto bounds = _pvp->GetMap()->GetCreatureBySpawnIdStore().equal_range(itr->second); + for (auto itr2 = bounds.first; itr2 != bounds.second; ++itr2) + if (itr2->second->IsAlive() && (itr2->second->GetEntry() == NA_HALAANI_GUARD_A || itr2->second->GetEntry() == NA_HALAANI_GUARD_H)) + ++count; + } + return count; } TeamId OPvPCapturePointNA::GetControllingFaction() const @@ -83,23 +118,41 @@ TeamId OPvPCapturePointNA::GetControllingFaction() const return m_ControllingFaction; } -void OPvPCapturePointNA::SpawnNPCsForTeam(TeamId teamId) +void OPvPCapturePointNA::DespawnCreatures(HalaaNPCS teamNPC) { - const creature_type* creatures = nullptr; - if (teamId == TEAM_ALLIANCE) - creatures = AllianceControlNPCs; - else if (teamId == TEAM_HORDE) - creatures = HordeControlNPCs; - else - return; - for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i) - AddCreature(i, creatures[i].entry, creatures[i].map, creatures[i].x, creatures[i].y, creatures[i].z, creatures[i].o, 1000000); + for (int i = 0; i < NA_HALAA_CREATURE_TEAM_SPAWN; i++) + { + ObjectGuid::LowType spawnId = teamNPC[i]; + auto bounds = _pvp->GetMap()->GetCreatureBySpawnIdStore().equal_range(spawnId); + CreatureData const* data = sObjectMgr->GetCreatureData(spawnId); + for (auto itr = bounds.first; itr != bounds.second;) + { + // can happen when closing the core + Creature* c = itr->second; + if (c) + { + ++itr; + c->AddObjectToRemoveList(); + sObjectMgr->RemoveCreatureFromGrid(spawnId, data); + _creatures[i] = 0; + _creatureTypes[_creatures[i]] = 0; + } + } + } } -void OPvPCapturePointNA::DeSpawnNPCs() +void OPvPCapturePointNA::SpawnNPCsForTeam(HalaaNPCS teamNPC) { - for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i) - DelCreature(i); + for (int i = 0; i < NA_HALAA_CREATURE_TEAM_SPAWN; i++) + { + ObjectGuid::LowType spawnId = teamNPC[i]; + const CreatureData* data = sObjectMgr->GetCreatureData(spawnId); + if (data) { + UpdateCreatureHalaa(spawnId, _pvp->GetMap(), data->posX, data->posY); + _creatures[i] = spawnId; + _creatureTypes[_creatures[i]] = i; + } + } } void OPvPCapturePointNA::SpawnGOsForTeam(TeamId teamId) @@ -126,7 +179,7 @@ void OPvPCapturePointNA::SpawnGOsForTeam(TeamId teamId) } } -void OPvPCapturePointNA::DeSpawnGOs() +void OPvPCapturePointNA::DespawnGOs() { for (int i = 0; i < NA_CONTROL_GO_NUM; ++i) { @@ -142,16 +195,16 @@ void OPvPCapturePointNA::FactionTakeOver(TeamId teamId) sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_NA_LOSE_A)); else if (m_ControllingFaction == TEAM_HORDE) sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_NA_LOSE_H)); - + DespawnCreatures(GetControllingFaction() == TEAM_HORDE ? halaaNPCHorde : halaaNPCAlly); m_ControllingFaction = teamId; if (m_ControllingFaction != TEAM_NEUTRAL) sGraveyard->AddGraveyardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); - DeSpawnGOs(); - DeSpawnNPCs(); + DespawnGOs(); SpawnGOsForTeam(teamId); - SpawnNPCsForTeam(teamId); + SpawnNPCsForTeam(GetControllingFaction() == TEAM_HORDE ? halaaNPCHorde : halaaNPCAlly); m_GuardsAlive = NA_GUARDS_MAX; m_capturable = false; + m_canRecap = false; this->UpdateHalaaWorldState(); if (teamId == TEAM_ALLIANCE) { @@ -205,7 +258,7 @@ void OPvPCapturePointNA::HandlePlayerLeave(Player* player) OPvPCapturePointNA::OPvPCapturePointNA(OutdoorPvP* pvp) : OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFaction(TEAM_NEUTRAL), m_WyvernStateNorth(0), m_WyvernStateSouth(0), m_WyvernStateEast(0), m_WyvernStateWest(0), - m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME) + m_HalaaState(HALAA_N), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUARD_CHECK_TIME), m_canRecap(true) { SetCapturePointData(182210, 530, -1572.57f, 7945.3f, -22.475f, 2.05949f, 0.0f, 0.0f, 0.857167f, 0.515038f); } @@ -223,6 +276,10 @@ bool OutdoorPvPNA::SetupOutdoorPvP() return false; AddCapturePoint(m_obj); + //Remove linked graveyard at the server start to avoid players spawning in halaa + sGraveyard->RemoveGraveyardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, TEAM_ALLIANCE, false); + sGraveyard->RemoveGraveyardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, TEAM_HORDE, false); + return true; } @@ -335,6 +392,12 @@ bool OutdoorPvPNA::Update(uint32 diff) return m_obj->Update(diff); } +void FlagPlayerPvP(Player* player) +{ + player->SetPlayerFlag(PLAYER_FLAGS_IN_PVP); + player->UpdatePvP(true, true); +} + bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameObject* /*go*/) { std::vector nodes; @@ -346,32 +409,28 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameO nodes[0] = FlightPathStartNodes[NA_ROOST_N]; nodes[1] = FlightPathEndNodes[NA_ROOST_N]; player->ActivateTaxiPathTo(nodes); - player->SetPlayerFlag(PLAYER_FLAGS_IN_PVP); - player->UpdatePvP(true, true); + FlagPlayerPvP(player); retval = true; break; case NA_SPELL_FLY_SOUTH: nodes[0] = FlightPathStartNodes[NA_ROOST_S]; nodes[1] = FlightPathEndNodes[NA_ROOST_S]; player->ActivateTaxiPathTo(nodes); - player->SetPlayerFlag(PLAYER_FLAGS_IN_PVP); - player->UpdatePvP(true, true); + FlagPlayerPvP(player); retval = true; break; case NA_SPELL_FLY_WEST: nodes[0] = FlightPathStartNodes[NA_ROOST_W]; nodes[1] = FlightPathEndNodes[NA_ROOST_W]; player->ActivateTaxiPathTo(nodes); - player->SetPlayerFlag(PLAYER_FLAGS_IN_PVP); - player->UpdatePvP(true, true); + FlagPlayerPvP(player); retval = true; break; case NA_SPELL_FLY_EAST: nodes[0] = FlightPathStartNodes[NA_ROOST_E]; nodes[1] = FlightPathEndNodes[NA_ROOST_E]; player->ActivateTaxiPathTo(nodes); - player->SetPlayerFlag(PLAYER_FLAGS_IN_PVP); - player->UpdatePvP(true, true); + FlagPlayerPvP(player); retval = true; break; default: @@ -387,9 +446,8 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameO ItemPosCountVec dest; int32 count = 10; - uint32 itemid = 24538; // bomb id count - InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemid, count, &noSpaceForCount); + InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, NA_HALAA_BOMB, count, &noSpaceForCount); if (msg != EQUIP_ERR_OK) // convert to possible store amount count -= noSpaceForCount; @@ -398,7 +456,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player* player, uint32 spellId, GameO return true; } - Item* item = player->StoreNewItem(dest, itemid, true); + Item* item = player->StoreNewItem(dest, NA_HALAA_BOMB, true); if (count > 0 && item) { @@ -439,6 +497,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateSouth = WYVERN_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_S); + FlagPlayerPvP(player); break; case NA_DESTROYED_ROOST_N: del = NA_DESTROYED_ROOST_N; @@ -449,6 +508,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateNorth = WYVERN_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_N); + FlagPlayerPvP(player); break; case NA_DESTROYED_ROOST_W: del = NA_DESTROYED_ROOST_W; @@ -459,6 +519,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateWest = WYVERN_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_W); + FlagPlayerPvP(player); break; case NA_DESTROYED_ROOST_E: del = NA_DESTROYED_ROOST_E; @@ -469,6 +530,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateEast = WYVERN_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_E); + FlagPlayerPvP(player); break; case NA_BOMB_WAGON_S: del = NA_BOMB_WAGON_S; @@ -479,6 +541,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateSouth = WYVERN_NEU_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_S); + FlagPlayerPvP(player); break; case NA_BOMB_WAGON_N: del = NA_BOMB_WAGON_N; @@ -489,6 +552,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateNorth = WYVERN_NEU_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_N); + FlagPlayerPvP(player); break; case NA_BOMB_WAGON_W: del = NA_BOMB_WAGON_W; @@ -499,6 +563,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateWest = WYVERN_NEU_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_W); + FlagPlayerPvP(player); break; case NA_BOMB_WAGON_E: del = NA_BOMB_WAGON_E; @@ -509,6 +574,7 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) else m_WyvernStateEast = WYVERN_NEU_HORDE; UpdateWyvernRoostWorldState(NA_ROOST_E); + FlagPlayerPvP(player); break; default: return -1; @@ -534,12 +600,34 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) bool OPvPCapturePointNA::Update(uint32 diff) { - // let the controlling faction advance in phase - bool capturable = false; - if (m_ControllingFaction == TEAM_ALLIANCE && _activePlayers[0].size() > _activePlayers[1].size()) - capturable = true; - else if (m_ControllingFaction == TEAM_HORDE && _activePlayers[0].size() < _activePlayers[1].size()) - capturable = true; + if (!_capturePoint) + return false; + + float radius = ((float)_capturePoint->GetGOInfo()->capturePoint.radius); + + for (PlayerSet playerSet : _activePlayers) + { + for (ObjectGuid playerGuid : playerSet) + { + if (Player* player = ObjectAccessor::FindPlayer(playerGuid)) + if (!_capturePoint->IsWithinDistInMap(player, radius) || !player->IsOutdoorPvPActive()) + HandlePlayerLeave(player); + } + } + + std::list players; + Acore::AnyPlayerInObjectRangeCheck checker(_capturePoint, radius); + Acore::PlayerListSearcher searcher(_capturePoint, players, checker); + Cell::VisitWorldObjects(_capturePoint, searcher, radius); + + for (Player* player : players) + { + if (player->IsOutdoorPvPActive()) + { + if (_activePlayers[player->GetTeamId()].insert(player->GetGUID()).second) + HandlePlayerEnter(player); + } + } if (m_GuardCheckTimer < diff) { @@ -549,26 +637,148 @@ bool OPvPCapturePointNA::Update(uint32 diff) { m_GuardsAlive = cnt; if (m_GuardsAlive == 0) + { m_capturable = true; + m_RespawnTimer = NA_RESPAWN_TIME; + sWorld->SendZoneText(NA_HALAA_GRAVEYARD_ZONE, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_NA_DEFENSELESS)); + } + else + m_capturable = false; // update the guard count for the players in zone _pvp->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive); } } else m_GuardCheckTimer -= diff; - if (m_capturable || capturable) - { + if (m_capturable) { if (m_RespawnTimer < diff) { // if the guards have been killed, then the challenger has one hour to take over halaa. // in case they fail to do it, the guards are respawned, and they have to start again. - if (m_ControllingFaction) - FactionTakeOver(m_ControllingFaction); - m_RespawnTimer = NA_RESPAWN_TIME; + if (GetControllingFaction() == TEAM_ALLIANCE) { + _state = OBJECTIVESTATE_ALLIANCE; + _value = _maxValue; + } + else + { + _state = OBJECTIVESTATE_HORDE; + _value = -_maxValue; + } + // we reset again the artkit, map icons, sliders and respawn Halaa for controller team + SendChangePhase(); + ChangeState(); + FactionTakeOver(GetControllingFaction()); + return true; + } + else if (GetControllingFaction() != TEAM_NEUTRAL) // Don't decrease the respawn timer if the team is not HORDE or ALLIANCE + m_RespawnTimer -= diff; + + // get the difference of numbers + float factDiff = ((float)_activePlayers[0].size() - (float)_activePlayers[1].size()) * diff / OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL; + if (!factDiff) + return false; + + float maxDiff = _maxSpeed * diff; + + if (factDiff < 0) + { + // horde is in majority, but it's already horde-controlled -> no change + if (_state == OBJECTIVESTATE_HORDE && _value <= -_maxValue) + return false; + + if (factDiff < -maxDiff) + factDiff = -maxDiff; + } + else + { + // ally is in majority, but it's already ally-controlled -> no change + if (_state == OBJECTIVESTATE_ALLIANCE && _value >= _maxValue) + return false; + + if (factDiff > maxDiff) + factDiff = maxDiff; + } + + float oldValue = _value; + TeamId oldTeam = _team; + + _oldState = _state; + + _value += factDiff; + + if (_value < -_minValue) // red + { + if (_value < -_maxValue) //check if the m_value is lower than max, that means horde capped point + { + _value = -_maxValue; + _state = OBJECTIVESTATE_HORDE; + _team = TEAM_HORDE; + } + else //then point is still in battle between teams + { + if (_oldState == OBJECTIVESTATE_NEUTRAL || _oldState == OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE || _oldState == OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE) + { + _state = OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE; + } + else + { + _state = OBJECTIVESTATE_HORDE_ALLIANCE_CHALLENGE; + } + } + if (GetControllingFaction() == TEAM_ALLIANCE && !m_canRecap) + { + //When the point goes through neutral, the same faction can recapture again to respawn the guards, still need check blizzlike + m_canRecap = true; + DespawnGOs(); + DespawnCreatures(GetControllingFaction() == TEAM_HORDE ? halaaNPCHorde : halaaNPCAlly); + } + } + else //blue + { + if (_value > _maxValue) //check if the m_value is bigger than max, that means alliance capped point + { + _value = _maxValue; + _state = OBJECTIVESTATE_ALLIANCE; + _team = TEAM_ALLIANCE; + } + else //then point is still in battle between teams + { + if (_oldState == OBJECTIVESTATE_NEUTRAL || _oldState == OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE || _oldState == OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE) + { + _state = OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE; + } + else + { + _state = OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE; + } + } + if (GetControllingFaction() == TEAM_HORDE && !m_canRecap) + { + //When the point goes through neutral, the same faction can recapture again to respawn the guards, still need check blizzlike + m_canRecap = true; + DespawnGOs(); + DespawnCreatures(GetControllingFaction() == TEAM_HORDE ? halaaNPCHorde : halaaNPCAlly); + } + } + + if (_value != oldValue) + { + SendChangePhase(); + } + + if (_oldState != _state) + { + if (oldTeam != _team) + { + ChangeTeam(oldTeam); + } + ChangeState(); + return true; } - else m_RespawnTimer -= diff; } - return OPvPCapturePoint::Update(diff); + else + SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0); //Point is not capturable so we hide the slider + return false; } void OPvPCapturePointNA::ChangeState() @@ -581,12 +791,14 @@ void OPvPCapturePointNA::ChangeState() break; case OBJECTIVESTATE_ALLIANCE: m_HalaaState = HALAA_A; - FactionTakeOver(TEAM_ALLIANCE); + if(m_canRecap) + FactionTakeOver(TEAM_ALLIANCE); artkit = 2; break; case OBJECTIVESTATE_HORDE: m_HalaaState = HALAA_H; - FactionTakeOver(TEAM_HORDE); + if (m_canRecap) + FactionTakeOver(TEAM_HORDE); artkit = 1; break; case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: @@ -665,10 +877,7 @@ void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost) class OutdoorPvP_nagrand : public OutdoorPvPScript { public: - OutdoorPvP_nagrand() - : OutdoorPvPScript("outdoorpvp_na") - { - } + OutdoorPvP_nagrand() : OutdoorPvPScript("outdoorpvp_na") { } OutdoorPvP* GetOutdoorPvP() const override { @@ -676,8 +885,47 @@ public: } }; +struct outdoorpvp_na_halaa_creatures : public ScriptedAI +{ + outdoorpvp_na_halaa_creatures(Creature* creature) : ScriptedAI(creature) { } + + void UpdateAI(uint32 /*diff*/) override + { + if (halaaNPCHorde.size() != NA_HALAA_CREATURE_TEAM_SPAWN && halaaNPCAlly.size() != NA_HALAA_CREATURE_TEAM_SPAWN) + { + std::list creatures; + uint32 entry = 0; + for (int i = 0; i < NA_HALAA_CREATURES; i++) + { + me->GetCreatureListWithEntryInGrid(creatures, PatrolCreatureEntry[i].idPatrol, 250); + } + + if (creatures.size() == NA_HALAA_MAX_CREATURE_SPAWN) + { + for (std::list::iterator itr = creatures.begin(); itr != creatures.end(); ++itr) + { + Creature* const c = *itr; + if (entry < NA_HALAA_CREATURE_TEAM_SPAWN) + { + halaaNPCHorde[entry] = c->GetSpawnId(); + } + else + { + halaaNPCAlly[entry - NA_HALAA_CREATURE_TEAM_SPAWN] = c->GetSpawnId(); + } + c->AddObjectToRemoveList(); + entry++; + sObjectMgr->RemoveCreatureFromGrid(c->GetSpawnId(), c->GetCreatureData()); + } + } + } + DoMeleeAttackIfReady(); + } +}; + void AddSC_outdoorpvp_na() { new OutdoorPvP_nagrand(); + RegisterCreatureAI(outdoorpvp_na_halaa_creatures); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h index 41e1d97de..c3a9b8e25 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h @@ -40,10 +40,14 @@ const uint32 NA_HALAA_GRAVEYARD = 993; const uint32 NA_HALAA_GRAVEYARD_ZONE = 3518; // need to add zone id, not area id +uint32 const NA_HALAA_ZONE_ID = 3628; // halaa zone id + const uint32 NA_RESPAWN_TIME = 3600000; // one hour to capture after defeating all guards const uint32 NA_GUARD_CHECK_TIME = 500; // every half second +const uint32 NA_HALAA_BOMB = 24538; // Item id Bomb throwed in Halaa + enum OutdoorPvPNAWorldStates { NA_UI_HORDE_GUARDS_SHOW = 2503, @@ -116,6 +120,20 @@ enum FlightSpellsNA NA_SPELL_FLY_EAST = 32081 }; +//Npc ids from Halaa guards, Ally and Horde +enum HalaaGuardsNA +{ + NA_HALAANI_GUARD_A = 18256, + NA_HALAANI_GUARD_H = 18192 +}; + +enum HalaaCreaturesSpawn +{ + NA_HALAA_CREATURES = 12, //Quantity of creatures_templates contains HALAA + NA_HALAA_CREATURE_TEAM_SPAWN = 20, //Number of creatures by team + NA_HALAA_MAX_CREATURE_SPAWN = 40 //Number of creatures by both teams +}; + // spawned when the alliance is attacking, horde is in control const go_type HordeControlGOs[NA_CONTROL_GO_NUM] = { @@ -125,9 +143,9 @@ const go_type HordeControlGOs[NA_CONTROL_GO_NUM] = {182282, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_ROOST_EAST {182222, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //HORDE_BOMB_WAGON_SOUTH - {182272, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_BOMB_WAGON_WEST - {182273, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_BOMB_WAGON_NORTH - {182274, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_BOMB_WAGON_EAST + {182272, 530, -1517.44f, 8140.24f, -20.17f, -2.8099f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //HORDE_BOMB_WAGON_WEST + {182273, 530, -1389.53f, 7782.50f, -11.62f, -1.5184f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //HORDE_BOMB_WAGON_NORTH + {182274, 530, -1662.28f, 7735.00f, -15.96f, 1.8845f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_BOMB_WAGON_EAST {182266, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_ALLY_ROOST_SOUTH {182275, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_ALLY_ROOST_WEST @@ -144,9 +162,9 @@ const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] = {182304, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //HORDE_ROOST_EAST {182305, 530, -1825.4022f, 8039.2602f, -26.08f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //ALLY_BOMB_WAGON_SOUTH - {182306, 530, -1515.37f, 8136.91f, -20.42f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_BOMB_WAGON_WEST - {182307, 530, -1377.95f, 7773.44f, -10.31f, -0.575959f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_BOMB_WAGON_NORTH - {182308, 530, -1659.87f, 7733.15f, -15.75f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_BOMB_WAGON_EAST + {182306, 530, -1517.44f, 8140.24f, -20.17f, -2.8099f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //ALLY_BOMB_WAGON_WEST + {182307, 530, -1389.53f, 7782.50f, -11.62f, -1.5184f, 0.0f, 0.0f, 0.284015f, -0.95882f}, //ALLY_BOMB_WAGON_NORTH + {182308, 530, -1662.28f, 7735.00f, -15.96f, 1.8845f, 0.0f, 0.0f, 0.986286f, -0.165048f}, //ALLY_BOMB_WAGON_EAST {182297, 530, -1815.8f, 8036.51f, -26.2354f, -2.89725f, 0.0f, 0.0f, 0.992546f, -0.121869f}, //DESTROYED_HORDE_ROOST_SOUTH {182298, 530, -1507.95f, 8132.1f, -19.5585f, -1.3439f, 0.0f, 0.0f, 0.622515f, -0.782608f}, //DESTROYED_HORDE_ROOST_WEST @@ -154,79 +172,27 @@ const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] = {182300, 530, -1650.11f, 7732.56f, -15.4505f, -2.80998f, 0.0f, 0.0f, 0.986286f, -0.165048f} //DESTROYED_HORDE_ROOST_EAST }; -enum ControlNPCTypes +struct HalaaIds { - NA_NPC_RESEARCHER = 0, - NA_NPC_QUARTERMASTER, - NA_NPC_BLADE_MERCHANT, - NA_NPC_FOOD_MERCHANT, - NA_NPC_AMMO, - - NA_NPC_GUARD_01, - NA_NPC_GUARD_02, - NA_NPC_GUARD_03, - NA_NPC_GUARD_04, - NA_NPC_GUARD_05, - NA_NPC_GUARD_06, - NA_NPC_GUARD_07, - NA_NPC_GUARD_08, - NA_NPC_GUARD_09, - NA_NPC_GUARD_10, - NA_NPC_GUARD_11, - NA_NPC_GUARD_12, - NA_NPC_GUARD_13, - NA_NPC_GUARD_14, - NA_NPC_GUARD_15, - - NA_CONTROL_NPC_NUM + uint32 idPatrol; }; -const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] = +const HalaaIds PatrolCreatureEntry[NA_HALAA_CREATURES] = { - {18816, 530, -1523.92f, 7951.76f, -17.6942f, 3.51172f}, - {18821, 530, -1527.75f, 7952.46f, -17.6948f, 3.99317f}, - {21474, 530, -1520.14f, 7927.11f, -20.2527f, 3.39389f}, - {21484, 530, -1524.84f, 7930.34f, -20.182f, 3.6405f}, - {21483, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f}, - {18192, 530, -1654.06f, 8000.46f, -26.59f, 3.37f}, - {18192, 530, -1487.18f, 7899.1f, -19.53f, 0.954f}, - {18192, 530, -1480.88f, 7908.79f, -19.19f, 4.485f}, - {18192, 530, -1540.56f, 7995.44f, -20.45f, 0.947f}, - {18192, 530, -1546.95f, 8000.85f, -20.72f, 6.035f}, - {18192, 530, -1595.31f, 7860.53f, -21.51f, 3.747f}, - {18192, 530, -1642.31f, 7995.59f, -25.8f, 3.317f}, - {18192, 530, -1545.46f, 7995.35f, -20.63f, 1.094f}, - {18192, 530, -1487.58f, 7907.99f, -19.27f, 5.567f}, - {18192, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f}, - {18192, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f}, - {18192, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f}, - {18192, 530, -1550.6f, 7944.45f, -21.63f, 3.559f}, - {18192, 530, -1545.57f, 7935.83f, -21.13f, 3.448f}, - {18192, 530, -1550.86f, 7937.56f, -21.7f, 3.801f} -}; - -const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] = -{ - {18817, 530, -1591.18f, 8020.39f, -22.2042f, 4.59022f}, - {18822, 530, -1588.0f, 8019.0f, -22.2042f, 4.06662f}, - {21485, 530, -1521.93f, 7927.37f, -20.2299f, 3.24631f}, - {21487, 530, -1540.33f, 7971.95f, -20.7186f, 3.07178f}, - {21488, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f}, - {18256, 530, -1654.06f, 8000.46f, -26.59f, 3.37f}, - {18256, 530, -1487.18f, 7899.1f, -19.53f, 0.954f}, - {18256, 530, -1480.88f, 7908.79f, -19.19f, 4.485f}, - {18256, 530, -1540.56f, 7995.44f, -20.45f, 0.947f}, - {18256, 530, -1546.95f, 8000.85f, -20.72f, 6.035f}, - {18256, 530, -1595.31f, 7860.53f, -21.51f, 3.747f}, - {18256, 530, -1642.31f, 7995.59f, -25.8f, 3.317f}, - {18256, 530, -1545.46f, 7995.35f, -20.63f, 1.094f}, - {18256, 530, -1487.58f, 7907.99f, -19.27f, 5.567f}, - {18256, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f}, - {18256, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f}, - {18256, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f}, - {18256, 530, -1603.75f, 8000.36f, -24.18f, 4.516f}, - {18256, 530, -1585.73f, 7994.68f, -23.29f, 4.439f}, - {18256, 530, -1595.5f, 7991.27f, -23.53f, 4.738f} + // Horde + {18192}, + {18816}, + {18821}, + {21474}, + {21484}, + {21483}, + // Ally + {18256}, + {18817}, + {18822}, + {21485}, + {21487}, + {21488} }; enum WyvernStates @@ -246,6 +212,8 @@ enum HalaaStates HALAA_H = 16 }; +typedef std::map HalaaNPCS; + class Unit; class Creature; class OutdoorPvPNA; @@ -278,15 +246,14 @@ protected: // called when a faction takes control void FactionTakeOver(TeamId teamId); - void DeSpawnNPCs(); - void DeSpawnGOs(); + void DespawnGOs(); + void DespawnCreatures(HalaaNPCS teamNPC); - void SpawnNPCsForTeam(TeamId teamId); + void SpawnNPCsForTeam(HalaaNPCS teamNPC); void SpawnGOsForTeam(TeamId teamId); void UpdateWyvernRoostWorldState(uint32 roost); void UpdateHalaaWorldState(); - private: bool m_capturable; @@ -304,6 +271,8 @@ private: uint32 m_RespawnTimer; uint32 m_GuardCheckTimer; + + bool m_canRecap; }; class OutdoorPvPNA : public OutdoorPvP @@ -322,6 +291,8 @@ public: void SendRemoveWorldStates(Player* player) override; + void HandleKill(Player* killer, Unit* killed) override; + void HandleKillImpl(Player* player, Unit* killed) override; OPvPCapturePointNA* GetCapturePoint() { return m_obj; } From 707df272332383f8f2008f236675ec5e6d4af173 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 14 Jan 2024 17:01:56 +0000 Subject: [PATCH 25/27] chore(DB): import pending files Referenced commit(s): 2c7c3b6832d9054ce47c56796917c6cc34a278cb --- .../rev_1680005777631310400.sql => db_world/2024_01_14_14.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1680005777631310400.sql => db_world/2024_01_14_14.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1680005777631310400.sql b/data/sql/updates/db_world/2024_01_14_14.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1680005777631310400.sql rename to data/sql/updates/db_world/2024_01_14_14.sql index 21a4c0366..10249768d 100644 --- a/data/sql/updates/pending_db_world/rev_1680005777631310400.sql +++ b/data/sql/updates/db_world/2024_01_14_14.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_13 -> 2024_01_14_14 -- Fire Bomb (Halaa) DELETE FROM `spell_custom_attr` WHERE `spell_id` = 31961; INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES From 139e4ebafdc24f1569323c591c16018fdd2ac039 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sun, 14 Jan 2024 21:16:01 -0300 Subject: [PATCH 26/27] chore(DB/Creature): fix guid conflicts (#18170) * chore(DB/Creature): fix guid conflicts * Update rev_1705256343927806600.sql --- .../rev_1705256343927806600.sql | 285 ++++++++++++++++++ 1 file changed, 285 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1705256343927806600.sql diff --git a/data/sql/updates/pending_db_world/rev_1705256343927806600.sql b/data/sql/updates/pending_db_world/rev_1705256343927806600.sql new file mode 100644 index 000000000..e9a95a12f --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1705256343927806600.sql @@ -0,0 +1,285 @@ +-- +-- Respawn event stuff +DELETE FROM `creature` WHERE (`guid` BETWEEN 12608 AND 12634); +INSERT INTO `creature` (`guid`, `id1`, `map`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES +(12608, 17066, 1, 1, 1, 0, -2341.328369140625, -609.37188720703125, -1.23249447345733642, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12609, 17066, 1, 1, 1, 0, -4408.1005859375, 3457.973876953125, 19.87622451782226562, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12610, 17066, 1, 1, 1, 0, 6841.91259765625, -4747.44873046875, 704.52764892578125, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12611, 17066, 530, 1, 1, 0, -2228.1376953125, -11913.7509765625, 33.3137664794921875, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12612, 17066, 530, 1, 1, 0, -2500.70751953125, 7531.5947265625, 5.473018646240234375, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12613, 17066, 530, 1, 1, 0, -2989.27783203125, 4133.04833984375, 11.10697269439697265, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12614, 17066, 530, 1, 1, 0, -3047.742431640625, 2396.586669921875, 67.762176513671875, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12615, 17066, 530, 1, 1, 0, -3964.704833984375, 2039.7154541015625, 101.6481781005859375, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12616, 17066, 530, 1, 1, 0, 193.94659423828125, 5989.46484375, 29.59563446044921875, 1.396261811256408691, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12617, 17066, 530, 1, 1, 0, 2915.1640625, 3667.26904296875, 151.4516754150390625, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12618, 17066, 530, 1, 1, 0, 3117.686767578125, 3717.24267578125, 151.7102203369140625, 1.396261811256408691, 120, 0, 0, 0, 0, 0, "", 50063, 1, NULL), +(12619, 17066, 571, 1, 1, 0, 2457.75390625, -4908.34228515625, 270.18450927734375, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12620, 17066, 571, 1, 1, 0, 2602.76123046875, -4345.568359375, 282.1177978515625, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12621, 17066, 571, 1, 1, 0, 3372.2763671875, -2142.5859375, 131.0043487548828125, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12622, 17066, 571, 1, 1, 0, 3416.26953125, -2886.619384765625, 207.650115966796875, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12623, 17066, 571, 1, 1, 0, 3765.475341796875, 1499.2310791015625, 96.54422760009765625, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12624, 17066, 571, 1, 1, 0, 3945.282958984375, -618.0919189453125, 248.3398895263671875, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12625, 17066, 571, 1, 1, 0, 4147.365234375, 5396.94970703125, 32.92293930053710937, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12626, 17066, 571, 1, 1, 0, 4470.3544921875, 5618.95166015625, 64.74526214599609375, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12627, 17066, 571, 1, 1, 0, 5129.818359375, -697.729736328125, 179.3615570068359375, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12628, 17066, 571, 1, 1, 0, 5275.400390625, -2782.26513671875, 298.654632568359375, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12629, 17066, 571, 1, 1, 0, 5352.6953125, 4859.31787109375, -184.644317626953125, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12630, 17066, 571, 1, 1, 0, 5511.4013671875, 4862.28271484375, -191.716720581054687, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12631, 17066, 571, 1, 1, 0, 5529.40966796875, -715.3424072265625, 155.7472686767578125, 2.67034769058227539, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12632, 17066, 571, 1, 1, 0, 5612.38232421875, -2623.00146484375, 298.8907470703125, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12633, 17066, 571, 1, 1, 0, 6073.1845703125, -1122.8199462890625, 427.209716796875, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL), +(12634, 17066, 571, 1, 1, 0, 6163.2705078125, -1033.99853515625, 415.8297119140625, 5.777040958404541015, 120, 0, 0, 0, 0, 0, "", 50172, 1, NULL); + +-- HORDE +SET @NPC := 12608; +SET @NPCPAT1 := @NPC+17; +SET @PATH := @NPCPAT1 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT1; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +SET @NPCPAT2 := @NPC+18; +SET @PATH := @NPCPAT2 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT2; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +SET @NPCPAT3 := @NPC+19; +SET @PATH := @NPCPAT3 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT3; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +SET @NPCPAT4 := @NPC+20; +SET @PATH := @NPCPAT4 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT4; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +-- ALLIANCE +SET @NPCPAT5 := @NPC+37; +SET @PATH := @NPCPAT5 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT5; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +SET @NPCPAT6 := @NPC+38; +SET @PATH := @NPCPAT6 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT6; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +SET @NPCPAT7 := @NPC+39; +SET @PATH := @NPCPAT7 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT7; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +SET @NPCPAT8 := @NPC+40; +SET @PATH := @NPCPAT8 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT8; +DELETE FROM `waypoint_data` WHERE `id`=@PATH; + +-- Respawn Halaa stuff +SET @NPC := 12410; +DELETE FROM `creature` WHERE `guid` IN (@NPC+1, @NPC+2, @NPC+3, @NPC+4, @NPC+5, @NPC+6, @NPC+7, @NPC+8, @NPC+9, @NPC+10, @NPC+11, @NPC+12, @NPC+13, @NPC+14, @NPC+15, @NPC+16, @NPC+17, @NPC+18, @NPC+19, @NPC+20, @NPC+21, @NPC+22, @NPC+23, @NPC+24, @NPC+25, @NPC+26, @NPC+27, @NPC+28, @NPC+29, @NPC+30, @NPC+31, @NPC+32, @NPC+33, @NPC+34, @NPC+35, @NPC+36, @NPC+37, @NPC+38, @NPC+39, @NPC+40); +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +-- HORDE +(@NPC+1, 18816, 0, 0, 530, 0, 0, 1, 1, 0, -1523.92, 7951.76, -17.6942, 3.51172, 300, 0, 0, 59130, 0, 0, 3, 4096, 0, "outdoorpvp_na_halaa_creatures", 0), +(@NPC+2, 18821, 0, 0, 530, 0, 0, 1, 1, 0, -1527.75, 7952.46, -17.6948, 3.99317, 300, 0, 0, 70965, 2790, 0, 128, 4096, 0, "", 0), +(@NPC+3, 21474, 0, 0, 530, 0, 0, 1, 1, 0, -1520.14, 7927.11, -20.2527, 3.39389, 300, 0, 0, 104790, 0, 0, 4224, 4096, 0, "", 0), +(@NPC+4, 21484, 0, 0, 530, 0, 0, 1, 1, 0, -1524.84, 7930.34, -20.182, 3.6405, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+5, 21483, 0, 0, 530, 0, 0, 1, 1, 0, -1570.01, 7993.8, -22.4505, 5.02655, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+6, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1654.06, 8000.46, -26.59, 3.37, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+7, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1487.18, 7899.1, -19.53, 0.954, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+8, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1480.88, 7908.79, -19.19, 4.485, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+9, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1540.56, 7995.44, -20.45, 0.947, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+10, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1546.95, 8000.85, -20.72, 6.035, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+11, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1595.31, 7860.53, -21.51, 3.747, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+12, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1651.54, 7988.56, -26.5289, 2.98451, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+13, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1602.46, 7866.43, -22.1177, 4.74729, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+14, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1586.58, 7932.62, -24.76, 1.00684, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+15, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1545.57, 7935.83, -21.13, 3.448, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+16, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1585.73, 7994.68, -23.29, 4.439, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+17, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1578.2544, 7942.152, -22.726915, 3.317, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 1 +(@NPC+18, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1601.5521, 7950.475, -25.48774, 1.094, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 2 +(@NPC+19, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1611.6683, 7957.6304, -27.328438, 5.567, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 3 +(@NPC+20, 18192, 0, 0, 530, 0, 0, 1, 1, 0, -1593.7784, 7988.3916, -23.511473, 4.34587, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 4 +-- ALLIANCE +(@NPC+21, 18817, 0, 0, 530, 0, 0, 1, 1, 0, -1591.18, 8020.39, -22.2042, 4.59022, 300, 0, 0, 59130, 0, 0, 3, 4096, 0, "", 0), +(@NPC+22, 18822, 0, 0, 530, 0, 0, 1, 1, 0, -1588.00, 8019.00, -22.2042, 4.06662, 300, 0, 0, 70965, 2790, 0, 128, 4096, 0, "", 0), +(@NPC+23, 21485, 0, 0, 530, 0, 0, 1, 1, 0, -1521.93, 7927.37, -20.2299, 3.24631, 300, 0, 0, 104790, 0, 0, 4224, 4096, 0, "", 0), +(@NPC+24, 21487, 0, 0, 530, 0, 0, 1, 1, 0, -1540.33, 7971.95, -20.7186, 3.07178, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+25, 21488, 0, 0, 530, 0, 0, 1, 1, 0, -1570.01, 7993.8, -22.4505, 5.02655, 300, 0, 0, 104790, 0, 0, 128, 4096, 0, "", 0), +(@NPC+26, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1654.06, 8000.46, -26.59, 3.37, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+27, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1487.18, 7899.1, -19.53, 0.954, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+28, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1480.88, 7908.79, -19.19, 4.485, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+29, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1540.56, 7995.44, -20.45, 0.947, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+30, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1546.95, 8000.85, -20.72, 6.035, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+31, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1595.31, 7860.53, -21.51, 3.747, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+32, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1651.54, 7988.56, -26.5289, 2.98451, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+33, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1602.46, 7866.43, -22.1177, 4.74729, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+34, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1586.58, 7932.62, -24.76, 1.00684, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+35, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1545.57, 7935.83, -21.13, 3.448, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+36, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1585.73, 7994.68, -23.29, 4.439, 3600, 0, 0, 1182800, 0, 0, 0, 4096, 0, "", 0), +(@NPC+37, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1578.2544, 7942.152, -22.726915, 3.317, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 1 +(@NPC+38, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1601.5521, 7950.475, -25.48774, 1.094, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 2 +(@NPC+39, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1611.6683, 7957.6304, -27.328438, 5.567, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0), -- PATROL 3 +(@NPC+40, 18256, 0, 0, 530, 0, 0, 1, 1, 0, -1593.7784, 7988.3916, -23.511473, 4.34587, 3600, 0, 0, 1182800, 0, 2, 0, 4096, 0, "", 0); -- PATROL 4 + +-- HORDE +SET @NPCPAT1 := @NPC+17; +SET @PATH := @NPCPAT1 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT1; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT1,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1578.2544,7942.152,-22.726915,NULL,0,0,0,100,0), +(@PATH,2,-1604.801,7950.809,-26.352486,NULL,0,0,0,100,0), +(@PATH,3,-1618.2837,7972.56,-24.741226,NULL,0,0,0,100,0), +(@PATH,4,-1620.6606,7986.165,-24.407974,NULL,0,0,0,100,0), +(@PATH,5,-1627.0247,7987.222,-24.741226,NULL,7500,0,0,100,0), +(@PATH,6,-1616.4249,7964.83,-26.525581,NULL,0,0,0,100,0), +(@PATH,7,-1593.1031,7986.29,-23.556028,NULL,0,0,0,100,0), +(@PATH,8,-1560.4299,7990.434,-21.372875,NULL,7500,0,0,100,0), +(@PATH,9,-1563.902,7951.0166,-22.608301,NULL,0,0,0,100,0), +(@PATH,10,-1544.69,7929.014,-21.267084,NULL,7500,0,0,100,0), +(@PATH,11,-1525.14,7920.1685,-20.322586,NULL,0,0,0,100,0), +(@PATH,12,-1548.2592,7915.58,-21.267084,NULL,0,0,0,100,0), +(@PATH,13,-1561.5724,7908.538,-21.979242,NULL,0,0,0,100,0), +(@PATH,14,-1567.437,7901.1885,-21.979645,NULL,7500,0,0,100,0), +(@PATH,15,-1570.1881,7924.743,-22.589752,NULL,0,0,0,100,0); + +SET @NPCPAT2 := @NPC+18; +SET @PATH := @NPCPAT2 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT2; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT2,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1601.5521,7950.475,-25.48774,NULL,0,0,0,100,0), +(@PATH,2,-1605.7198,7958.928,-25.589912,NULL,0,0,0,100,0), +(@PATH,3,-1603.0267,7970.598,-24.292007,NULL,0,0,0,100,0), +(@PATH,4,-1597.1958,7988.6084,-23.727415,NULL,0,0,0,100,0), +(@PATH,5,-1563.0417,7984.9004,-21.805859,NULL,0,0,0,100,0), +(@PATH,6,-1552.0924,7971.6025,-21.340649,NULL,0,0,0,100,0), +(@PATH,7,-1552.6584,7939.8413,-21.864893,NULL,0,0,0,100,0), +(@PATH,8,-1559.9021,7927.2256,-21.687494,NULL,0,0,0,100,0), +(@PATH,9,-1580.1727,7940.029,-23.01732,NULL,0,0,0,100,0); + +SET @NPCPAT3 := @NPC+19; +SET @PATH := @NPCPAT3 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT3; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT3,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1611.6683,7957.6304,-27.328438,NULL,0,0,0,100,0), +(@PATH,2,-1618.0887,7983.4497,-24.41481,NULL,0,0,0,100,0), +(@PATH,3,-1643.7819,7986.462,-25.064526,NULL,0,0,0,100,0), +(@PATH,4,-1643.5465,7995.867,-25.810375,NULL,0,0,0,100,0), +(@PATH,5,-1611.7173,7997.099,-24.491226,NULL,0,0,0,100,0), +(@PATH,6,-1583.7445,7990.3584,-23.042845,NULL,0,0,0,100,0), +(@PATH,7,-1560.121,7988.5166,-21.37434,NULL,0,0,0,100,0), +(@PATH,8,-1556.1189,7971.6978,-21.897045,NULL,0,0,0,100,0), +(@PATH,9,-1549.7915,7950.7188,-21.270655,NULL,0,0,0,100,0), +(@PATH,10,-1552.4308,7934.078,-21.739405,NULL,0,0,0,100,0), +(@PATH,11,-1519.6771,7925.7915,-20.246414,NULL,0,0,0,100,0), +(@PATH,12,-1500.88,7916.9707,-19.072586,NULL,0,0,0,100,0), +(@PATH,13,-1509.5591,7915.889,-19.447586,NULL,0,0,0,100,0), +(@PATH,14,-1538.3795,7922.952,-21.060053,NULL,0,0,0,100,0), +(@PATH,15,-1562.6403,7908.5366,-21.892084,NULL,0,0,0,100,0), +(@PATH,16,-1582.8197,7893.7847,-22.548172,NULL,0,0,0,100,0), +(@PATH,17,-1598.5696,7887.1675,-24.116043,NULL,0,0,0,100,0), +(@PATH,18,-1582.957,7910.1274,-24.712067,NULL,0,0,0,100,0), +(@PATH,19,-1582.636,7940.633,-23.45592,NULL,0,0,0,100,0), +(@PATH,20,-1604.9592,7940.441,-26.098213,NULL,0,0,0,100,0), +(@PATH,21,-1631.5454,7947.5947,-35.980537,NULL,0,0,0,100,0); + +SET @NPCPAT4 := @NPC+20; +SET @PATH := @NPCPAT4 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT4; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT4,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1593.7784,7988.3916,-23.511473,NULL,0,0,0,100,0), +(@PATH,2,-1559.4581,7970.869,-22.18391,NULL,0,0,0,100,0), +(@PATH,3,-1554.2388,7945.5103,-22.054346,NULL,0,0,0,100,0), +(@PATH,4,-1564.365,7929.291,-21.630976,NULL,0,0,0,100,0), +(@PATH,5,-1586.477,7942.994,-24.06981,NULL,0,0,0,100,0), +(@PATH,6,-1614.7969,7949.1113,-29.484688,NULL,0,0,0,100,0), +(@PATH,7,-1619.6309,7963.3203,-27.734688,NULL,0,0,0,100,0), +(@PATH,8,-1607.4355,7971.2866,-24.57106,NULL,0,0,0,100,0); + +-- ALLIANCE +SET @NPCPAT5 := @NPC+37; +SET @PATH := @NPCPAT5 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT5; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT5,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1578.2544,7942.152,-22.726915,NULL,0,0,0,100,0), +(@PATH,2,-1604.801,7950.809,-26.352486,NULL,0,0,0,100,0), +(@PATH,3,-1618.2837,7972.56,-24.741226,NULL,0,0,0,100,0), +(@PATH,4,-1620.6606,7986.165,-24.407974,NULL,0,0,0,100,0), +(@PATH,5,-1627.0247,7987.222,-24.741226,NULL,7500,0,0,100,0), +(@PATH,6,-1616.4249,7964.83,-26.525581,NULL,0,0,0,100,0), +(@PATH,7,-1593.1031,7986.29,-23.556028,NULL,0,0,0,100,0), +(@PATH,8,-1560.4299,7990.434,-21.372875,NULL,7500,0,0,100,0), +(@PATH,9,-1563.902,7951.0166,-22.608301,NULL,0,0,0,100,0), +(@PATH,10,-1544.69,7929.014,-21.267084,NULL,7500,0,0,100,0), +(@PATH,11,-1525.14,7920.1685,-20.322586,NULL,0,0,0,100,0), +(@PATH,12,-1548.2592,7915.58,-21.267084,NULL,0,0,0,100,0), +(@PATH,13,-1561.5724,7908.538,-21.979242,NULL,0,0,0,100,0), +(@PATH,14,-1567.437,7901.1885,-21.979645,NULL,7500,0,0,100,0), +(@PATH,15,-1570.1881,7924.743,-22.589752,NULL,0,0,0,100,0); + +SET @NPCPAT6 := @NPC+38; +SET @PATH := @NPCPAT6 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT6; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT6,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1601.5521,7950.475,-25.48774,NULL,0,0,0,100,0), +(@PATH,2,-1605.7198,7958.928,-25.589912,NULL,0,0,0,100,0), +(@PATH,3,-1603.0267,7970.598,-24.292007,NULL,0,0,0,100,0), +(@PATH,4,-1597.1958,7988.6084,-23.727415,NULL,0,0,0,100,0), +(@PATH,5,-1563.0417,7984.9004,-21.805859,NULL,0,0,0,100,0), +(@PATH,6,-1552.0924,7971.6025,-21.340649,NULL,0,0,0,100,0), +(@PATH,7,-1552.6584,7939.8413,-21.864893,NULL,0,0,0,100,0), +(@PATH,8,-1559.9021,7927.2256,-21.687494,NULL,0,0,0,100,0), +(@PATH,9,-1580.1727,7940.029,-23.01732,NULL,0,0,0,100,0); + +SET @NPCPAT7 := @NPC+39; +SET @PATH := @NPCPAT7 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT7; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT7,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1611.6683,7957.6304,-27.328438,NULL,0,0,0,100,0), +(@PATH,2,-1618.0887,7983.4497,-24.41481,NULL,0,0,0,100,0), +(@PATH,3,-1643.7819,7986.462,-25.064526,NULL,0,0,0,100,0), +(@PATH,4,-1643.5465,7995.867,-25.810375,NULL,0,0,0,100,0), +(@PATH,5,-1611.7173,7997.099,-24.491226,NULL,0,0,0,100,0), +(@PATH,6,-1583.7445,7990.3584,-23.042845,NULL,0,0,0,100,0), +(@PATH,7,-1560.121,7988.5166,-21.37434,NULL,0,0,0,100,0), +(@PATH,8,-1556.1189,7971.6978,-21.897045,NULL,0,0,0,100,0), +(@PATH,9,-1549.7915,7950.7188,-21.270655,NULL,0,0,0,100,0), +(@PATH,10,-1552.4308,7934.078,-21.739405,NULL,0,0,0,100,0), +(@PATH,11,-1519.6771,7925.7915,-20.246414,NULL,0,0,0,100,0), +(@PATH,12,-1500.88,7916.9707,-19.072586,NULL,0,0,0,100,0), +(@PATH,13,-1509.5591,7915.889,-19.447586,NULL,0,0,0,100,0), +(@PATH,14,-1538.3795,7922.952,-21.060053,NULL,0,0,0,100,0), +(@PATH,15,-1562.6403,7908.5366,-21.892084,NULL,0,0,0,100,0), +(@PATH,16,-1582.8197,7893.7847,-22.548172,NULL,0,0,0,100,0), +(@PATH,17,-1598.5696,7887.1675,-24.116043,NULL,0,0,0,100,0), +(@PATH,18,-1582.957,7910.1274,-24.712067,NULL,0,0,0,100,0), +(@PATH,19,-1582.636,7940.633,-23.45592,NULL,0,0,0,100,0), +(@PATH,20,-1604.9592,7940.441,-26.098213,NULL,0,0,0,100,0), +(@PATH,21,-1631.5454,7947.5947,-35.980537,NULL,0,0,0,100,0); + +SET @NPCPAT8 := @NPC+40; +SET @PATH := @NPCPAT8 * 10; +DELETE FROM `creature_addon` WHERE `guid`=@NPCPAT8; +INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES (@NPCPAT8,@PATH,0,0,1,0,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-1593.7784,7988.3916,-23.511473,NULL,0,0,0,100,0), +(@PATH,2,-1559.4581,7970.869,-22.18391,NULL,0,0,0,100,0), +(@PATH,3,-1554.2388,7945.5103,-22.054346,NULL,0,0,0,100,0), +(@PATH,4,-1564.365,7929.291,-21.630976,NULL,0,0,0,100,0), +(@PATH,5,-1586.477,7942.994,-24.06981,NULL,0,0,0,100,0), +(@PATH,6,-1614.7969,7949.1113,-29.484688,NULL,0,0,0,100,0), +(@PATH,7,-1619.6309,7963.3203,-27.734688,NULL,0,0,0,100,0), +(@PATH,8,-1607.4355,7971.2866,-24.57106,NULL,0,0,0,100,0); From a5cd23fa5b4b1db11a3848d5ac4a87e3c53b738e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 15 Jan 2024 00:17:05 +0000 Subject: [PATCH 27/27] chore(DB): import pending files Referenced commit(s): 139e4ebafdc24f1569323c591c16018fdd2ac039 --- .../rev_1705256343927806600.sql => db_world/2024_01_15_00.sql} | 1 + 1 file changed, 1 insertion(+) rename data/sql/updates/{pending_db_world/rev_1705256343927806600.sql => db_world/2024_01_15_00.sql} (99%) diff --git a/data/sql/updates/pending_db_world/rev_1705256343927806600.sql b/data/sql/updates/db_world/2024_01_15_00.sql similarity index 99% rename from data/sql/updates/pending_db_world/rev_1705256343927806600.sql rename to data/sql/updates/db_world/2024_01_15_00.sql index e9a95a12f..a03e540a5 100644 --- a/data/sql/updates/pending_db_world/rev_1705256343927806600.sql +++ b/data/sql/updates/db_world/2024_01_15_00.sql @@ -1,3 +1,4 @@ +-- DB update 2024_01_14_14 -> 2024_01_15_00 -- -- Respawn event stuff DELETE FROM `creature` WHERE (`guid` BETWEEN 12608 AND 12634);