From 56881398f73bb895d28051b675888366c5984a91 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Tue, 3 Apr 2018 15:10:01 +0000 Subject: [PATCH 01/39] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a97d007689..06a5b6601d 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=1310)](https://www.bountysource.com/trackers/1310-trinity-core?utm_source=1310&utm_medium=shield&utm_campaign=TRACKER_BADGE) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a0ba43980b804281bdfe468300614fd3)](https://www.codacy.com/app/TrinityCore/TrinityCore_434?utm_source=github.com&utm_medium=referral&utm_content=TrinityCoreLegacy/TrinityCore&utm_campaign=Badge_Grade) + ## Build Status From cf2b74d1cac2d26b0dd701fd3c7bd67cef2aca6d Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 4 Apr 2018 02:37:06 +0200 Subject: [PATCH 02/39] DB/Vendor: Ardan Softmoon By Ravens62 --- .../world/4.3.4/2018_04_04_00_world.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sql/updates/world/4.3.4/2018_04_04_00_world.sql diff --git a/sql/updates/world/4.3.4/2018_04_04_00_world.sql b/sql/updates/world/4.3.4/2018_04_04_00_world.sql new file mode 100644 index 0000000000..39472300f3 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_04_04_00_world.sql @@ -0,0 +1,20 @@ +-- vendor list for entry 44027 +DELETE FROM `npc_vendor` WHERE `entry`= 44027; +INSERT INTO `npc_vendor`(`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`,`type`,`VerifiedBuild`) VALUES +(44027, 1, 7005,0,0,0,1,0), +(44027, 2, 2320,0,0,0,1,0), +(44027, 3, 2604,0,0,0,1,0), +(44027, 4, 4289,0,0,0,1,0), +(44027, 5, 6260,0,0,0,1,0), +(44027, 6, 2605,0,0,0,1,0), +(44027, 7, 2321,0,0,0,1,0), +(44027, 8, 4340,0,0,0,1,0), +(44027, 9, 4341,0,0,0,1,0), +(44027,10, 4291,0,0,0,1,0), +(44027,11, 6261,0,0,0,1,0), +(44027,12, 2325,0,0,0,1,0), +(44027,13, 8343,0,0,0,1,0), +(44027,14, 4342,0,0,0,1,0), +(44027,15,10290,0,0,0,1,0), +(44027,16,14341,0,0,0,1,0), +(44027,17,38426,0,0,0,1,0); From 6ba7d93c11918f92470ea90535cbb44df9c7a22f Mon Sep 17 00:00:00 2001 From: Killyana Date: Thu, 29 Mar 2018 15:34:03 +0200 Subject: [PATCH 03/39] DB/Misc: Death knights area rework part 11 Original work done by Grz3s on Cmangos --- .../world/3.3.5/2018_03_29_00_world.sql | 441 ++++++++++++++++++ 1 file changed, 441 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_03_29_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_29_00_world.sql b/sql/updates/world/3.3.5/2018_03_29_00_world.sql new file mode 100644 index 0000000000..9288c55e1e --- /dev/null +++ b/sql/updates/world/3.3.5/2018_03_29_00_world.sql @@ -0,0 +1,441 @@ +-- Duplicates removed +DELETE FROM creature WHERE guid IN (128989,129260,128975,128971,129421,129426,129420,129422,129419,129429,129418,129430,129427,129431,129425,129428,129424,129423,128961,128951,128952,128950,129000,128992,128983,128955,128969,128933,128941,128931,128954,128972,128960,128926,128981,128912,128977,128978,128929,128979,128914,128987,128918,128944,128994,128995,128942,128993,128945,128964,128917,128956,128943,128996,128916,128940,128965,128930,128963,128928,128970,128982,129001,128953,128920,128922,128973,128966,128913,128968,128937,128938,128967,128915,128976,128932,128980,128947,128921,128958,128959,128911,128984,128962); +DELETE FROM creature_addon WHERE guid IN (128989,151046,129260,128975,128971,129421,129426,129420,129422,129419,129429,129418,129430,129427,129431,129425,129428,129424,129423,128961,128951,128952,128950,129000,128992,128983,128955,128969,128933,128941,128931,128954,128972,128960,128926,128981,128912,128977,128978,128929,128979,128914,128987,128918,128944,128994,128995,128942,128993,128945,128964,128917,128956,128943,128996,128916,128940,128965,128930,128963,128928,128970,128982,129001,128953,128920,128922,128973,128966,128913,128968,128937,128938,128967,128915,128976,128932,128980,128947,128921,128958,128959,128911,128984,128962); +-- Saronite Arrow +DELETE FROM gameobject WHERE guid IN (66149, 66150, 66151, 66153, 66154, 66155, 66157, 66158, 66161, 66163, 66164, 66165, 66166, 66169, 66170, 66171, 66174, 66176, 66177, 66178, 66180, 66182, 66183, 66186, 66188,66194, 66195, 66197, 66201, 66203, 66204, 66208, 66209, 66210, 66211, 66212, 66213, 66219, 66220, 66221, 66222, 66223, 66224, 66225, 66227, 66229, 66231, 66232); +-- Citizen of Havenshire +UPDATE creature SET spawntimesecs = 5 WHERE id IN (28576,28577); +-- #1 +UPDATE creature SET position_x = 2056.845215, position_y = -5887.278809, position_z = 105.142105, orientation = 5.18, MovementType = 2, spawndist = 0 WHERE guid = 128934; +DELETE FROM `creature_addon` WHERE `guid` IN (128934); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128934, 1289340, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289340; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289340,1,2056.84,-5887.27,105.142, 0, 1, 0, 100, 0), +(1289340,2,2057.01,-5896.95,105.123, 0, 1, 0, 100, 0), +(1289340,3,2035.39,-5906.56,105.121, 0, 1, 0, 100, 0), +(1289340,4,2017.4, -5907.31,104.623, 0, 1, 0, 100, 0), +(1289340,5,1975.06,-5904.35,102.864, 0, 1, 0, 100, 0), +(1289340,6,1945.99,-5904.95,101.207, 0, 1, 0, 100, 0), +(1289340,7,1917.03,-5911.18,101.617, 0, 1, 0, 100, 0), +(1289340,8,1903.82,-5909.42,101.736, 0, 1, 0, 100, 0), +(1289340,9,1877.38,-5911.21,103.984, 0, 1, 0, 100, 0), +(1289340,10,1827.52,-5927.2,111.352, 0, 1, 0, 100, 0), +(1289340,11,1813.52,-5931.47,114.61, 0, 1, 0, 100, 0), +(1289340,12,1807.51,-5941.81,115.80, 0, 1, 0, 100, 0), +(1289340,13,1807.12,-5972.92,116.18, 0, 1, 0, 100, 0), +(1289340,14,1807.86,-5991.78,117.61, 0, 1, 0, 100, 0), +(1289340,15,1810.83,-6000.76,117.63, 2000, 1, 1188, 100, 0); +-- #2 +UPDATE creature SET spawndist = 0, MovementType = 2 WHERE guid = 128999; +DELETE FROM `creature_addon` WHERE `guid` IN (128999); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128999, 1289990, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289990; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289990,1,2240.29,-5923.61,98.8092, 0, 1, 0, 100, 0), +(1289990,2,2225.95,-5917.15,100.564, 0, 1, 0, 100, 0), +(1289990,3,2183.44,-5892.94,100.710, 0, 1, 0, 100, 0), +(1289990,4,2165.87,-5868.91,101.326, 0, 1, 0, 100, 0), +(1289990,5,2144.29,-5833.26,101.282, 0, 1, 0, 100, 0), +(1289990,6,2134.01,-5800.38,99.6541, 0, 1, 0, 100, 0), +(1289990,7,2124.79,-5797.24,99.4295, 0, 1, 0, 100, 0), +(1289990,8,2116.25,-5802.6,100.7940, 2000, 1, 1188, 100, 0); +-- #3 +UPDATE creature SET position_x = 2279.38, position_y = -5792.860840, position_z = 100.936661, orientation = 2.211558, spawndist = 0, MovementType = 2 WHERE guid = 128957; +DELETE FROM `creature_addon` WHERE `guid` IN (128957); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128957, 1289570, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289570; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289570,1,2279.38,-5792.86,100.936, 0, 1, 0, 100, 0), +(1289570,2,2237.48,-5762.68,101.423, 0, 1, 0, 100, 0), +(1289570,3,2195.92,-5750.89,102.247, 0, 1, 0, 100, 0), +(1289570,4,2159.98,-5731.86,101.111, 0, 1, 0, 100, 0), +(1289570,5,2137.79,-5726.60,100.368, 0, 1, 0, 100, 0), +(1289570,6,2122.49,-5721.89,100.341, 0, 1, 0, 100, 0), +(1289570,7,2079.47,-5736.64,100.508, 0, 1, 0, 100, 0), +(1289570,8,2043.49,-5745.04,98.6616, 0, 1, 0, 100, 0), +(1289570,9,2016.05,-5748.10,99.5260, 0, 1, 0, 100, 0), +(1289570,10,1980.49,-5754.46,99.502, 0, 1, 0, 100, 0), +(1289570,11,1945.86,-5764.75,102.86, 0, 1, 0, 100, 0), +(1289570,12,1917.47,-5769.25,102.56, 0, 1, 0, 100, 0), +(1289570,13,1898.75,-5770.96,103.71, 0, 1, 0, 100, 0), +(1289570,14,1862.43,-5790.36,102.18, 0, 1, 0, 100, 0), +(1289570,15,1825.73,-5806.88,102.91, 0, 1, 0, 100, 0), +(1289570,16,1797.47,-5813.53,109.97, 0, 1, 0, 100, 0), +(1289570,17,1769.65,-5813.99,115.93, 0, 1, 0, 100, 0), +(1289570,18,1752.63,-5817.66,116.12, 0, 1, 0, 100, 0), +(1289570,19,1747.26,-5809.18,116.12, 0, 1, 0, 100, 0), +(1289570,20,1748.11,-5802.21,117.12, 2000, 1, 1188, 100, 0); +-- #4 +UPDATE creature SET position_x = 2260.174805, position_y = -5801.781250, position_z = 102.004921, orientation = 3.76, spawndist = 0, MovementType = 2 WHERE guid = 128948; +DELETE FROM `creature_addon` WHERE `guid` IN (128948); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128948, 1289480, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289480; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289480,1,2260.17,-5801.78,102.01, 0, 1, 0, 100, 0), +(1289480,2,2250.01,-5803.18,100.98, 0, 1, 0, 100, 0), +(1289480,3,2165.42,-5814.7,101.322, 0, 1, 0, 100, 0), +(1289480,4,2101.6,-5840.02,102.298, 0, 1, 0, 100, 0), +(1289480,5,2038.31,-5843.82,100.35, 0, 1, 0, 100, 0), +(1289480,6,1945.59,-5846.08,100.35, 0, 1, 0, 100, 0), +(1289480,7,1902.9,-5844.42,100.833, 0, 1, 0, 100, 0), +(1289480,8,1849.54,-5819.23,99.928, 0, 1, 0, 100, 0), +(1289480,9,1767.95,-5819.02,116.02, 0, 1, 0, 100, 0), +(1289480,10,1745.79,-5834.48,116.8, 0, 1, 0, 100, 0), +(1289480,11,1723.42,-5867.11,116.1, 0, 1, 0, 100, 0), +(1289480,12,1729.19,-5872.37,116.1, 0, 1, 0, 100, 0), +(1289480,13,1739.22,-5872.44,116.6, 2000, 1, 1188, 100, 0); +-- #5 +UPDATE creature SET position_x = 2286.046631, position_y = -5829.061035, position_z = 100.934441, orientation = 2.1, spawndist = 0, MovementType = 2 WHERE guid = 128949; +DELETE FROM `creature_addon` WHERE `guid` IN (128949); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128949, 1289490, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289490; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289490,1,2286.04,-5829.06,100.934, 0, 1, 0, 100, 0), +(1289490,2,2273.30,-5836.75,100.934, 0, 1, 0, 100, 0), +(1289490,3,2249.23,-5837.22,101.289, 0, 1, 0, 100, 0), +(1289490,4,2186.37,-5864.02,101.326, 0, 1, 0, 100, 0), +(1289490,5,2165.92,-5868.08,101.326, 0, 1, 0, 100, 0), +(1289490,6,2140.53,-5857.96,101.363, 0, 1, 0, 100, 0), +(1289490,7,2107.88,-5872.78,103.037, 0, 1, 0, 100, 0), +(1289490,8,2104.77,-5877.18,103.393, 0, 1, 0, 100, 0), +(1289490,9,2107.28,-5882.22,103.865, 2000, 1, 1188, 100, 0); +-- #6 +UPDATE creature SET position_x = 2270.406494, position_y = -5825.929199, position_z = 100.935585, orientation = 2.91, spawndist = 0, MovementType = 2 WHERE guid = 128946; +DELETE FROM `creature_addon` WHERE `guid` IN (128946); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128946, 1289460, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289460; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289460,1,2270.40,-5825.92,100.935, 0, 1, 0, 100, 0), +(1289460,2,2235.89,-5826.65,101.323, 0, 1, 0, 100, 0), +(1289460,3,2211.43,-5824.89,101.391, 0, 1, 0, 100, 0), +(1289460,4,2161.91,-5813.19,101.513, 0, 1, 0, 100, 0), +(1289460,5,2112.32,-5785.67,98.9869, 0, 1, 0, 100, 0), +(1289460,6,2085.38,-5800.41,102.163, 0, 1, 0, 100, 0), +(1289460,7,2069.57,-5809.84,103.118, 0, 1, 0, 100, 0), +(1289460,8,2021.36,-5802.96,100.410, 0, 1, 0, 100, 0), +(1289460,9,1981.07,-5806.64,100.999, 0, 1, 0, 100, 0), +(1289460,10,1941.97,-5799.79,100.25, 2000, 1, 1188, 100, 0); +-- #7 +UPDATE creature SET position_x = 2269.964844, position_y = -5826.081055, position_z = 100.936157, orientation = 3.1, spawndist = 0, MovementType = 2 WHERE guid = 128997; +DELETE FROM `creature_addon` WHERE `guid` IN (128997); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128997, 1289970, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289970; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289970,1,2269.96,-5826.08,100.932, 8000, 1, 0, 100, 0), +(1289970,2,2236.19,-5803.16,101.208, 0, 1, 0, 100, 0), +(1289970,3,2167.06,-5816.79,101.337, 0, 1, 0, 100, 0), +(1289970,4,2105.5,-5839.54,102.1880, 0, 1, 0, 100, 0), +(1289970,5,2049.9,-5864.14,102.8060, 0, 1, 0, 100, 0), +(1289970,6,1987.16,-5898.45,102.500, 0, 1, 0, 100, 0), +(1289970,7,1937.49,-5907.82,101.143, 0, 1, 0, 100, 0), +(1289970,8,1886.73,-5910.87,103.037, 0, 1, 0, 100, 0), +(1289970,9,1853.53,-5921.4,105.2080, 0, 1, 0, 100, 0), +(1289970,10,1812.25,-5927.43,114.55, 0, 1, 0, 100, 0), +(1289970,11,1768.08,-5923.11,116.12, 0, 1, 0, 100, 0), +(1289970,12,1761.5,-5930.56,116.119, 0, 1, 0, 100, 0), +(1289970,13,1742.4,-5967.17,117.122, 2000, 1, 1188, 100, 0); +-- #8 +UPDATE creature SET position_x = 2258.272461, position_y = -5805.730957, position_z = 100.938576, orientation = 4.38, spawndist = 0, MovementType = 2 WHERE guid = 128998; +DELETE FROM `creature_addon` WHERE `guid` IN (128998); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128998, 1289980, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289980; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289980,1,2258.27,-5805.73,100.938, 5000, 1, 0, 100, 0), +(1289980,2,2253.32,-5824.7,101.0520, 0, 1, 0, 100, 0), +(1289980,3,2232.21,-5831.54,101.341, 0, 1, 0, 100, 0), +(1289980,4,2196.33,-5826.97,101.406, 0, 1, 0, 100, 0), +(1289980,5,2140.07,-5816.52,100.652, 0, 1, 0, 100, 0), +(1289980,6,2126.99,-5799.26,99.5154, 0, 1, 0, 100, 0), +(1289980,7,2117.59,-5801.23,99.9204, 2000, 1, 1188, 100, 0); +-- #9 +UPDATE creature SET position_x = 2277.270020, position_y = -5867.498047, position_z = 100.942833, orientation = 1.66, spawndist = 0, MovementType = 2 WHERE guid = 128990; +DELETE FROM `creature_addon` WHERE `guid` IN (128990); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128990, 1289900, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289900; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289900,1,2277.27,-5867.49,100.942, 7000, 1, 0, 100, 0), +(1289900,2,2272.55,-5847.26,100.935, 0, 1, 0, 100, 0), +(1289900,3,2248.3,-5807.73,100.9950, 0, 1, 0, 100, 0), +(1289900,4,2229.75,-5773.74,101.512, 0, 1, 0, 100, 0), +(1289900,5,2207.39,-5751.6,102.4630, 0, 1, 0, 100, 0), +(1289900,6,2162.07,-5722.95,101.576, 0, 1, 0, 100, 0), +(1289900,7,2144.9,-5704.05,102.2520, 0, 1, 0, 100, 0), +(1289900,8,2132.24,-5701.09,101.273, 0, 1, 0, 100, 0), +(1289900,9,2098.18,-5703.38,100.270, 0, 1, 0, 100, 0), +(1289900,10,2083.12,-5711.63,100.36, 0, 1, 0, 100, 0), +(1289900,11,2071.02,-5730.28,100.25, 0, 1, 0, 100, 0), +(1289900,12,2039.03,-5757.86,98.815, 0, 1, 0, 100, 0), +(1289900,13,2014.79,-5784.96,100.44, 0, 1, 0, 100, 0), +(1289900,14,2015.79,-5833.84,100.67, 0, 1, 0, 100, 0), +(1289900,15,2014.32,-5862.64,100.46, 0, 1, 0, 100, 0), +(1289900,16,2005.57,-5893.96,102.37, 0, 1, 0, 100, 0), +(1289900,17,1985.4,-5923.43,104.304, 0, 1, 0, 100, 0), +(1289900,18,1971.35,-5933.44,102.88, 0, 1, 0, 100, 0), +(1289900,19,1913.35,-5938.29,102.50, 0, 1, 0, 100, 0), +(1289900,20,1866.07,-5922.39,104.32, 0, 1, 0, 100, 0), +(1289900,21,1840.94,-5922.4,107.583, 0, 1, 0, 100, 0), +(1289900,22,1813.25,-5930.15,114.56, 0, 1, 0, 100, 0), +(1289900,23,1789.73,-5930.3,116.116, 0, 1, 0, 100, 0), +(1289900,24,1713.48,-5892.5,116.135, 0, 1, 0, 100, 0), +(1289900,25,1691.18,-5872.74,116.15, 0, 1, 0, 100, 0), +(1289900,26,1682.69,-5868.98,116.23, 0, 1, 0, 100, 0), +(1289900,27,1658.57,-5878.73,117.14, 2000, 1, 1188, 100, 0); +-- #10 +UPDATE creature SET position_x = 2244.684570, position_y = -5863.497070, position_z = 101.023544, orientation = 3.25, spawndist = 0, MovementType = 2 WHERE guid = 128988; +DELETE FROM `creature_addon` WHERE `guid` IN (128988); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128988, 1289880, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289880; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289880,1,2244.68,-5863.49,101.023, 10000, 1, 0, 100, 0), +(1289880,2,2236.78,-5865.79,101.105, 0, 1, 0, 100, 0), +(1289880,3,2176.49,-5844.66,101.348, 0, 1, 0, 100, 0), +(1289880,4,2143.43,-5844.3,101.3280, 0, 1, 0, 100, 0), +(1289880,5,2088.85,-5847.07,103.921, 0, 1, 0, 100, 0), +(1289880,6,2068.05,-5859.08,103.275, 0, 1, 0, 100, 0), +(1289880,7,2026.17,-5873.86,101.836, 0, 1, 0, 100, 0), +(1289880,8,1970.37,-5871.27,100.618, 0, 1, 0, 100, 0), +(1289880,9,1950.31,-5859.67,100.117, 0, 1, 0, 100, 0), +(1289880,10,1922.59,-5845.54,100.15, 0, 1, 0, 100, 0), +(1289880,11,1870.15,-5833.8,101.252, 0, 1, 0, 100, 0), +(1289880,12,1831.83,-5825.1,101.150, 0, 1, 0, 100, 0), +(1289880,13,1762.85,-5824.3,116.116, 0, 1, 0, 100, 0), +(1289880,14,1714.55,-5821.33,116.12, 0, 1, 0, 100, 0), +(1289880,15,1701.84,-5811.57,116.01, 0, 1, 0, 100, 0), +(1289880,16,1667.87,-5798.99,116.11, 0, 1, 0, 100, 0), +(1289880,17,1648.39,-5804.74,117.12, 2000, 1, 1188, 100, 0); +-- #11 +UPDATE creature SET position_x = 2170.995605, position_y = -5910.861816, position_z = 100.466431, orientation = 2.95, spawndist = 0, MovementType = 2 WHERE guid = 128991; +DELETE FROM `creature_addon` WHERE `guid` IN (128991); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128991, 1289910, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289910; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289910,1,2170.99,-5910.86,100.460, 0, 1, 0, 100, 0), +(1289910,2,2123.96,-5908.37,103.537, 0, 1, 0, 100, 0), +(1289910,3,2063.83,-5917.86,106.994, 0, 1, 0, 100, 0), +(1289910,4,2018.57,-5925.72,104.636, 0, 1, 0, 100, 0), +(1289910,5,1978.91,-5931.81,103.270, 0, 1, 0, 100, 0), +(1289910,6,1930.42,-5925.82,103.547, 0, 1, 0, 100, 0), +(1289910,7,1882.12,-5918.43,104.002, 0, 1, 0, 100, 0), +(1289910,8,1847.43,-5919.06,106.024, 0, 1, 0, 100, 0), +(1289910,9,1803.47,-5923.31,115.736, 0, 1, 0, 100, 0), +(1289910,10,1746.99,-5912.37,116.11, 0, 1, 0, 100, 0), +(1289910,11,1706.68,-5886.96,116.13, 0, 1, 0, 100, 0), +(1289910,12,1658.84,-5845.24,116.13, 0, 1, 0, 100, 0), +(1289910,13,1644.38,-5842.67,117.29, 2000, 1, 1188, 100, 0); +-- #12 +UPDATE creature SET position_x = 2170.457764, position_y = -5907.129883, position_z = 100.424911, orientation = 3.02, spawndist = 0, MovementType = 2 WHERE guid = 128935; +DELETE FROM `creature_addon` WHERE `guid` IN (128935); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128935, 1289350, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289350; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289350,1,2170.45,-5907.12,100.424, 4000, 1, 0, 100, 0), +(1289350,2,2142.37,-5894.82,101.973, 0, 1, 0, 100, 0), +(1289350,3,2107.72,-5872.92,103.053, 0, 1, 0, 100, 0), +(1289350,4,2067.51,-5867.54,103.870, 0, 1, 0, 100, 0), +(1289350,5,2024.79,-5869.48,101.221, 0, 1, 0, 100, 0), +(1289350,6,1951.56,-5846.48,100.403, 0, 1, 0, 100, 0), +(1289350,7,1869.61,-5831.08,100.987, 0, 1, 0, 100, 0), +(1289350,8,1830.11,-5820.79,101.520, 0, 1, 0, 100, 0), +(1289350,9,1768.9,-5799.65,116.1450, 0, 1, 0, 100, 0), +(1289350,10,1756.63,-5788.3,116.123, 0, 1, 0, 100, 0), +(1289350,11,1744.66,-5783.13,116.12, 0, 1, 0, 100, 0), +(1289350,12,1742.19,-5775.26,116.120, 0, 1, 0, 100, 0), +(1289350,13,1748.05,-5772.54,117.08, 2000, 1, 1188, 100, 0); +-- #13 +UPDATE creature SET position_x = 2217.407471, position_y = -5875.900391, position_z = 101.085777, orientation = 2.83, spawndist = 0, MovementType = 2 WHERE guid = 128985; +DELETE FROM `creature_addon` WHERE `guid` IN (128985); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128985, 1289850, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289850; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289850,1,2217.40,-5875.90,101.085, 6000, 1, 0, 100, 0), +(1289850,2,2196.64,-5866.59,101.304, 0, 1, 0, 100, 0), +(1289850,3,2170.04,-5867.43,101.340, 0, 1, 0, 100, 0), +(1289850,4,2137.81,-5856.76,101.391, 0, 1, 0, 100, 0), +(1289850,5,2082.67,-5847.29,103.244, 0, 1, 0, 100, 0), +(1289850,6,2029.99,-5848.05,100.431, 0, 1, 0, 100, 0), +(1289850,7,1969.77,-5874.91,100.636, 0, 1, 0, 100, 0), +(1289850,8,1918.99,-5906.72,101.467, 0, 1, 0, 100, 0), +(1289850,9,1858.61,-5915.66,104.490, 0, 1, 0, 100, 0), +(1289850,10,1803.63,-5926.08,115.62, 0, 1, 0, 100, 0), +(1289850,11,1768.5,-5923.63,116.119, 0, 1, 0, 100, 0), +(1289850,12,1754.77,-5942.33,116.14, 0, 1, 0, 100, 0), +(1289850,13,1742.09,-5966.46,117.12, 2000, 1, 1188, 100, 0); +-- #14 +UPDATE creature SET position_x = 1941.105225, position_y = -5799.148926, position_z = 100.515633, orientation = 5.55, spawndist = 0, MovementType = 2 WHERE guid = 128936; +DELETE FROM `creature_addon` WHERE `guid` IN (128936); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128936, 1289360, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289360; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289360,1,1941.10,-5799.14,100.515, 0, 1, 0, 100, 0), +(1289360,2,1945.67,-5802.12,100.476, 0, 1, 0, 100, 0), +(1289360,3,1951.73,-5799.14,100.577, 0, 1, 0, 100, 0), +(1289360,4,1942.04,-5772.9,102.1260, 0, 1, 0, 100, 0), +(1289360,5,1927.43,-5772.54,101.941, 0, 1, 0, 100, 0), +(1289360,6,1895.65,-5808.82,101.188, 0, 1, 0, 100, 0), +(1289360,7,1866.02,-5820.96,100.295, 0, 1, 0, 100, 0), +(1289360,8,1826.25,-5818.95,102.312, 0, 1, 0, 100, 0), +(1289360,9,1772.64,-5818.85,115.730, 0, 1, 0, 100, 0), +(1289360,10,1717.71,-5814.72,116.15, 0, 1, 0, 100, 0), +(1289360,11,1664.44,-5790.83,116.12, 0, 1, 0, 100, 0), +(1289360,12,1608.48,-5763.8,116.663, 0, 1, 0, 100, 0), +(1289360,13,1595.3,-5741.35,119.236, 0, 1, 0, 100, 0), +(1289360,14,1585.9,-5721.38,121.680, 0, 1, 0, 100, 0), +(1289360,15,1575.5,-5724.96,120.779, 2000, 1, 1188, 100, 0); +-- #15 +UPDATE creature SET position_x = 1941.454590, position_y = -5800.637695, position_z = 100.260811, orientation = 5.36, spawndist = 0, MovementType = 2 WHERE guid = 128927; +DELETE FROM `creature_addon` WHERE `guid` IN (128927); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128927, 1289270, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289270; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289270,1,1941.45,-5800.63,100.260, 5000, 1, 0, 100, 0), +(1289270,2,1886.91,-5834.98,101.234, 0, 1, 0, 100, 0), +(1289270,3,1852.12,-5830.11,100.757, 0, 1, 0, 100, 0), +(1289270,4,1831.31,-5827.4,101.2170, 0, 1, 0, 100, 0), +(1289270,5,1779.23,-5826.67,115.221, 0, 1, 0, 100, 0), +(1289270,6,1733.84,-5854.41,116.616, 0, 1, 0, 100, 0), +(1289270,7,1683.82,-5870.42,116.177, 0, 1, 0, 100, 0), +(1289270,8,1659.01,-5878.35,117.142, 2000, 1, 1188, 100, 0); +-- #16 +UPDATE creature SET position_x = 1939.179810, position_y = -5802.433105, position_z = 100.259399, orientation = 4.3, spawndist = 0, MovementType = 2 WHERE guid = 128924; +DELETE FROM `creature_addon` WHERE `guid` IN (128924); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128924, 1289240, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289240; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289240,1,1939.17,-5802.43,100.259, 3000, 1, 0, 100, 0), +(1289240,2,1905.17,-5812.59,100.617, 0, 1, 0, 100, 0), +(1289240,3,1839.49,-5820.87,100.435, 0, 1, 0, 100, 0), +(1289240,4,1770.56,-5825.94,115.982, 0, 1, 0, 100, 0), +(1289240,5,1750.1,-5823.17,116.1220, 0, 1, 0, 100, 0), +(1289240,6,1747.84,-5801.86,117.123, 2000, 1, 1188, 100, 0); +-- #17 +UPDATE creature SET position_x = 1938.616211, position_y = -5867.627930, position_z = 99.059547, orientation = 0.5, spawndist = 0, MovementType = 2 WHERE guid = 128986; +DELETE FROM `creature_addon` WHERE `guid` IN (128986); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128986, 1289860, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289860; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289860,1,1938.61,-5867.62,99.0595, 0, 1, 0, 100, 0), +(1289860,2,1953.07,-5871.43,100.064, 0, 1, 0, 100, 0), +(1289860,3,1957.82,-5886.43,101.620, 0, 1, 0, 100, 0), +(1289860,4,1927.15,-5905.47,101.052, 0, 1, 0, 100, 0), +(1289860,5,1865.38,-5906.94,103.945, 0, 1, 0, 100, 0), +(1289860,6,1813.74,-5924.07,114.088, 0, 1, 0, 100, 0), +(1289860,7,1744.47,-5905.5,116.1420, 0, 1, 0, 100, 0), +(1289860,8,1666.27,-5874.95,116.156, 0, 1, 0, 100, 0), +(1289860,9,1659.64,-5878.93,117.141, 2000, 1, 1188, 100, 0); +-- #18 +UPDATE creature SET position_x = 2067.154541, position_y = -5900.735840, position_z = 105.315590, orientation = 3.37, spawndist = 0, MovementType = 2 WHERE guid = 128925; +DELETE FROM `creature_addon` WHERE `guid` IN (128925); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128925, 1289250, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289250; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289250,1,2067.15,-5900.73,105.315, 10000, 1, 0, 100, 0), +(1289250,2,2023.75,-5909.85,104.968, 0, 1, 0, 100, 0), +(1289250,3,1950.40,-5910.79,101.778, 0, 1, 0, 100, 0), +(1289250,4,1898.09,-5912.00,101.896, 0, 1, 0, 100, 0), +(1289250,5,1854.49,-5919.36,104.994, 0, 1, 0, 100, 0), +(1289250,6,1805.89,-5925.83,115.401, 0, 1, 0, 100, 0), +(1289250,7,1739.83,-5908.36,116.121, 0, 1, 0, 100, 0), +(1289250,8,1695.83,-5881.50,116.135, 0, 1, 0, 100, 0), +(1289250,9,1652.39,-5843.25,116.135, 0, 1, 0, 100, 0), +(1289250,10,1645.1,-5842.39,117.290, 2000, 1, 1188, 100, 0); +-- #19 +UPDATE creature SET spawndist = 0, MovementType = 2 WHERE guid = 128919; +DELETE FROM `creature_addon` WHERE `guid` IN (128919); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128919, 1289190, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289190; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289190,1,2159.18,-5892.81,101.401, 0, 1, 0, 100, 0), +(1289190,2,2132.78,-5865.54,101.596, 0, 1, 0, 100, 0), +(1289190,3,2084.84,-5829.55,102.578, 0, 1, 0, 100, 0), +(1289190,4,2054.93,-5803.12,102.494, 0, 1, 0, 100, 0), +(1289190,5,1997.51,-5805.87,100.678, 0, 1, 0, 100, 0), +(1289190,6,1977.29,-5813.95,101.035, 0, 1, 0, 100, 0), +(1289190,7,1959.61,-5811.83,101.148, 0, 1, 0, 100, 0), +(1289190,8,1941.14,-5799.42,100.516, 2000, 1, 1188, 100, 0); +-- #20 +UPDATE creature SET position_x = 2067.149414, position_y = -5885.223633, position_z = 104.120804, orientation = 3.6, spawndist = 0, MovementType = 2 WHERE guid = 128974; +DELETE FROM `creature_addon` WHERE `guid` IN (128974); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128974, 1289740, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289740; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289740,1,2067.14,-5885.22,104.120, 6000, 1, 0, 100, 0), +(1289740,2,2034.37,-5906.14,105.076, 0, 1, 0, 100, 0), +(1289740,3,1948.81,-5904.8,101.3640, 0, 1, 0, 100, 0), +(1289740,4,1899, -5901.04,102.011, 0, 1, 0, 100, 0), +(1289740,5,1857.14,-5919.97,104.759, 0, 1, 0, 100, 0), +(1289740,6,1806.77,-5925.39,115.368, 0, 1, 0, 100, 0), +(1289740,7,1743.95,-5906.21,116.130, 0, 1, 0, 100, 0), +(1289740,8,1696.17,-5874.24,116.141, 0, 1, 0, 100, 0), +(1289740,9,1666.11,-5875.97,116.156, 0, 1, 0, 100, 0), +(1289740,10,1660.01,-5877.95,117.14, 2000, 1, 1188, 100, 0); +-- #21 +UPDATE creature SET position_x = 2140.980225, position_y = -5779.114258, position_z = 99.407547, orientation = 3.5, spawndist = 0, MovementType = 2 WHERE guid = 128939; +DELETE FROM `creature_addon` WHERE `guid` IN (128939); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128939, 1289390, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289390; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289390,1,2140.98,-5779.11,99.4075, 6000, 1, 0, 100, 0), +(1289390,2,2086.14,-5775.21,99.1742, 0, 1, 0, 100, 0), +(1289390,3,2043.6,-5761.94,98.89110, 0, 1, 0, 100, 0), +(1289390,4,2008.65,-5779.73,100.501, 0, 1, 0, 100, 0), +(1289390,5,1977.81,-5796.46,100.932, 0, 1, 0, 100, 0), +(1289390,6,1942.26,-5800.28,100.278, 2000, 1, 1188, 100, 0); +-- #22 +UPDATE creature SET position_x = 2116.1, position_y = -5802.52, position_z = 100.8, orientation = 0.9, spawndist = 0, MovementType = 2 WHERE guid = 128923; +DELETE FROM `creature_addon` WHERE `guid` IN (128923); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128923, 1289230, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289230; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289230,1,2116.10,-5802.52,100.800, 0, 1, 0, 100, 0), +(1289230,2,2119.35,-5797.03,99.6076, 0, 1, 0, 100, 0), +(1289230,3,2117.58,-5787.27,98.7951, 0, 1, 0, 100, 0), +(1289230,4,2076.21,-5768.19,99.1701, 0, 1, 0, 100, 0), +(1289230,5,2034.56,-5763.16,99.7534, 0, 1, 0, 100, 0), +(1289230,6,2000.9,-5792.28,100.6950, 0, 1, 0, 100, 0), +(1289230,7,1956.93,-5830.99,100.828, 0, 1, 0, 100, 0), +(1289230,8,1906.43,-5844.33,100.691, 0, 1, 0, 100, 0), +(1289230,9,1870.69,-5831.22,101.043, 0, 1, 0, 100, 0), +(1289230,10,1837.45,-5821.06,100.59, 0, 1, 0, 100, 0), +(1289230,11,1774.77,-5819.43,115.49, 0, 1, 0, 100, 0), +(1289230,12,1752.66,-5819.17,116.12, 0, 1, 0, 100, 0), +(1289230,13,1747.47,-5809.54,116.12, 0, 1, 0, 100, 0), +(1289230,14,1748.39,-5803.1,117.124, 2000, 1, 1188, 100, 0); +-- #23 +UPDATE creature SET position_x = 1908.830811, position_y = -5884.311035, position_z = 100.260605, orientation = 4.1, spawndist = 0, MovementType = 2 WHERE guid = 128910; +DELETE FROM `creature_addon` WHERE `guid` IN (128910); +INSERT INTO `creature_addon` (`guid`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES +(128910, 1289100, 0, 0, ''); +DELETE FROM `waypoint_data` WHERE `id`=1289100; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(1289100,1,1908.8,-5884.31,100.260, 0, 1, 0, 100, 0), +(1289100,2,1870.1,-5910.93,104.046, 0, 1, 0, 100, 0), +(1289100,3,1823.62,-5927.41,112.22, 0, 1, 0, 100, 0), +(1289100,4,1793.2,-5931.67,116.089, 0, 1, 0, 100, 0), +(1289100,5,1751.19,-5914.43,116.11, 0, 1, 0, 100, 0), +(1289100,6,1696.15,-5881.5,116.137, 0, 1, 0, 100, 0), +(1289100,7,1652.94,-5833.58,116.20, 0, 1, 0, 100, 0), +(1289100,8,1615.36,-5781.67,116.11, 0, 1, 0, 100, 0), +(1289100,9,1586.79,-5723.86,121.68, 2000, 1, 1188, 100, 0); From 7e9ceda269a051104d06b03e886cec25ad818a35 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 29 Mar 2018 20:18:52 +0200 Subject: [PATCH 04/39] DB/locales_quest: Fix localizations for Manhunt Closes #17353 --- sql/updates/world/3.3.5/2018_03_29_01_world_335.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_03_29_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql b/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql new file mode 100644 index 0000000000..a96e7ea266 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql @@ -0,0 +1,6 @@ +-- +UPDATE `quest_template_locale` SET `Objectives` = 'Findet den \"Sammler\" und tötet ihn, dann kehrt mit dem Ring des Sammlers zu Marschall Dughan zurück.', `CompletedText` = 'Kehrt zu Marschall Dughan im Holzfällerlager des Osttals im Wald von Elwynn zurück.' WHERE `ID` = 147 AND `locale` = 'deDE'; +UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.', `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` = 'esES'; +UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.', `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` = 'esMX'; +UPDATE `quest_template_locale` SET `Objectives` = 'Trouvez et tuez le « Collecteur » puis rapportez l’Anneau du Collecteur au Maréchal Dughan.', `CompletedText` = 'Retournez voir le Maréchal Dughan au Camp de bûcherons du Val d\'Est, dans la Forêt d\'Elwynn.' WHERE `ID` = 147 AND `locale` = 'frFR'; +UPDATE `quest_template_locale` SET `Objectives` = 'Найдите и убейте \"Вымогателя\", а затем принесите его кольцо маршалу Дугхан.', `CompletedText` = 'Вернитесь к маршалу Дугхан на лесопилку Восточной долины в Элвиннском лесу.' WHERE `ID` = 147 AND `locale` = 'ruRU'; From 3c302f11ce7b1a9cff6bae474e0600b805f95d4a Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Sun, 1 Apr 2018 03:14:41 -0600 Subject: [PATCH 05/39] Core/Database: Add columns on *_banned (#21748) * Add columns on ban character query * Add columns on ban account query --- .../database/Database/Implementation/CharacterDatabase.cpp | 2 +- src/server/database/Database/Implementation/LoginDatabase.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp index 195582690a..48b3ea94a8 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp @@ -31,7 +31,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_SEL_CHECK_GUID, "SELECT 1 FROM characters WHERE guid = ?", CONNECTION_SYNCH); PrepareStatement(CHAR_SEL_SUM_CHARS, "SELECT COUNT(guid) FROM characters WHERE account = ?", CONNECTION_BOTH); PrepareStatement(CHAR_SEL_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0, ?", CONNECTION_ASYNC); - PrepareStatement(CHAR_INS_CHARACTER_BAN, "INSERT INTO character_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC); + PrepareStatement(CHAR_INS_CHARACTER_BAN, "INSERT INTO character_banned (guid, bandate, unbandate, bannedby, banreason, active) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC); PrepareStatement(CHAR_UPD_CHARACTER_BAN, "UPDATE character_banned SET active = 0 WHERE guid = ? AND active != 0", CONNECTION_ASYNC); PrepareStatement(CHAR_DEL_CHARACTER_BAN, "DELETE cb FROM character_banned cb INNER JOIN characters c ON c.guid = cb.guid WHERE c.account = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_SEL_BANINFO, "SELECT bandate, unbandate-bandate, active, unbandate, banreason, bannedby FROM character_banned WHERE guid = ? ORDER BY bandate ASC", CONNECTION_SYNCH); diff --git a/src/server/database/Database/Implementation/LoginDatabase.cpp b/src/server/database/Database/Implementation/LoginDatabase.cpp index 00baae6956..139f1388fe 100644 --- a/src/server/database/Database/Implementation/LoginDatabase.cpp +++ b/src/server/database/Database/Implementation/LoginDatabase.cpp @@ -34,7 +34,7 @@ void LoginDatabaseConnection::DoPrepareStatements() PrepareStatement(LOGIN_SEL_IP_BANNED_BY_IP, "SELECT ip, bandate, unbandate, bannedby, banreason FROM ip_banned WHERE (bandate = unbandate OR unbandate > UNIX_TIMESTAMP()) AND ip LIKE CONCAT('%%', ?, '%%') ORDER BY unbandate", CONNECTION_SYNCH); PrepareStatement(LOGIN_SEL_ACCOUNT_BANNED_ALL, "SELECT account.id, username FROM account, account_banned WHERE account.id = account_banned.id AND active = 1 GROUP BY account.id", CONNECTION_SYNCH); PrepareStatement(LOGIN_SEL_ACCOUNT_BANNED_BY_USERNAME, "SELECT account.id, username FROM account, account_banned WHERE account.id = account_banned.id AND active = 1 AND username LIKE CONCAT('%%', ?, '%%') GROUP BY account.id", CONNECTION_SYNCH); - PrepareStatement(LOGIN_INS_ACCOUNT_AUTO_BANNED, "INSERT INTO account_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, 'Trinity Auth', 'Failed login autoban', 1)", CONNECTION_ASYNC); + PrepareStatement(LOGIN_INS_ACCOUNT_AUTO_BANNED, "INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, 'Trinity Auth', 'Failed login autoban', 1)", CONNECTION_ASYNC); PrepareStatement(LOGIN_DEL_ACCOUNT_BANNED, "DELETE FROM account_banned WHERE id = ?", CONNECTION_ASYNC); PrepareStatement(LOGIN_UPD_VS, "UPDATE account SET v = ?, s = ? WHERE username = ?", CONNECTION_ASYNC); PrepareStatement(LOGIN_UPD_LOGONPROOF, "UPDATE account SET sessionkey = ?, last_ip = ?, last_login = NOW(), locale = ?, failed_logins = 0, os = ? WHERE username = ?", CONNECTION_SYNCH); @@ -60,7 +60,7 @@ void LoginDatabaseConnection::DoPrepareStatements() PrepareStatement(LOGIN_SEL_ACCOUNT_BY_ID, "SELECT 1 FROM account WHERE id = ?", CONNECTION_SYNCH); PrepareStatement(LOGIN_INS_IP_BANNED, "INSERT INTO ip_banned (ip, bandate, unbandate, bannedby, banreason) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?)", CONNECTION_ASYNC); PrepareStatement(LOGIN_DEL_IP_NOT_BANNED, "DELETE FROM ip_banned WHERE ip = ?", CONNECTION_ASYNC); - PrepareStatement(LOGIN_INS_ACCOUNT_BANNED, "INSERT INTO account_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC); + PrepareStatement(LOGIN_INS_ACCOUNT_BANNED, "INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC); PrepareStatement(LOGIN_UPD_ACCOUNT_NOT_BANNED, "UPDATE account_banned SET active = 0 WHERE id = ? AND active != 0", CONNECTION_ASYNC); PrepareStatement(LOGIN_DEL_REALM_CHARACTERS_BY_REALM, "DELETE FROM realmcharacters WHERE acctid = ? AND realmid = ?", CONNECTION_ASYNC); PrepareStatement(LOGIN_DEL_REALM_CHARACTERS, "DELETE FROM realmcharacters WHERE acctid = ?", CONNECTION_ASYNC); From 043d22a16b350110bcc1c2694dc43940dfb354be Mon Sep 17 00:00:00 2001 From: tkrokli Date: Mon, 2 Apr 2018 11:24:11 +0200 Subject: [PATCH 06/39] Object.cpp: TC_LOG_ERROR grammar improvement Bad English grammar previously used in the error log: "Attempt get value from non-existed value field" After the change: "Attempt to get value from non-existing value field" --- src/server/game/Entities/Object/Object.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index c823c89613..ad07f119ba 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1153,7 +1153,7 @@ void Object::ApplyModFlag64(uint16 index, uint64 flag, bool apply) bool Object::PrintIndexError(uint32 index, bool set) const { - TC_LOG_ERROR("misc", "Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u", (set ? "set value to" : "get value from"), index, m_valuesCount, GetTypeId(), m_objectType); + TC_LOG_ERROR("misc", "Attempt to %s non-existing value field: %u (count: %u) for object typeid: %u type mask: %u", (set ? "set value to" : "get value from"), index, m_valuesCount, GetTypeId(), m_objectType); // ASSERT must fail after function call return false; From 9b053a70344245cadfb3b41957d270bb25daad9f Mon Sep 17 00:00:00 2001 From: JorTurFer <36899226+JorTurFer@users.noreply.github.com> Date: Mon, 2 Apr 2018 14:02:34 +0200 Subject: [PATCH 07/39] Update World.cpp The command .ban character may insert the ban first, and update with the unban. This change fix it --- src/server/game/World/World.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index b18f0a64ed..1b084bfce5 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2710,19 +2710,21 @@ BanReturn World::BanCharacter(std::string const& name, std::string const& durati } else guid = banned->GetGUID().GetCounter(); - + //Use transaction in order to ensure the order of the queries + SQLTransaction trans = CharacterDatabase.BeginTransaction(); // make sure there is only one active ban PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER_BAN); stmt->setUInt32(0, guid); - CharacterDatabase.Execute(stmt); + trans->Append(stmt); stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHARACTER_BAN); stmt->setUInt32(0, guid); stmt->setUInt32(1, duration_secs); stmt->setString(2, author); stmt->setString(3, reason); - CharacterDatabase.Execute(stmt); - + trans->Append(stmt); + CharacterDatabase.CommitTransaction(trans); + if (banned) banned->GetSession()->KickPlayer(); From 6b6ab504f9e1d952bc8f35f985699c62a787b37c Mon Sep 17 00:00:00 2001 From: Aokromes Date: Tue, 3 Apr 2018 01:19:23 +0200 Subject: [PATCH 08/39] Update World.cpp --- src/server/game/World/World.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 1b084bfce5..025bac2b06 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2724,7 +2724,7 @@ BanReturn World::BanCharacter(std::string const& name, std::string const& durati stmt->setString(3, reason); trans->Append(stmt); CharacterDatabase.CommitTransaction(trans); - + if (banned) banned->GetSession()->KickPlayer(); From 89d893c0b6040dfe9a300b9c6efe530ccdf3371b Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 07:38:38 +0200 Subject: [PATCH 09/39] Core/Misc: whitespace/tab cleanup --- src/server/game/World/World.cpp | 2 +- .../scripts/Kalimdor/zone_bloodmyst_isle.cpp | 14 +++++------ .../boss_anubarak_trial.cpp | 2 +- .../boss_blood_queen_lana_thel.cpp | 8 +++--- .../Northrend/VioletHold/boss_cyanigosa.cpp | 2 +- .../Northrend/VioletHold/boss_erekem.cpp | 2 +- .../Northrend/VioletHold/boss_ichoron.cpp | 2 +- .../Northrend/VioletHold/boss_xevozz.cpp | 2 +- .../Northrend/VioletHold/boss_zuramat.cpp | 2 +- .../scripts/Northrend/zone_borean_tundra.cpp | 25 +++++++++++-------- 10 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 025bac2b06..6c2766fe62 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2711,7 +2711,7 @@ BanReturn World::BanCharacter(std::string const& name, std::string const& durati else guid = banned->GetGUID().GetCounter(); //Use transaction in order to ensure the order of the queries - SQLTransaction trans = CharacterDatabase.BeginTransaction(); + SQLTransaction trans = CharacterDatabase.BeginTransaction(); // make sure there is only one active ban PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER_BAN); stmt->setUInt32(0, guid); diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 3326b19550..6c86f8ac72 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -68,9 +68,9 @@ public: void JustDied(Unit* killer) override { - if (!killer) - return; - + if (!killer) + return; + uint32 spawnCreatureID = 0; switch (urand(0, 2)) @@ -265,10 +265,10 @@ public: { me->SetObjectScale(1.0f); _events.Reset(); - - if (!killer) - return; - + + if (!killer) + return; + if (Creature* legoso = me->FindNearestCreature(NPC_LEGOSO, SIZE_OF_GRIDS)) { Group* group = me->GetLootRecipientGroup(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 2a2a0a685b..cc4ec80fea 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -480,7 +480,7 @@ class npc_swarm_scarab : public CreatureScript void JustDied(Unit* killer) override { - if (killer) + if (killer) DoCast(killer, SPELL_TRAITOR_KING); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 8c485a8d60..23234001d6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -202,10 +202,10 @@ class boss_blood_queen_lana_thel : public CreatureScript DoCastAOE(SPELL_BLOOD_INFUSION_CREDIT, true); CleanAuras(); - - if (!killer) - return; - + + if (!killer) + return; + // Blah, credit the quest if (_creditBloodQuickening) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index fab3265b7d..4a6f5e0fc8 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -67,7 +67,7 @@ class boss_cyanigosa : public CreatureScript void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); - _JustDied(); + _JustDied(); } void MoveInLineOfSight(Unit* /*who*/) override { } diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 1ac10fe4e1..64f0e1d3b7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -96,7 +96,7 @@ class boss_erekem : public CreatureScript void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); - _JustDied(); + _JustDied(); } bool CheckGuardAuras(Creature* guard) const diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index ed6be37b23..7053bc0eca 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -167,7 +167,7 @@ class boss_ichoron : public CreatureScript void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); - _JustDied(); + _JustDied(); } void JustSummoned(Creature* summon) override diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 9802ff1bb4..acd1bd74c2 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -118,7 +118,7 @@ class boss_xevozz : public CreatureScript void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); - _JustDied(); + _JustDied(); } void SpellHit(Unit* /*who*/, SpellInfo const* spell) override diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 066787e9af..a8551f9e55 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -107,7 +107,7 @@ class boss_zuramat : public CreatureScript void JustDied(Unit* /*killer*/) override { Talk(SAY_DEATH); - _JustDied(); + _JustDied(); } void KilledUnit(Unit* victim) override diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 33800bb6b2..c9f73782aa 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -371,9 +371,9 @@ public: void JustDied(Unit* killer) override { - if (!killer || killer->GetTypeId() != TYPEID_PLAYER) - return; - + if (!killer || killer->GetTypeId() != TYPEID_PLAYER) + return; + Player* player = killer->ToPlayer(); if (player->GetQuestStatus(QUEST_TAKEN_BY_THE_SCOURGE) == QUEST_STATUS_INCOMPLETE) @@ -1240,26 +1240,29 @@ public: { DoCastVictim(SPELL_SHADOW_BOLT); shadowBoltTimer = urand(5000, 12000); - } else shadowBoltTimer -= diff; + } + else shadowBoltTimer -= diff; if (deflectionTimer <= diff) { DoCastVictim(SPELL_DEFLECTION); deflectionTimer = urand(20000, 25000); - } else deflectionTimer -= diff; + } + else deflectionTimer -= diff; if (soulBlastTimer <= diff) { DoCastVictim(SPELL_SOUL_BLAST); soulBlastTimer = urand(12000, 18000); - } else soulBlastTimer -= diff; + } + else soulBlastTimer -= diff; } DoMeleeAttackIfReady(); - } + } - void JustDied(Unit* killer) override - { + void JustDied(Unit* killer) override + { if (!leryssaGUID || !arlosGUID) return; @@ -1276,8 +1279,8 @@ public: leryssa->ClearUnitState(UNIT_STATE_STUNNED); leryssa->SetWalk(false); leryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f); - - if (killer && killer->GetTypeId() == TYPEID_PLAYER) + + if (killer && killer->GetTypeId() == TYPEID_PLAYER) killer->ToPlayer()->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); } }; From 53690d1f7f3dd960ca34e148691c55817baca2c3 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 07:47:30 +0200 Subject: [PATCH 10/39] Core/Spells: don't save Magma aura. --- sql/base/characters_database.sql | 5 +++-- sql/updates/characters/3.3.5/9999_99_99_99_characters.sql | 2 ++ src/server/game/Spells/Auras/SpellAuras.cpp | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 sql/updates/characters/3.3.5/9999_99_99_99_characters.sql diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 97e9ceac9d..253489b295 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -2953,8 +2953,9 @@ INSERT INTO `updates` VALUES ('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0), ('2018_01_15_00_characters.sql','43C8E4549E1AA9610B377BC7139C88C63D0DC193','ARCHIVED','2018-01-15 00:00:00',0), ('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0), -('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','RELEASED','2018-03-16 00:00:00',0), -('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','RELEASED','2018-03-25 00:00:00',0); +('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0), +('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0), +('9999_99_99_99_characters.sql','EAE07A3E42B5E732FFEBEC88717A5BFA696B33FB','ARCHIVED','2018-03-23 12:46:28',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql b/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql new file mode 100644 index 0000000000..38b508fc63 --- /dev/null +++ b/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `pet_aura` WHERE `spell`=57634; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 966b0d416b..dff75d90a9 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1025,6 +1025,7 @@ bool Aura::CanBeSaved() const case 44413: // Incanter's Absorption case 40075: // Fel Flak Fire case 55849: // Power Spark + case 57634: // Magma return false; } From ffc5e87f3df6c7e9248f68f6279341d7e17a3e3c Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Fri, 23 Mar 2018 16:16:01 -0600 Subject: [PATCH 11/39] tab2space --- src/server/game/Spells/Auras/SpellAuras.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index dff75d90a9..28b415379b 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1025,7 +1025,7 @@ bool Aura::CanBeSaved() const case 44413: // Incanter's Absorption case 40075: // Fel Flak Fire case 55849: // Power Spark - case 57634: // Magma + case 57634: // Magma return false; } From 4da3cbf3aaeed2fe18bb66cc002bcb6feb6c9647 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 07:49:59 +0200 Subject: [PATCH 12/39] improved fix --- sql/base/characters_database.sql | 2 +- sql/updates/characters/3.3.5/9999_99_99_99_characters.sql | 2 +- src/server/game/Spells/Auras/SpellAuras.cpp | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 253489b295..5741df598f 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -2955,7 +2955,7 @@ INSERT INTO `updates` VALUES ('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0), ('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0), ('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0), -('9999_99_99_99_characters.sql','EAE07A3E42B5E732FFEBEC88717A5BFA696B33FB','ARCHIVED','2018-03-23 12:46:28',0); +('9999_99_99_99_characters.sql','A1543319D97AC030143A61D4CE40CB9A017B8232','ARCHIVED','2018-03-23 12:46:28',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql b/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql index 38b508fc63..d2d8f7e201 100644 --- a/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql +++ b/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql @@ -1,2 +1,2 @@ -- -DELETE FROM `pet_aura` WHERE `spell`=57634; +DELETE FROM `pet_aura` WHERE `spell` IN (28801, 37025, 42201, 57634); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 28b415379b..4c9d2ee314 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1025,7 +1025,6 @@ bool Aura::CanBeSaved() const case 44413: // Incanter's Absorption case 40075: // Fel Flak Fire case 55849: // Power Spark - case 57634: // Magma return false; } @@ -1041,6 +1040,11 @@ bool Aura::CanBeSaved() const if (GetCastItemGUID() && IsPermanent()) return false; + // don't save liquid auras + for (LiquidTypeEntry const* liquid : sLiquidTypeStore) + if (liquid->SpellId && liquid->SpellId == GetId()) + return false; + return true; } From 395ad03cd4e52a5e28295a0b329bd74f5fc7a135 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 07:52:42 +0200 Subject: [PATCH 13/39] Adding atrribute custom SPELL_ATTR0_CU_LIQUID_AURA --- src/server/game/Spells/Auras/SpellAuras.cpp | 9 ++++----- src/server/game/Spells/SpellInfo.h | 1 + src/server/game/Spells/SpellMgr.cpp | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 4c9d2ee314..da38bd6150 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -992,6 +992,10 @@ bool Aura::CanBeSaved() const return false; } + // don't save liquid auras + if (GetSpellInfo()->HasAttribute(SPELL_ATTR0_CU_LIQUID_AURA)) + return false; + // Can't be saved - aura handler relies on calculated amount and changes it if (HasEffectType(SPELL_AURA_CONVERT_RUNE)) return false; @@ -1040,11 +1044,6 @@ bool Aura::CanBeSaved() const if (GetCastItemGUID() && IsPermanent()) return false; - // don't save liquid auras - for (LiquidTypeEntry const* liquid : sLiquidTypeStore) - if (liquid->SpellId && liquid->SpellId == GetId()) - return false; - return true; } diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 8746ccceb2..3303bd2a6a 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -192,6 +192,7 @@ enum SpellCustomAttributes SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER = 0x00010000, SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET = 0x00020000, SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET = 0x00040000, + SPELL_ATTR0_CU_LIQUID_AURA = 0x00400000, SPELL_ATTR0_CU_NEGATIVE = SPELL_ATTR0_CU_NEGATIVE_EFF0 | SPELL_ATTR0_CU_NEGATIVE_EFF1 | SPELL_ATTR0_CU_NEGATIVE_EFF2 }; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 78cc1eb7de..710730f924 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2809,6 +2809,12 @@ void SpellMgr::LoadSpellInfoCustomAttributes() spellInfo->_InitializeExplicitTargetMask(); } + // add attribute custom to liquid auras + for (LiquidTypeEntry const* liquid : sLiquidTypeStore) + if (liquid->SpellId) + if (spellInfo = _GetSpellInfo(liquid->SpellId)) + spellInfo->AttributesCu |= SPELL_ATTR0_CU_LIQUID_AURA; + TC_LOG_INFO("server.loading", ">> Loaded SpellInfo custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime)); } From 42dc0a739c8b02c1f2db45e4027f0f227647f345 Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Sun, 1 Apr 2018 22:02:37 -0600 Subject: [PATCH 14/39] Fix build --- src/server/game/Spells/SpellMgr.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 710730f924..1ed01f1a4f 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2812,8 +2812,11 @@ void SpellMgr::LoadSpellInfoCustomAttributes() // add attribute custom to liquid auras for (LiquidTypeEntry const* liquid : sLiquidTypeStore) if (liquid->SpellId) - if (spellInfo = _GetSpellInfo(liquid->SpellId)) + { + spellInfo = _GetSpellInfo(liquid->SpellId); + if (spellInfo) spellInfo->AttributesCu |= SPELL_ATTR0_CU_LIQUID_AURA; + } TC_LOG_INFO("server.loading", ">> Loaded SpellInfo custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime)); } From 0b94ee0358a979327f755766baeb9a3b25094ca1 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 07:55:01 +0200 Subject: [PATCH 15/39] cosmetic change --- src/server/game/Spells/SpellMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 1ed01f1a4f..039eed7670 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2809,7 +2809,7 @@ void SpellMgr::LoadSpellInfoCustomAttributes() spellInfo->_InitializeExplicitTargetMask(); } - // add attribute custom to liquid auras + // add custom attribute to liquid auras for (LiquidTypeEntry const* liquid : sLiquidTypeStore) if (liquid->SpellId) { From 042a0936bd7d2b8556ba95f214294fdeb1537b94 Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Mon, 2 Apr 2018 16:38:02 -0600 Subject: [PATCH 16/39] adding braces --- src/server/game/Spells/SpellMgr.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 039eed7670..353f20079c 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2811,12 +2811,14 @@ void SpellMgr::LoadSpellInfoCustomAttributes() // add custom attribute to liquid auras for (LiquidTypeEntry const* liquid : sLiquidTypeStore) + { if (liquid->SpellId) { spellInfo = _GetSpellInfo(liquid->SpellId); if (spellInfo) spellInfo->AttributesCu |= SPELL_ATTR0_CU_LIQUID_AURA; } + } TC_LOG_INFO("server.loading", ">> Loaded SpellInfo custom attributes in %u ms", GetMSTimeDiffToNow(oldMSTime)); } From 85a21dfbf078c6493b081ce5ff7b39588580dd82 Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Mon, 2 Apr 2018 18:26:10 -0600 Subject: [PATCH 17/39] Delete 9999_99_99_99_characters.sql --- sql/updates/characters/3.3.5/9999_99_99_99_characters.sql | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 sql/updates/characters/3.3.5/9999_99_99_99_characters.sql diff --git a/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql b/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql deleted file mode 100644 index d2d8f7e201..0000000000 --- a/sql/updates/characters/3.3.5/9999_99_99_99_characters.sql +++ /dev/null @@ -1,2 +0,0 @@ --- -DELETE FROM `pet_aura` WHERE `spell` IN (28801, 37025, 42201, 57634); From e9941af6e413d9611417752b3e221ada3ea922a5 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 07:56:08 +0200 Subject: [PATCH 18/39] Update characters_database.sql --- sql/base/characters_database.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 5741df598f..97d04fa034 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -2954,8 +2954,7 @@ INSERT INTO `updates` VALUES ('2018_01_15_00_characters.sql','43C8E4549E1AA9610B377BC7139C88C63D0DC193','ARCHIVED','2018-01-15 00:00:00',0), ('2018_02_16_00_characters.sql','F1254689CE8A0B0AF149E557830287FF583B8D91','ARCHIVED','2018-02-16 00:00:00',0), ('2018_03_16_00_characters.sql','722EAFB7F508882F584DCAE61F97F1A11EDE126E','ARCHIVED','2018-03-16 00:00:00',0), -('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0), -('9999_99_99_99_characters.sql','A1543319D97AC030143A61D4CE40CB9A017B8232','ARCHIVED','2018-03-23 12:46:28',0); +('2018_03_25_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2018-03-25 00:00:00',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; From 2355ee299072e8949f312ca9ae3eecda7b5180cf Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:34:45 +0200 Subject: [PATCH 19/39] DB/Waypoints: Deathspeaker Selendre Closes #21732 --- .../world/3.3.5/2018_04_04_00_world_335.sql | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql new file mode 100644 index 0000000000..d01974aea4 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql @@ -0,0 +1,181 @@ +-- Add pool for Deathspeaker Selendre +SET @GUID := 64986; +SET @POOL := 386; +DELETE FROM `creature` WHERE `guid`=@GUID; +INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES +(@GUID,10827,0,0,0,1,1,0,0,2519.05,-3694.31,180.13,5.47616,72000,0,0,2550,5206,2,0,0,0,"",0); + +DELETE FROM `pool_template` WHERE `entry`=@POOL; +INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES +(@POOL,1,"Deathspeaker Selendre"); + +DELETE FROM `pool_creature` WHERE `pool_entry`=@POOL; +INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES +(@GUID,@POOL,0,"Deathspeaker Selendre (10827) - Spawn 1"), +(86755,@POOL,0,"Deathspeaker Selendre (10827) - Spawn 2"); + +-- Add pathing for Deathspeaker Selendre (Spawn 1) +DELETE FROM `creature_addon` WHERE `guid`=@GUID; +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES +(@GUID,@GUID*10,0,0,1,0,""); + +DELETE FROM `waypoint_data` WHERE `id`=@GUID*10; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(@GUID*10,1,2519.05,-3694.31,180.13,0,0,0,0,100,0), +(@GUID*10,2,2528.03,-3700.27,179.738,0,0,0,0,100,0), +(@GUID*10,3,2534.58,-3716.14,179.306,0,0,0,0,100,0), +(@GUID*10,4,2538.02,-3734.97,178.969,0,0,0,0,100,0), +(@GUID*10,5,2536.86,-3749.52,178.694,0,0,0,0,100,0), +(@GUID*10,6,2531.39,-3761.01,179.057,0,0,0,0,100,0), +(@GUID*10,7,2518.99,-3777.55,177.511,0,0,0,0,100,0), +(@GUID*10,8,2525.06,-3781.92,177.836,0,0,0,0,100,0), +(@GUID*10,9,2530.46,-3785.8,181.689,0,0,0,0,100,0), +(@GUID*10,10,2537.83,-3791.9,185.059,0,0,0,0,100,0), +(@GUID*10,11,2556.67,-3806.27,185.059,0,0,0,0,100,0), +(@GUID*10,12,2552.53,-3811.77,185.059,0,0,0,0,100,0), +(@GUID*10,13,2554.51,-3818.25,182.059,0,0,0,0,100,0), +(@GUID*10,14,2561.12,-3822.2,182.059,0,0,0,0,100,0), +(@GUID*10,15,2568.87,-3821.11,182.059,0,0,0,0,100,0), +(@GUID*10,16,2575.12,-3811.81,182.059,0,0,0,0,100,0), +(@GUID*10,17,2572.09,-3803.6,182.059,0,0,0,0,100,0), +(@GUID*10,18,2565.51,-3800.57,182.244,0,0,0,0,100,0), +(@GUID*10,19,2560.86,-3801,185.058,0,0,0,0,100,0), +(@GUID*10,20,2557.16,-3806.54,185.058,0,0,0,0,100,0), +(@GUID*10,21,2537.49,-3792.32,185.058,0,0,0,0,100,0), +(@GUID*10,22,2529.21,-3786.65,181.345,0,0,0,0,100,0), +(@GUID*10,23,2522.47,-3782.02,177.509,0,0,0,0,100,0), +(@GUID*10,24,2511.13,-3782.1,177.506,0,0,0,0,100,0), +(@GUID*10,25,2505.32,-3766.45,177.742,0,0,0,0,100,0), +(@GUID*10,26,2499.29,-3765.75,177.507,0,0,0,0,100,0), +(@GUID*10,27,2493.61,-3765.09,177.507,0,0,0,0,100,0), +(@GUID*10,28,2488.06,-3772.43,177.667,0,0,0,0,100,0), +(@GUID*10,29,2478.6,-3767.26,180.055,0,0,0,0,100,0), +(@GUID*10,30,2463.88,-3762.3,177.666,0,0,0,0,100,0), +(@GUID*10,31,2446.59,-3773.59,178.28,0,0,0,0,100,0), +(@GUID*10,32,2439.01,-3778.42,182.265,0,0,0,0,100,0), +(@GUID*10,33,2432.32,-3782.88,185.472,0,0,0,0,100,0), +(@GUID*10,34,2411.83,-3797.16,185.472,0,0,0,0,100,0), +(@GUID*10,35,2415.58,-3802.36,185.472,0,0,0,0,100,0), +(@GUID*10,36,2414.56,-3808.81,182.472,0,0,0,0,100,0), +(@GUID*10,37,2406.03,-3813.16,182.472,0,0,0,0,100,0), +(@GUID*10,38,2398.47,-3811.12,182.472,0,0,0,0,100,0), +(@GUID*10,39,2394.15,-3802.58,182.472,0,0,0,0,100,0), +(@GUID*10,40,2395.78,-3795.05,182.472,0,0,0,0,100,0), +(@GUID*10,41,2402.87,-3790.52,182.557,0,0,0,0,100,0), +(@GUID*10,42,2407.82,-3791.89,185.472,0,0,0,0,100,0), +(@GUID*10,43,2412.66,-3796.79,185.472,0,0,0,0,100,0), +(@GUID*10,44,2431.26,-3783.83,185.472,0,0,0,0,100,0), +(@GUID*10,45,2439.74,-3777.69,181.587,0,0,0,0,100,0), +(@GUID*10,46,2445.84,-3773.07,178.365,0,0,0,0,100,0), +(@GUID*10,47,2455.68,-3785.4,178.221,0,0,0,0,100,0), +(@GUID*10,48,2457.6,-3806.44,178.436,0,0,0,0,100,0), +(@GUID*10,49,2453.84,-3819.84,178.737,0,0,0,0,100,0), +(@GUID*10,50,2463.63,-3826.59,180.355,0,0,0,0,100,0), +(@GUID*10,51,2476.42,-3822.85,181.172,0,0,0,0,100,0), +(@GUID*10,52,2485.1,-3812.75,179.831,0,0,0,0,100,0), +(@GUID*10,53,2480.62,-3800.22,178.74,0,0,0,0,100,0), +(@GUID*10,54,2459.22,-3787.09,178.419,0,0,0,0,100,0), +(@GUID*10,55,2444.28,-3759.46,177.54,0,0,0,0,100,0), +(@GUID*10,56,2418.65,-3747.28,178.11,0,0,0,0,100,0), +(@GUID*10,57,2402.3,-3746.86,179.548,0,0,0,0,100,0), +(@GUID*10,58,2389.34,-3753.05,180.059,0,0,0,0,100,0), +(@GUID*10,59,2393.41,-3730.55,179.646,0,0,0,0,100,0), +(@GUID*10,60,2391.13,-3712.96,180.489,0,0,0,0,100,0), +(@GUID*10,61,2382.1,-3695.87,178.616,0,0,0,0,100,0), +(@GUID*10,62,2383.45,-3676.65,178.75,0,0,0,0,100,0), +(@GUID*10,63,2398.82,-3677.72,180.299,0,0,0,0,100,0), +(@GUID*10,64,2416.71,-3671.23,177.938,0,0,0,0,100,0), +(@GUID*10,65,2432.07,-3674.78,178.847,0,0,0,0,100,0), +(@GUID*10,66,2444.61,-3659.84,178.354,0,0,0,0,100,0), +(@GUID*10,67,2449.41,-3654.12,178.171,0,0,0,0,100,0), +(@GUID*10,68,2444.29,-3641.95,179.354,0,0,0,0,100,0), +(@GUID*10,69,2429.71,-3633.13,179.324,0,0,0,0,100,0), +(@GUID*10,70,2432.72,-3624.53,179.08,0,0,0,0,100,0), +(@GUID*10,71,2445.42,-3621.45,179.625,0,0,0,0,100,0), +(@GUID*10,72,2450.93,-3630.38,178.698,0,0,0,0,100,0), +(@GUID*10,73,2452.16,-3632.38,178.682,0,0,0,0,100,0), +(@GUID*10,74,2463.72,-3640.3,178.907,0,0,0,0,100,0), +(@GUID*10,75,2459.88,-3661.08,177.627,0,0,0,0,100,0), +(@GUID*10,76,2473.04,-3676.41,178.342,0,0,0,0,100,0), +(@GUID*10,77,2479.66,-3692.7,179.121,0,0,0,0,100,0), +(@GUID*10,78,2485.39,-3706.78,180.135,0,0,0,0,100,0), +(@GUID*10,79,2483.55,-3717.48,181.223,0,0,0,0,100,0), +(@GUID*10,80,2472.62,-3722.2,181.107,0,0,0,0,100,0), +(@GUID*10,81,2460.63,-3708.49,178.649,0,0,0,0,100,0), +(@GUID*10,82,2462.01,-3697.02,178.186,0,0,0,0,100,0), +(@GUID*10,83,2473.57,-3694.13,179.281,0,0,0,0,100,0), +(@GUID*10,84,2491.08,-3694.42,179.212,0,0,0,0,100,0); + +-- Add pathing for Deathspeaker Selendre (Spawn 2) +UPDATE `creature` SET `MovementType`=2 WHERE `guid`=86755; +DELETE FROM `creature_addon` WHERE `guid`=86755; +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES +(86755,867550,0,0,1,0,""); + +DELETE FROM `waypoint_data` WHERE `id`=867550; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(867550,1,2633.53,-5512.31,158.266,0,0,0,0,100,0), +(867550,2,2641.01,-5540.31,159.216,0,0,0,0,100,0), +(867550,3,2653.46,-5552.56,159.34,0,0,0,0,100,0), +(867550,4,2668.72,-5552.25,160.452,0,0,0,0,100,0), +(867550,5,2679.62,-5537.82,160.818,0,0,0,0,100,0), +(867550,6,2683.71,-5518.79,159.878,0,0,0,0,100,0), +(867550,7,2695.21,-5511.24,158.123,0,0,0,0,100,0), +(867550,8,2704.09,-5499.15,157.063,0,0,0,0,100,0), +(867550,9,2708.13,-5475.21,156.953,0,0,0,0,100,0), +(867550,10,2731.05,-5464.05,157.015,0,0,0,0,100,0), +(867550,11,2731.99,-5480.38,161.471,0,0,0,0,100,0), +(867550,12,2732.98,-5491.9,162.069,0,0,0,0,100,0), +(867550,13,2741.12,-5501.31,166.418,0,0,0,0,100,0), +(867550,14,2748.96,-5510.25,166.428,0,0,0,0,100,0), +(867550,15,2754.52,-5508.12,165.928,0,0,0,0,100,0), +(867550,16,2757.52,-5509.1,164.573,0,0,0,0,100,0), +(867550,17,2758.95,-5511.08,163.551,0,0,0,0,100,0), +(867550,18,2758.95,-5513.17,163.038,0,0,0,0,100,0), +(867550,19,2755.42,-5517.98,161.743,0,0,0,0,100,0), +(867550,20,2762.02,-5525.39,161.737,0,0,0,0,100,0), +(867550,21,2769.75,-5524.21,161.737,0,0,0,0,100,0), +(867550,22,2776.09,-5530.58,161.737,0,0,0,0,100,0), +(867550,23,2766.78,-5538.91,161.737,0,0,0,0,100,0), +(867550,24,2762.42,-5537.22,161.737,0,0,0,0,100,0), +(867550,25,2759.18,-5531.55,161.737,0,0,0,0,100,0), +(867550,26,2761.79,-5526.45,161.737,0,0,0,0,100,0), +(867550,27,2759.07,-5522.23,161.737,0,0,0,0,100,0), +(867550,28,2755.78,-5518.92,161.74,0,0,0,0,100,0), +(867550,29,2749.79,-5521.54,163.08,0,0,0,0,100,0), +(867550,30,2745.88,-5520.01,164.442,0,0,0,0,100,0), +(867550,31,2745.74,-5516.86,165.591,0,0,0,0,100,0), +(867550,32,2746.29,-5515.2,166.298,0,0,0,0,100,0), +(867550,33,2748.89,-5512.05,166.43,0,0,0,0,100,0), +(867550,34,2740.96,-5502.26,166.418,0,0,0,0,100,0), +(867550,35,2734.43,-5494.47,162.071,0,0,0,0,100,0), +(867550,36,2724.37,-5483.28,161.458,0,0,0,0,100,0), +(867550,37,2702.21,-5460.21,157.012,0,0,0,0,100,0), +(867550,38,2688.36,-5456.17,157.155,0,0,0,0,100,0), +(867550,39,2669.61,-5456.86,156.929,0,0,0,0,100,0), +(867550,40,2660.04,-5444.49,156.926,0,0,0,0,100,0), +(867550,41,2650.58,-5424.81,157.095,0,0,0,0,100,0), +(867550,42,2656.66,-5407.65,158.167,0,0,0,0,100,0), +(867550,43,2672.4,-5398.03,157.001,0,0,0,0,100,0), +(867550,44,2695.58,-5373.55,157.803,0,0,0,0,100,0), +(867550,45,2725.65,-5375.05,157.781,0,0,0,0,100,0), +(867550,46,2751.57,-5375.31,156.949,0,0,0,0,100,0), +(867550,47,2771.12,-5384.22,157.482,0,0,0,0,100,0), +(867550,48,2784.59,-5399.42,160.854,0,0,0,0,100,0), +(867550,49,2797.84,-5398.13,162.834,0,0,0,0,100,0), +(867550,50,2808.66,-5407.03,162.822,0,0,0,0,100,0), +(867550,51,2814.93,-5418.1,160.679,0,0,0,0,100,0), +(867550,52,2808.52,-5434.4,158.947,0,0,0,0,100,0), +(867550,53,2796.89,-5447.17,160.524,0,0,0,0,100,0), +(867550,54,2783.1,-5450.75,161.02,0,0,0,0,100,0), +(867550,55,2752.6,-5458.67,157,0,0,0,0,100,0), +(867550,56,2738.31,-5456.31,156.946,0,0,0,0,100,0), +(867550,57,2725.15,-5462.05,156.962,0,0,0,0,100,0), +(867550,58,2711.18,-5475.83,157.095,0,0,0,0,100,0), +(867550,59,2685.64,-5474.16,156.989,0,0,0,0,100,0), +(867550,60,2669.68,-5451.54,157.027,0,0,0,0,100,0), +(867550,61,2645.86,-5449.2,156.941,0,0,0,0,100,0), +(867550,62,2632.98,-5462.23,157.103,0,0,0,0,100,0), +(867550,63,2626.28,-5483.26,157.083,0,0,0,0,100,0), +(867550,64,2616.9,-5493.82,157.194,0,0,0,0,100,0), +(867550,65,2616.39,-5504.67,158.186,0,0,0,0,100,0); From 0965c378c162275b0ec57d48df1f907d0c8e9434 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:35:26 +0200 Subject: [PATCH 20/39] DB/Waypoints: Scarlet Smith Closes #21733 --- .../world/3.3.5/2018_04_04_01_world_335.sql | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql new file mode 100644 index 0000000000..be714b22e5 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql @@ -0,0 +1,36 @@ +-- Pathing for Scarlet Smith +UPDATE `creature` SET `position_x`=2990.86, `position_y`=-1458.58, `position_z`=146.273, `spawndist`=0, `MovementType`=2 WHERE `guid`=61634; + +DELETE FROM `creature_addon` WHERE `guid`=61634; +INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES +(61634,616340,0,0,1,0,""); + +DELETE FROM `waypoint_data` WHERE `id`=616340; +INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES +(616340,1,2990.86,-1458.58,146.273,0,0,0,0,100,0), +(616340,2,2978.03,-1450.18,145.989,0,0,0,0,100,0), +(616340,3,2962.46,-1452.65,145.716,0,0,0,0,100,0), +(616340,4,2963.32,-1464.52,145.592,0,0,0,0,100,0), +(616340,5,2973.34,-1468.99,145.754,0,0,0,0,100,0), +(616340,6,2974.3,-1475.57,145.509,0,0,0,0,100,0), +(616340,7,2974.67,-1484.54,146.999,0,0,0,0,100,0), +(616340,8,2975.15,-1490.23,147.022,0,0,0,0,100,0), +(616340,9,2984.02,-1491.19,147.042,6.18384,20000,0,616340,100,0), +(616340,10,2974.94,-1498.83,147.042,3.80251,20000,0,616340,100,0), +(616340,11,2978.95,-1500.69,146.999,0,0,0,0,100,0), +(616340,12,2979.92,-1509.63,145.319,0,0,0,0,100,0), +(616340,13,2996.73,-1508.11,146.204,0,0,0,0,100,0), +(616340,14,3004.9,-1514.71,145.967,0,0,0,0,100,0), +(616340,15,3005.29,-1522.01,146.069,0,0,0,0,100,0), +(616340,16,2992.68,-1516.82,146.041,0,0,0,0,100,0), +(616340,17,2996.49,-1507.15,146.152,0,0,0,0,100,0), +(616340,18,3004.37,-1496.56,146.397,0,0,0,0,100,0), +(616340,19,3005.32,-1481.19,145.908,0,0,0,0,100,0), +(616340,20,3008.27,-1470.62,146.531,0,0,0,0,100,0), +(616340,21,3002.19,-1461.06,146.273,0,0,0,0,100,0), +(616340,22,2998.02,-1460.04,145.81,0,0,0,0,100,0); + +DELETE FROM `waypoint_scripts` WHERE `id`=616340; +INSERT INTO `waypoint_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`, `guid`) VALUES +(616340,1,1,69,1,0,0,0,0,0,5), +(616340,18,1,0,1,0,0,0,0,0,6); From da3ded6ba614e18fa98ba68ebb5404117ed47e99 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:35:58 +0200 Subject: [PATCH 21/39] DB/Quest: Corrupted Sabers Closes #21734 --- .../world/3.3.5/2018_04_04_02_world_335.sql | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql new file mode 100644 index 0000000000..1540aba2ac --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql @@ -0,0 +1,21 @@ +-- Common Kitten +DELETE FROM `creature_text` WHERE `CreatureID` IN (9937,9936); +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(9937,0,0,"%s jumps into the moonwell, and goes underwater...",16,0,100,0,0,0,5939,0,"Common Kitten"), +(9936,1,0,"%s follows $n obediently.",16,0,100,0,0,0,5940,0,"Corrupted Kitten"); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=9937 AND `source_type`=0 AND `id` IN (0,1,2); +DELETE FROM `smart_scripts` WHERE `entryorguid`=993700 AND `source_type`=9; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(9937,0,0,0,54,0,100,0,0,0,0,0,80,993700,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Just Summoned - Run Script"), +(993700,9,0,0,0,0,100,0,0,0,0,0,103,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Set Rooted On"), +(993700,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,23,0,0,0,0,0,0,0,"Common Kitten - On Script - Say Line 0"), +(993700,9,2,0,0,0,100,0,4000,4000,0,0,36,9936,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Update Template To 'Corrupted Kitten'"), +(993700,9,3,0,0,0,100,0,0,0,0,0,11,16510,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Cast 'Corrupted Saber Visual (DND)'"), +(993700,9,4,0,0,0,100,0,0,0,0,0,3,10042,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Morph to Entry 'Corrupted Kitten'"), +(993700,9,5,0,0,0,100,0,2000,2000,0,0,103,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Common Kitten - On Script - Set Rooted Off"), +(993700,9,6,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,23,0,0,0,0,0,0,0,"Common Kitten - On Script - Say Line 1"); + +DELETE FROM `gossip_menu` WHERE `MenuID`=55002; -- Add Gossip Text +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(55002,3550,0); From 04da4f885e31f7a19d51254dc3b60b44e57b68f2 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:36:31 +0200 Subject: [PATCH 22/39] DB/Texts: Missing "Enrage" emote text for some creatures Closes #21735 --- .../world/3.3.5/2018_04_04_03_world_335.sql | 271 ++++++++++++++++++ 1 file changed, 271 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_03_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql new file mode 100644 index 0000000000..2d4d55b7a5 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql @@ -0,0 +1,271 @@ +-- Chillwind Ravager +DELETE FROM `smart_scripts` WHERE `entryorguid`=7449 AND `source_type`=0 AND `id`=1; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7449,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chillwind Ravager - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=7449; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(7449,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Chillwind Ravager"); + +-- Crazed Owlbeast +DELETE FROM `smart_scripts` WHERE `entryorguid`=7452 AND `source_type`=0 AND `id`=1; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7452,0,1,0,2,0,100,1,0,50,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Crazed Owlbeast - Between 0-50% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=7452; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(7452,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Crazed Owlbeast"); + +-- Frostsaber Huntress +DELETE FROM `smart_scripts` WHERE `entryorguid`=7433 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7433,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Frostsaber Huntress - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=7433; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(7433,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Frostsaber Huntress"); + +-- Frostsaber Pride Watcher +DELETE FROM `smart_scripts` WHERE `entryorguid`=7434 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7434,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Frostsaber Pride Watcher - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=7434; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(7434,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Frostsaber Pride Watcher"); + +-- Rak'shiri +DELETE FROM `smart_scripts` WHERE `entryorguid`=10200 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(10200,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rak'shiri - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=10200; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10200,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Rak'shiri"); + +-- Shadowhide Brute +DELETE FROM `smart_scripts` WHERE `entryorguid`=432 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(432,0,2,0,2,0,100,1,0,30,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Shadowhide Brute - Between 0-30% Health - Say Line 1 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=432 AND `GroupID`=1; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(432,1,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Shadowhide Brute"); + +-- Bloodscalp Witch Doctor +DELETE FROM `smart_scripts` WHERE `entryorguid`=660 AND `source_type`=0 AND `id`=4; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(660,0,4,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Witch Doctor - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=660; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(660,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Bloodscalp Witch Doctor"); + +-- Bloodscalp Scavenger +DELETE FROM `smart_scripts` WHERE `entryorguid`=702 AND `source_type`=0 AND `id`=4; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(702,0,4,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodscalp Scavenger - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=702; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(702,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Bloodscalp Scavenger"); + +-- Gan'zulah +DELETE FROM `smart_scripts` WHERE `entryorguid`=1061 AND `source_type`=0 AND `id`=1; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1061,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gan'zulah - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=1061; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1061,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Gan'zulah"); + +-- Scarlet Executioner +DELETE FROM `smart_scripts` WHERE `entryorguid`=1841 AND `source_type`=0 AND `id`=4; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(1841,0,4,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Executioner - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=1841; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(1841,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Scarlet Executioner"); + +-- Raging Thunder Lizard +DELETE FROM `smart_scripts` WHERE `entryorguid`=4726 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(4726,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Thunder Lizard - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=4726; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(4726,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Raging Thunder Lizard"); + +-- Withered Protector +DELETE FROM `smart_scripts` WHERE `entryorguid`=7149 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7149,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Withered Protector - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=7149; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(7149,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Withered Protector"); + +-- Retherokk the Berserker +DELETE FROM `smart_scripts` WHERE `entryorguid`=8216 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(8216,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Retherokk the Berserker - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=8216; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(8216,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Retherokk the Berserker"); + +-- Verek +DELETE FROM `smart_scripts` WHERE `entryorguid`=9042 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(9042,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Verek - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=9042; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(9042,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Verek"); + +-- Xavathras +DELETE FROM `smart_scripts` WHERE `entryorguid`=9454 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(9454,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Xavathras - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=9454; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(9454,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Xavathras"); + +-- Brumeran +DELETE FROM `smart_scripts` WHERE `entryorguid`=10807 AND `source_type`=0 AND `id`=3; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(10807,0,3,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Brumeran - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=10807; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10807,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Brumeran"); + +-- Desert Rager +DELETE FROM `smart_scripts` WHERE `entryorguid`=11747 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(11747,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Desert Rager - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=11747; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(11747,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Desert Rager"); + +-- Twilight Avenger +DELETE FROM `smart_scripts` WHERE `entryorguid`=11880 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(11880,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Twilight Avenger - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=11880; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(11880,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Twilight Avenger"); + +-- Enraged Reef Crawler +DELETE FROM `smart_scripts` WHERE `entryorguid`=12347 AND `source_type`=0 AND `id`=1; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(12347,0,1,0,2,0,100,1,0,20,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Enraged Reef Crawler - Between 0-20% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=12347; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(12347,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Enraged Reef Crawler"); + +-- Mongress +DELETE FROM `smart_scripts` WHERE `entryorguid`=14344 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(14344,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mongress - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=14344; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(14344,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Mongress"); + +-- Twilight Marauder +DELETE FROM `smart_scripts` WHERE `entryorguid`=15542 AND `source_type`=0 AND `id`=3; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(15542,0,3,0,2,0,100,1,0,20,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Twilight Marauder - Between 0-20% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=15542; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(15542,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Twilight Marauder"); + +-- Xandivious +DELETE FROM `smart_scripts` WHERE `entryorguid`=15623 AND `source_type`=0 AND `id`=6; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(15623,0,6,0,2,0,100,1,0,50,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Xandivious - Between 0-50% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=15623; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(15623,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Xandivious"); + +-- Gangled Cannibal +DELETE FROM `smart_scripts` WHERE `entryorguid`=16309 AND `source_type`=0 AND `id`=1; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(16309,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gangled Cannibal - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=16309; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(16309,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Gangled Cannibal"); + +-- Vengeful Apparition +DELETE FROM `smart_scripts` WHERE `entryorguid`=16328 AND `source_type`=0 AND `id`=1; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(16328,0,1,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Vengeful Apparition - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=16328; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(16328,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Vengeful Apparition"); + +-- Bonechewer Mutant +DELETE FROM `smart_scripts` WHERE `entryorguid`=16876 AND `source_type`=0 AND `id`=4; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(16876,0,4,0,2,0,100,1,0,50,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bonechewer Mutant - Between 0-50% Health - Say Line 1 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=16876 AND `GroupID`=1; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(16876,1,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Bonechewer Mutant"); + +-- Gordunni Head-Splitter +DELETE FROM `smart_scripts` WHERE `entryorguid`=22148 AND `source_type`=0 AND `id`=2; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(22148,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gordunni Head-Splitter - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=22148; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(22148,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Gordunni Head-Splitter"); + +-- Jabbering Ghoul +DELETE FROM `smart_scripts` WHERE `entryorguid`=10801 AND `source_type`=0 AND `id`=3; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(10801,0,3,0,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jabbering Ghoul - On Aggro - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=10801; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10801,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Jabbering Ghoul"); + +-- Farmer Dalson +DELETE FROM `smart_scripts` WHERE `entryorguid`=10836 AND `source_type`=0 AND `id`=4; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(10836,0,4,0,4,0,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Farmer Dalson - On Aggro - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=10836; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10836,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Farmer Dalson"); + +-- Raging Moonkin +DELETE FROM `smart_scripts` WHERE `entryorguid`=10160 AND `source_type`=0 AND `id` IN (0,2); +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(10160,0,0,0,4,0,100,0,0,0,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Moonkin - On Aggro - Cast 'Enrage'"), +(10160,0,2,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Moonkin - On Aggro - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=10160; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10160,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Raging Moonkin"); + +-- Raging Owlbeast +DELETE FROM `smart_scripts` WHERE `entryorguid`=7451 AND `source_type`=0 AND `id` IN (1,2); +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7451,0,1,0,2,0,100,1,0,30,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Owlbeast - Between 0-30% Health - Cast Enrage (No Repeat)"), +(7451,0,2,0,2,0,100,1,0,30,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Owlbeast - Between 0-30% Health - Say Line 0 (No Repeat)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=7451; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(7451,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Raging Owlbeast"); From bd74b3f8c00a9e6fdc14f9ad2e12e046c57a8e41 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:36:59 +0200 Subject: [PATCH 23/39] DB/Quest: The So-Called Mark of the Lightbringer #21766 --- .../world/3.3.5/2018_04_04_04_world_335.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql new file mode 100644 index 0000000000..7a15cd0a66 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql @@ -0,0 +1,16 @@ +-- Mehlar Dawnblade +DELETE FROM `creature_text` WHERE `CreatureID`=17099; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(17099,0,0,"Uther Lightbringer brought only darkness to Quel'Thalas. Let us see if we can bring some darkness to his tomb!",12,0,100,1,0,0,14112,0,"Mehlar Dawnblade"), +(17099,1,0,"At last I will have my revenge!",12,0,100,11,0,0,14115,0,"Mehlar Dawnblade"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=17099; +DELETE FROM `smart_scripts` WHERE `entryorguid`=17099 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=1709900 AND `source_type`=9; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(17099,0,0,0,20,0,100,0,9443,0,0,0,80,1709900,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Quest 'The So-Called Mark of the Lightbringer' Finished - Run Script"), +(1709900,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Remove Npc Flag Questgiver+Gossip"), +(1709900,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Say Line 0"), +(1709900,9,2,0,0,0,100,0,3000,3000,0,0,11,16633,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Cast 'Create Item Visual (DND)'"), +(1709900,9,3,0,0,0,100,0,7000,7000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Say Line 1"), +(1709900,9,4,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Add Npc Flag Questgiver+Gossip"); From cd32f20f5784d037a16a134f106f8488b0e40fa9 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:37:30 +0200 Subject: [PATCH 24/39] DB/Gossip: Champion Cyssa Dawnrose Closes #21767 --- sql/updates/world/3.3.5/2018_04_04_05_world_335.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql new file mode 100644 index 0000000000..d1371d992d --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql @@ -0,0 +1,6 @@ +-- Champion Cyssa Dawnrose --> Fix gossip text +DELETE FROM `gossip_menu` WHERE `MenuID`=8111 AND `TextID` IN (10040,10044); +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(8111,10044,0); + +UPDATE `conditions` SET `SourceEntry`=10044 WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8111 AND `SourceEntry`=10040; From 1618d2d920cdf3446b89f1f82a0ba59780c82b03 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:38:02 +0200 Subject: [PATCH 25/39] DB/Gossip: Ambassador Sunsorrow Coses #21768 --- .../world/3.3.5/2018_04_04_06_world_335.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_06_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql new file mode 100644 index 0000000000..991e64a4a7 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql @@ -0,0 +1,15 @@ +-- Ambassador Sunsorrow +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7178; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,7178,8740,0,0,16,0,512,0,0,0,0,0,"","Show gossip text if player is a Blood Elf"), +(14,7178,8458,0,0,16,0,1279,0,0,0,0,0,"","Show gossip text if player is not a Blood Elf"); + +DELETE FROM `gossip_menu` WHERE `MenuID` IN (7178,8312) AND `TextID`=10378; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(8312,10378,0); + +UPDATE `gossip_menu_option` SET `ActionMenuID`=8312 WHERE `MenuID`=7178; + +DELETE FROM `smart_scripts` WHERE `entryorguid`=16287 AND `source_type`=0; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(16287,0,0,0,62,0,100,0,7178,0,0,0,0,85,37084,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ambassador Sunsorrow - On Gossip Option 0 Selected - Create Item 'Lament of the Highborne'"); From 1edc70b0319368461c697ae589273d71eb0236b3 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Wed, 4 Apr 2018 02:38:37 +0200 Subject: [PATCH 26/39] DB/Gameobject: Joseph Redpath's Monument Closes #21769 --- sql/updates/world/3.3.5/2018_04_04_07_world_335.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_07_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql new file mode 100644 index 0000000000..fdd5fb624a --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql @@ -0,0 +1,10 @@ +-- Joseph Redpath's Monument +UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=176145; +DELETE FROM `smart_scripts` WHERE `entryorguid`=176145 AND `source_type`=1; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(176145,1,0,0,70,0,100,1,2,0,0,0,12,10936,3,0,0,0,0,8,0,0,0,1165.83,-1719.55,60.9121,2.1369,"Joseph Redpath's Monument - On Gameobject State Changed - Summon Creature 'Joseph Redpath'"), +(176145,1,1,0,70,0,100,1,2,0,0,0,1,2,0,0,0,0,0,19,10936,0,0,0,0,0,0,"Joseph Redpath's Monument - On Gameobject State Changed - Say Line 2 (Joseph Redpath)"); + +DELETE FROM `creature_text` WHERE `CreatureID`=10936 AND `GroupID`=2; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(10936,2,0,"Save me...",15,0,100,0,0,0,6274,0,"Joseph Redpath"); From cd4f81058cd7b582a9780489d394632e82e6ce24 Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Wed, 4 Apr 2018 02:49:12 +0200 Subject: [PATCH 27/39] DB/Vendor: link some Arena vendors to the season Closes #21749 --- sql/updates/world/3.3.5/2018_04_04_08_world_335.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_04_08_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql new file mode 100644 index 0000000000..9db838f6f1 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql @@ -0,0 +1,8 @@ +-- +DELETE FROM `game_event_creature` WHERE (`eventEntry`=55 AND `guid`=70996) OR (`eventEntry`=56 AND `guid` IN (75914, 79018, 75475, 88156)); +INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES +(55, 70996), +(56, 75914), +(56, 79018), +(56, 75475), +(56, 88156); From a08da8d6742eba4a85b94dfa2f6086e9ea3e1049 Mon Sep 17 00:00:00 2001 From: tkrokli Date: Fri, 6 Apr 2018 02:36:38 +0200 Subject: [PATCH 28/39] DB/Texts: Augustus the Touched - Augustus the Touched should say some texts every few minutes. Closes #21780 --- sql/updates/world/3.3.5/2018_04_06_00_world_335.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_06_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql new file mode 100644 index 0000000000..33ec9b02d0 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql @@ -0,0 +1,11 @@ +-- Augustus the Touched +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=12384; +DELETE FROM `smart_scripts` WHERE `entryorguid`=12384 AND `source_type`=0; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(12384,0,0,0,1,0,100,0,1000,15000,150000,180000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Augustus the Touched - Out of Combat - Say Line 0"); + +DELETE FROM `creature_text` WHERE `CreatureID`=12384; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(12384,0,0,"You won't find better prices anywhere!",14,0,100,22,0,0,7627,0,"Augustus the Touched"), +(12384,0,1,"I'm Augustus, and my prices are INSANE!",14,0,100,22,0,0,7628,0,"Augustus the Touched"), +(12384,0,2,"I'm Augustus! You want it, I got it! You wanna sell it, then I want it!",14,0,100,22,0,0,7629,0,"Augustus the Touched"); From 24ee1a585789269ee0a65039725fbb624edd50f7 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 6 Apr 2018 02:45:33 +0200 Subject: [PATCH 29/39] DB/Gossip: Tirion Fordring - Tirion Fordring should show a different gossip text if player has taken the quest "Redemption". Closes #21781 --- sql/updates/world/3.3.5/2018_04_06_01_world_335.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_06_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql new file mode 100644 index 0000000000..d8fed9737c --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql @@ -0,0 +1,8 @@ +-- Tirion Fordring +DELETE FROM `gossip_menu` WHERE `MenuID`=3502 AND `TextID`=4673; +INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES +(3502,4673,0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=3502; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,3502,4673,0,0,9,0,5742,0,0,0,0,0,"","Show gossip text 4673 if quest 'Redemption' is taken"); From bae10a0cd14cdbeedb62fb154c51d6c3333667de Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 6 Apr 2018 02:48:28 +0200 Subject: [PATCH 30/39] DB/Quest: Brutal Armor - Add outro event for quest "Brutal Armor" Closes #21782 --- .../world/3.3.5/2018_04_06_02_world_335.sql | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_06_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql new file mode 100644 index 0000000000..000e19bead --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql @@ -0,0 +1,34 @@ +-- Thun'grim Firegaze +DELETE FROM `creature_text` WHERE `CreatureID`=5878; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(5878,0,0,"%s begins to work...",16,0,100,0,0,0,2348,0,"Thun'grim Firegaze"), +(5878,1,0,"Your armor is ready, $n.",12,1,100,1,0,0,2634,0,"Thun'grim Firegaze"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5878; +DELETE FROM `smart_scripts` WHERE `entryorguid`=5878 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (587800,587801) AND `source_type`=9; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(5878,0,0,0,20,0,100,0,1838,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Quest 'Brutal Armor' Finished - Remove Npc Flag Questgiver"), +(5878,0,1,0,20,0,100,0,1838,0,0,0,53,0,5878,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Quest 'Brutal Armor' Finished - Start Waypoint"), +(5878,0,2,0,40,0,100,0,3,5878,0,0,80,587800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Waypoint 3 Reached - Run Script"), +(5878,0,3,0,40,0,100,0,6,5878,0,0,80,587801,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Waypoint 6 Reached - Run Script"), +(587800,9,0,0,0,0,100,0,0,0,0,0,54,39000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Pause Waypoint"), +(587800,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.92829,"Thun'grim Firegaze - On Script - Set Orientation"), +(587800,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Say Line 0"), +(587800,9,3,0,0,0,100,0,0,0,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 69"), +(587800,9,4,0,0,0,100,0,15000,15000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 0"), +(587800,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.30012,"Thun'grim Firegaze - On Script - Set Orientation"), +(587800,9,6,0,0,0,100,0,1000,1000,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 233"), +(587800,9,7,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Set Emote State 0"), +(587801,9,0,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.820305,"Thun'grim Firegaze - On Script - Set Orientation"), +(587801,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Say Line 1"), +(587801,9,2,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thun'grim Firegaze - On Script - Add Npc Flag Questgiver"); + +DELETE FROM `waypoints` WHERE `entry`=5878; +INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES +(5878,1,-423.713,-3167.24,212.779,""), +(5878,2,-423.211,-3164.23,212.864,""), +(5878,3,-425.1,-3162.25,212.697,""), +(5878,4,-423.211,-3164.23,212.864,""), +(5878,5,-423.713,-3167.24,212.779,""), +(5878,6,-437.62,-3176.26,211.385,""); From 7493b8e9cbce6678a3b5ca02fe842c8fe9e067ce Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 6 Apr 2018 02:51:39 +0200 Subject: [PATCH 31/39] DB/Quest: Satyr Hooves - Add outro event for quest "Satyr Hooves" Closes #21783 --- .../world/3.3.5/2018_04_06_03_world_335.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_06_03_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql new file mode 100644 index 0000000000..ef5cbb4d37 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql @@ -0,0 +1,19 @@ +-- Ula'elek +DELETE FROM `creature_text` WHERE `CreatureID`=6408; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(6408,0,0,"%s begins to work...",16,0,100,0,0,0,2348,0,"Ula'elek"), +(6408,1,0,"I am done. Your armor is ready, $n.",12,1,100,1,0,0,2646,0,"Ula'elek"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6408; +DELETE FROM `smart_scripts` WHERE `entryorguid`=6408 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=640800 AND `source_type`=9; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(6408,0,0,0,20,0,100,0,1842,0,0,0,80,640800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Quest 'Satyr Hooves' Finished - Run Script"), +(640800,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Remove Npc Flag Questgiver"), +(640800,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Say Line 0"), +(640800,9,2,0,0,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Set Emote State 233"), +(640800,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Set Emote State 0"), +(640800,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Say Line 1"), +(640800,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Add Npc Flag Questgiver"); + +UPDATE `creature` SET `position_x`=-811.458, `position_y`=-4939.82, `position_z`=20.4816, `orientation`=3.59002 WHERE `guid`=6490; From 493dacd5940113b5e49bd4b2b884a0b00aa0fcb9 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 6 Apr 2018 02:54:33 +0200 Subject: [PATCH 32/39] DB/Quest: Chimaeric Horn - Add outro event for quest "Chimaeric Horn" Closes #21784 --- .../world/3.3.5/2018_04_06_04_world_335.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_06_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql new file mode 100644 index 0000000000..ee93fa1c8b --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql @@ -0,0 +1,19 @@ +-- Orm Stonehoof +DELETE FROM `creature_text` WHERE `CreatureID`=6410; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(6410,0,0,"%s begins to work...",16,0,100,0,0,0,2348,0,"Orm Stonehoof"), +(6410,1,0,"I have completed your helm, $n.",12,1,100,1,0,0,2635,0,"Orm Stonehoof"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6410; +DELETE FROM `smart_scripts` WHERE `entryorguid`=6410 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=641000 AND `source_type`=9; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(6410,0,0,0,20,0,100,0,1844,0,0,0,80,641000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Quest 'Chimaeric Horn' Finished - Run Script"), +(641000,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Remove Npc Flag Questgiver"), +(641000,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Say Line 0"), +(641000,9,2,0,0,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Set Emote State 233"), +(641000,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Set Emote State 0"), +(641000,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Say Line 1"), +(641000,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Add Npc Flag Questgiver"); + +UPDATE `creature` SET `position_x`=-1239.54, `position_y`=109.707, `position_z`=129.58, `orientation`=1.89658 WHERE `guid`=24678; From df6b87ef95787e5af165c84858872b9c5b756c14 Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 6 Apr 2018 02:57:46 +0200 Subject: [PATCH 33/39] DB/Quest: Dragonmaw Shinbones - Add outro event for quest "Dragonmaw Shinbones" Closes #21785 --- .../world/3.3.5/2018_04_06_05_world_335.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_06_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql new file mode 100644 index 0000000000..c23721c1d1 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql @@ -0,0 +1,17 @@ +-- Velora Nitely +DELETE FROM `creature_text` WHERE `CreatureID`=6411; +INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(6411,0,0,"%s begins to craft...",16,0,100,0,0,0,2644,0,"Velora Nitely"), +(6411,1,0,"I have finished your leg guards, $n.",12,0,100,1,0,0,2645,0,"Velora Nitely"); + +UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6411; +DELETE FROM `smart_scripts` WHERE `entryorguid`=6411 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid`=641100 AND `source_type`=9; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(6411,0,0,0,20,0,100,0,1846,0,0,0,80,641100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Quest 'Dragonmaw Shinbones' Finished - Run Script"), +(641100,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Remove Npc Flag Questgiver"), +(641100,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Say Line 0"), +(641100,9,2,0,0,0,100,0,0,0,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Set Emote State 133"), +(641100,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Set Emote State 0"), +(641100,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Say Line 1"), +(641100,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Add Npc Flag Questgiver"); From e1fd099bdbaf007c23d0ec27e82f425d9dcb615a Mon Sep 17 00:00:00 2001 From: ZenoX92 Date: Fri, 6 Apr 2018 03:01:38 +0200 Subject: [PATCH 34/39] DB/Quest: Brutal Armor set Quest chaining - Fix quest chaining related to Brutal Armor set - Fix availability for breadcrumb quests involved in the chain Closes #21786 --- .../world/3.3.5/2018_04_06_06_world_335.sql | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 sql/updates/world/3.3.5/2018_04_06_06_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql new file mode 100644 index 0000000000..a4b37e4c15 --- /dev/null +++ b/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql @@ -0,0 +1,23 @@ +-- Brutal Armor set Quest chaining +UPDATE `quest_template` SET `AllowableRaces`=16 WHERE `ID`=1841; +UPDATE `quest_template` SET `AllowableRaces`=32 WHERE `ID`=1840; +UPDATE `quest_template` SET `AllowableRaces`=2|128 WHERE `ID`=1839; +UPDATE `quest_template_addon` SET `PrevQuestID`=1848 WHERE `ID` IN (1841,1840,1839,1846,1844,1842); + +-- BreadCrumb Quest "Velora Nitely and the Brutal Legguards" +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (1841,1846); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19,0,1841,0,0,14,0,1846,0,0,0,0,0,"","Quest 'Velora Nitely and the Brutal Legguards' can only be taken if quest 'Dragonmaw Shinbones' is not taken"), +(19,0,1846,0,0,28,0,1841,0,0,1,0,0,"","Quest 'Dragonmaw Shinbones' can only be taken if quest 'Velora Nitely and the Brutal Legguards' is not completed"); + +-- BreadCrumb Quest "Orm Stonehoof and the Brutal Helm" +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (1840,1844); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19,0,1840,0,0,14,0,1844,0,0,0,0,0,"","Quest 'Orm Stonehoof and the Brutal Helm' can only be taken if quest 'Chimaeric Horn' is not taken"), +(19,0,1844,0,0,28,0,1840,0,0,1,0,0,"","Quest 'Chimaeric Horn' can only be taken if quest 'Orm Stonehoof and the Brutal Helm' is not completed"); + +-- BreadCrumb Quest "Ula'elek and the Brutal Gauntlets" +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (1839,1842); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(19,0,1839,0,0,14,0,1842,0,0,0,0,0,"","Quest 'Ula'elek and the Brutal Gauntlets' can only be taken if quest 'Satyr Hooves' is not taken"), +(19,0,1842,0,0,28,0,1839,0,0,1,0,0,"","Quest 'Satyr Hooves' can only be taken if quest 'Ula'elek and the Brutal Gauntlets' is not completed"); From a4ac5b6b7d2c727cafd54a6d85334b8a3c5475c9 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 08:29:07 +0200 Subject: [PATCH 35/39] rename files --- sql/updates/world/3.3.5/2018_03_29_01_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_00_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_01_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_02_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_03_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_04_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_05_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_06_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_07_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_04_08_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_06_00_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_06_01_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_06_02_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_06_03_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_06_04_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_06_05_world_335.sql | 2 ++ sql/updates/world/3.3.5/2018_04_06_06_world_335.sql | 2 ++ 17 files changed, 34 insertions(+) diff --git a/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql b/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql index a96e7ea266..b8b95c42ee 100644 --- a/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql +++ b/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql @@ -1,6 +1,8 @@ +/* -- UPDATE `quest_template_locale` SET `Objectives` = 'Findet den \"Sammler\" und tötet ihn, dann kehrt mit dem Ring des Sammlers zu Marschall Dughan zurück.', `CompletedText` = 'Kehrt zu Marschall Dughan im Holzfällerlager des Osttals im Wald von Elwynn zurück.' WHERE `ID` = 147 AND `locale` = 'deDE'; UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.', `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` = 'esES'; UPDATE `quest_template_locale` SET `Objectives` = 'Encuentra y mata al Coleccionista y vuelve junto al alguacil Dughan con la sortija del coleccionista.', `CompletedText` = 'Vuelve con: Alguacil Dughan. Zona: Aserradero de la Vega del Este, Bosque de Elwynn.' WHERE `ID` = 147 AND `locale` = 'esMX'; UPDATE `quest_template_locale` SET `Objectives` = 'Trouvez et tuez le « Collecteur » puis rapportez l’Anneau du Collecteur au Maréchal Dughan.', `CompletedText` = 'Retournez voir le Maréchal Dughan au Camp de bûcherons du Val d\'Est, dans la Forêt d\'Elwynn.' WHERE `ID` = 147 AND `locale` = 'frFR'; UPDATE `quest_template_locale` SET `Objectives` = 'Найдите и убейте \"Вымогателя\", а затем принесите его кольцо маршалу Дугхан.', `CompletedText` = 'Вернитесь к маршалу Дугхан на лесопилку Восточной долины в Элвиннском лесу.' WHERE `ID` = 147 AND `locale` = 'ruRU'; +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql index d01974aea4..377942cbe8 100644 --- a/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql @@ -1,3 +1,4 @@ +/* -- Add pool for Deathspeaker Selendre SET @GUID := 64986; SET @POOL := 386; @@ -179,3 +180,4 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio (867550,63,2626.28,-5483.26,157.083,0,0,0,0,100,0), (867550,64,2616.9,-5493.82,157.194,0,0,0,0,100,0), (867550,65,2616.39,-5504.67,158.186,0,0,0,0,100,0); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql index be714b22e5..eee5f48de5 100644 --- a/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- Pathing for Scarlet Smith UPDATE `creature` SET `position_x`=2990.86, `position_y`=-1458.58, `position_z`=146.273, `spawndist`=0, `MovementType`=2 WHERE `guid`=61634; @@ -34,3 +35,4 @@ DELETE FROM `waypoint_scripts` WHERE `id`=616340; INSERT INTO `waypoint_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`, `guid`) VALUES (616340,1,1,69,1,0,0,0,0,0,5), (616340,18,1,0,1,0,0,0,0,0,6); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql index 1540aba2ac..faa73cedca 100644 --- a/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql @@ -1,3 +1,4 @@ +/* -- Common Kitten DELETE FROM `creature_text` WHERE `CreatureID` IN (9937,9936); INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -19,3 +20,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ DELETE FROM `gossip_menu` WHERE `MenuID`=55002; -- Add Gossip Text INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES (55002,3550,0); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql index 2d4d55b7a5..a85ddb9b4b 100644 --- a/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql @@ -1,3 +1,4 @@ +/* -- Chillwind Ravager DELETE FROM `smart_scripts` WHERE `entryorguid`=7449 AND `source_type`=0 AND `id`=1; 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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES @@ -269,3 +270,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ DELETE FROM `creature_text` WHERE `CreatureID`=7451; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES (7451,0,0,"%s becomes enraged!",16,0,100,0,0,0,10677,0,"Raging Owlbeast"); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql index 7a15cd0a66..72ef8b09c9 100644 --- a/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- Mehlar Dawnblade DELETE FROM `creature_text` WHERE `CreatureID`=17099; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -14,3 +15,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (1709900,9,2,0,0,0,100,0,3000,3000,0,0,11,16633,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Cast 'Create Item Visual (DND)'"), (1709900,9,3,0,0,0,100,0,7000,7000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Say Line 1"), (1709900,9,4,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mehlar Dawnblade - On Script - Add Npc Flag Questgiver+Gossip"); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql index d1371d992d..5943456571 100644 --- a/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql @@ -1,6 +1,8 @@ +/* -- Champion Cyssa Dawnrose --> Fix gossip text DELETE FROM `gossip_menu` WHERE `MenuID`=8111 AND `TextID` IN (10040,10044); INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES (8111,10044,0); UPDATE `conditions` SET `SourceEntry`=10044 WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=8111 AND `SourceEntry`=10040; +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql index 991e64a4a7..9936d8203f 100644 --- a/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql @@ -1,3 +1,4 @@ +/* -- Ambassador Sunsorrow DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7178; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES @@ -13,3 +14,4 @@ UPDATE `gossip_menu_option` SET `ActionMenuID`=8312 WHERE `MenuID`=7178; DELETE FROM `smart_scripts` WHERE `entryorguid`=16287 AND `source_type`=0; 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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES (16287,0,0,0,62,0,100,0,7178,0,0,0,0,85,37084,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ambassador Sunsorrow - On Gossip Option 0 Selected - Create Item 'Lament of the Highborne'"); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql index fdd5fb624a..36d08ea165 100644 --- a/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql @@ -1,3 +1,4 @@ +/* -- Joseph Redpath's Monument UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=176145; DELETE FROM `smart_scripts` WHERE `entryorguid`=176145 AND `source_type`=1; @@ -8,3 +9,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ DELETE FROM `creature_text` WHERE `CreatureID`=10936 AND `GroupID`=2; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES (10936,2,0,"Save me...",15,0,100,0,0,0,6274,0,"Joseph Redpath"); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql b/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql index 9db838f6f1..68204faab1 100644 --- a/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql @@ -1,3 +1,4 @@ +/* -- DELETE FROM `game_event_creature` WHERE (`eventEntry`=55 AND `guid`=70996) OR (`eventEntry`=56 AND `guid` IN (75914, 79018, 75475, 88156)); INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES @@ -6,3 +7,4 @@ INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES (56, 79018), (56, 75475), (56, 88156); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql index 33ec9b02d0..0bb3aff021 100644 --- a/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql @@ -1,3 +1,4 @@ +/* -- Augustus the Touched UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=12384; DELETE FROM `smart_scripts` WHERE `entryorguid`=12384 AND `source_type`=0; @@ -9,3 +10,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (12384,0,0,"You won't find better prices anywhere!",14,0,100,22,0,0,7627,0,"Augustus the Touched"), (12384,0,1,"I'm Augustus, and my prices are INSANE!",14,0,100,22,0,0,7628,0,"Augustus the Touched"), (12384,0,2,"I'm Augustus! You want it, I got it! You wanna sell it, then I want it!",14,0,100,22,0,0,7629,0,"Augustus the Touched"); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql index d8fed9737c..b42e707c9f 100644 --- a/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- Tirion Fordring DELETE FROM `gossip_menu` WHERE `MenuID`=3502 AND `TextID`=4673; INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES @@ -6,3 +7,4 @@ INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=3502; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (14,3502,4673,0,0,9,0,5742,0,0,0,0,0,"","Show gossip text 4673 if quest 'Redemption' is taken"); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql index 000e19bead..ffd5e786a7 100644 --- a/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql @@ -1,3 +1,4 @@ +/* -- Thun'grim Firegaze DELETE FROM `creature_text` WHERE `CreatureID`=5878; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -32,3 +33,4 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (5878,4,-423.211,-3164.23,212.864,""), (5878,5,-423.713,-3167.24,212.779,""), (5878,6,-437.62,-3176.26,211.385,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql index ef5cbb4d37..63cd132f2c 100644 --- a/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql @@ -1,3 +1,4 @@ +/* -- Ula'elek DELETE FROM `creature_text` WHERE `CreatureID`=6408; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -17,3 +18,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (640800,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ula'elek - On Script - Add Npc Flag Questgiver"); UPDATE `creature` SET `position_x`=-811.458, `position_y`=-4939.82, `position_z`=20.4816, `orientation`=3.59002 WHERE `guid`=6490; +*/ diff --git a/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql index ee93fa1c8b..c75d273930 100644 --- a/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- Orm Stonehoof DELETE FROM `creature_text` WHERE `CreatureID`=6410; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -17,3 +18,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (641000,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Orm Stonehoof - On Script - Add Npc Flag Questgiver"); UPDATE `creature` SET `position_x`=-1239.54, `position_y`=109.707, `position_z`=129.58, `orientation`=1.89658 WHERE `guid`=24678; +*/ diff --git a/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql index c23721c1d1..8e60347c0d 100644 --- a/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql @@ -1,3 +1,4 @@ +/* -- Velora Nitely DELETE FROM `creature_text` WHERE `CreatureID`=6411; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -15,3 +16,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (641100,9,3,0,0,0,100,0,20000,20000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Set Emote State 0"), (641100,9,4,0,0,0,100,0,500,500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Say Line 1"), (641100,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Velora Nitely - On Script - Add Npc Flag Questgiver"); +*/ diff --git a/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql b/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql index a4b37e4c15..7407de8abc 100644 --- a/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql +++ b/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql @@ -1,3 +1,4 @@ +/* -- Brutal Armor set Quest chaining UPDATE `quest_template` SET `AllowableRaces`=16 WHERE `ID`=1841; UPDATE `quest_template` SET `AllowableRaces`=32 WHERE `ID`=1840; @@ -21,3 +22,4 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (19,0,1839,0,0,14,0,1842,0,0,0,0,0,"","Quest 'Ula'elek and the Brutal Gauntlets' can only be taken if quest 'Satyr Hooves' is not taken"), (19,0,1842,0,0,28,0,1839,0,0,1,0,0,"","Quest 'Satyr Hooves' can only be taken if quest 'Ula'elek and the Brutal Gauntlets' is not completed"); +*/ From 45329993261014bc2ba05b293af1e7c517ec87e8 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 08:36:57 +0200 Subject: [PATCH 36/39] missing part --- .../2018_04_06_00_world_from_335_was_2018_03_29_00_world.sql} | 0 .../2018_04_06_01_world_from_335_was_2018_03_29_01_world_335.sql} | 0 .../2018_04_06_02_world_from_335_was_2018_04_04_00_world_335.sql} | 0 .../2018_04_06_03_world_from_335_was_2018_04_04_01_world_335.sql} | 0 .../2018_04_06_04_world_from_335_was_2018_04_04_02_world_335.sql} | 0 .../2018_04_06_05_world_from_335_was_2018_04_04_03_world_335.sql} | 0 .../2018_04_06_06_world_from_335_was_2018_04_04_04_world_335.sql} | 0 .../2018_04_06_07_world_from_335_was_2018_04_04_05_world_335.sql} | 0 .../2018_04_06_08_world_from_335_was_2018_04_04_06_world_335.sql} | 0 .../2018_04_06_09_world_from_335_was_2018_04_04_07_world_335.sql} | 0 .../2018_04_06_10_world_from_335_was_2018_04_04_08_world_335.sql} | 0 .../2018_04_06_11_world_from_335_was_2018_04_06_00_world_335.sql} | 0 .../2018_04_06_12_world_from_335_was_2018_04_06_01_world_335.sql} | 0 .../2018_04_06_13_world_from_335_was_2018_04_06_02_world_335.sql} | 0 .../2018_04_06_14_world_from_335_was_2018_04_06_03_world_335.sql} | 0 .../2018_04_06_15_world_from_335_was_2018_04_06_04_world_335.sql} | 0 .../2018_04_06_16_world_from_335_was_2018_04_06_05_world_335.sql} | 0 .../2018_04_06_17_world_from_335_was_2018_04_06_06_world_335.sql} | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/{3.3.5/2018_03_29_00_world.sql => 4.3.4/2018_04_06_00_world_from_335_was_2018_03_29_00_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_29_01_world_335.sql => 4.3.4/2018_04_06_01_world_from_335_was_2018_03_29_01_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_00_world_335.sql => 4.3.4/2018_04_06_02_world_from_335_was_2018_04_04_00_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_01_world_335.sql => 4.3.4/2018_04_06_03_world_from_335_was_2018_04_04_01_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_02_world_335.sql => 4.3.4/2018_04_06_04_world_from_335_was_2018_04_04_02_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_03_world_335.sql => 4.3.4/2018_04_06_05_world_from_335_was_2018_04_04_03_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_04_world_335.sql => 4.3.4/2018_04_06_06_world_from_335_was_2018_04_04_04_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_05_world_335.sql => 4.3.4/2018_04_06_07_world_from_335_was_2018_04_04_05_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_06_world_335.sql => 4.3.4/2018_04_06_08_world_from_335_was_2018_04_04_06_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_07_world_335.sql => 4.3.4/2018_04_06_09_world_from_335_was_2018_04_04_07_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_04_08_world_335.sql => 4.3.4/2018_04_06_10_world_from_335_was_2018_04_04_08_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_06_00_world_335.sql => 4.3.4/2018_04_06_11_world_from_335_was_2018_04_06_00_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_06_01_world_335.sql => 4.3.4/2018_04_06_12_world_from_335_was_2018_04_06_01_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_06_02_world_335.sql => 4.3.4/2018_04_06_13_world_from_335_was_2018_04_06_02_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_06_03_world_335.sql => 4.3.4/2018_04_06_14_world_from_335_was_2018_04_06_03_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_06_04_world_335.sql => 4.3.4/2018_04_06_15_world_from_335_was_2018_04_06_04_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_06_05_world_335.sql => 4.3.4/2018_04_06_16_world_from_335_was_2018_04_06_05_world_335.sql} (100%) rename sql/updates/world/{3.3.5/2018_04_06_06_world_335.sql => 4.3.4/2018_04_06_17_world_from_335_was_2018_04_06_06_world_335.sql} (100%) diff --git a/sql/updates/world/3.3.5/2018_03_29_00_world.sql b/sql/updates/world/4.3.4/2018_04_06_00_world_from_335_was_2018_03_29_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_29_00_world.sql rename to sql/updates/world/4.3.4/2018_04_06_00_world_from_335_was_2018_03_29_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_29_01_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_01_world_from_335_was_2018_03_29_01_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_29_01_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_01_world_from_335_was_2018_03_29_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_00_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_02_world_from_335_was_2018_04_04_00_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_00_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_02_world_from_335_was_2018_04_04_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_01_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_03_world_from_335_was_2018_04_04_01_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_01_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_03_world_from_335_was_2018_04_04_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_02_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_04_world_from_335_was_2018_04_04_02_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_02_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_04_world_from_335_was_2018_04_04_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_03_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_05_world_from_335_was_2018_04_04_03_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_03_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_05_world_from_335_was_2018_04_04_03_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_04_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_06_world_from_335_was_2018_04_04_04_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_04_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_06_world_from_335_was_2018_04_04_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_05_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_07_world_from_335_was_2018_04_04_05_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_05_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_07_world_from_335_was_2018_04_04_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_06_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_08_world_from_335_was_2018_04_04_06_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_06_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_08_world_from_335_was_2018_04_04_06_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_07_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_09_world_from_335_was_2018_04_04_07_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_07_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_09_world_from_335_was_2018_04_04_07_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_04_08_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_10_world_from_335_was_2018_04_04_08_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_04_08_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_10_world_from_335_was_2018_04_04_08_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_00_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_11_world_from_335_was_2018_04_06_00_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_06_00_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_11_world_from_335_was_2018_04_06_00_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_01_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_12_world_from_335_was_2018_04_06_01_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_06_01_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_12_world_from_335_was_2018_04_06_01_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_02_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_13_world_from_335_was_2018_04_06_02_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_06_02_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_13_world_from_335_was_2018_04_06_02_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_03_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_14_world_from_335_was_2018_04_06_03_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_06_03_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_14_world_from_335_was_2018_04_06_03_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_04_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_15_world_from_335_was_2018_04_06_04_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_06_04_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_15_world_from_335_was_2018_04_06_04_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_05_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_16_world_from_335_was_2018_04_06_05_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_06_05_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_16_world_from_335_was_2018_04_06_05_world_335.sql diff --git a/sql/updates/world/3.3.5/2018_04_06_06_world_335.sql b/sql/updates/world/4.3.4/2018_04_06_17_world_from_335_was_2018_04_06_06_world_335.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_04_06_06_world_335.sql rename to sql/updates/world/4.3.4/2018_04_06_17_world_from_335_was_2018_04_06_06_world_335.sql From ee58c1c3df240c3589065b93763309a2a72f4728 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 6 Apr 2018 09:29:01 +0200 Subject: [PATCH 37/39] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 06a5b6601d..9caea2e62c 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ reports are wasteful and are subject to deletion. Fixes are submitted as pull requests via Github. For more information on how to properly submit a pull request, read the [how-to: maintain a remote fork](https://www.trinitycore.org/f/topic/6037-howto-maintain-a-remote-fork-for-pull-requests-tortoisegit/). -NOTE: if a fix is valid also for 3.3.5a/6.x branches submit them also to [Github](https://github.com/TrinityCore/TrinityCore) +NOTE: if a fix is valid also for 3.3.5a/master branches submit them also to [Github](https://github.com/TrinityCore/TrinityCore) ## Copyright From 723c5cb856b5bf964a0b050fb5a4442d8c267f78 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 7 Apr 2018 00:06:59 +0200 Subject: [PATCH 38/39] Core/Chat: Fixed chat link exploit Closes #21790 --- src/server/game/Chat/ChatLink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index 98a1d7f785..134d3a6797 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -578,7 +578,7 @@ bool LinkExtractor::IsValidMessage() break; char commandChar; - _iss >> commandChar; + _iss.get(commandChar); // | in normal messages is escaped by || if (commandChar != PIPE_CHAR) From 400425dc15fcf32f9c4dd9f559b7b698b203114c Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 8 Apr 2018 10:05:37 +0000 Subject: [PATCH 39/39] Make codacy happy --- contrib/merge_updates_unix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/merge_updates_unix.sh b/contrib/merge_updates_unix.sh index e936272293..66730937f3 100644 --- a/contrib/merge_updates_unix.sh +++ b/contrib/merge_updates_unix.sh @@ -1 +1,2 @@ +#!/bin/bash cat ../sql/updates/world/4.3.4/*.sql > world_update.sql