sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-11-04 09:12:25 -06:00
committed by GitHub
parent 18ae6a473f 2420d19e54
commit 4d068b0e74
37 changed files with 13014 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/compiler/includes/functions.sh
+11 -8
View File
@@ -136,16 +136,19 @@ function comp_compile() {
cd $CWD
if [[ $DOCKER = 1 ]]; then
echo "Generating confs..."
cp -n "env/dist/etc/worldserver.conf.dockerdist" "${confDir}/worldserver.conf"
cp -n "env/dist/etc/authserver.conf.dockerdist" "${confDir}/authserver.conf"
cp -n "env/dist/etc/dbimport.conf.dockerdist" "${confDir}/dbimport.conf"
fi
# set all aplications SUID bit
echo "Setting permissions on binary files"
find "$AC_BINPATH_FULL" -type f -exec sudo chown root:root -- {} +
find "$AC_BINPATH_FULL" -type f -exec sudo chmod u+s -- {} +
find "$AC_BINPATH_FULL" -mindepth 1 -maxdepth 1 -type f -exec sudo chown root:root -- {} +
find "$AC_BINPATH_FULL" -mindepth 1 -maxdepth 1 -type f -exec sudo chmod u+s -- {} +
DOCKER_ETC_FOLDER=${DOCKER_ETC_FOLDER:-"env/dist/etc"}
if [[ $DOCKER = 1 && $DISABLE_DOCKER_CONF != 1 ]]; then
echo "Generating confs..."
cp -n "$DOCKER_ETC_FOLDER/worldserver.conf.dockerdist" "${confDir}/worldserver.conf"
cp -n "$DOCKER_ETC_FOLDER/authserver.conf.dockerdist" "${confDir}/authserver.conf"
cp -n "$DOCKER_ETC_FOLDER/dbimport.conf.dockerdist" "${confDir}/dbimport.conf"
fi
echo "Done"
;;
data/sql/updates/db_world/2022_11_01_00.sql
+1768
View File
File diff suppressed because it is too large Load Diff
data/sql/updates/db_world/2022_11_01_01.sql
+90
View File
@@ -0,0 +1,90 @@
-- DB update 2022_11_01_00 -> 2022_11_01_01
-- Wolves aren't parallel here
UPDATE `creature_formations` SET `angle`=270 WHERE `memberGUID`=202682 AND `leaderGUID`=202628;
-- Patrolling packs need to assist
UPDATE `creature_formations` SET `GroupAI`=515 WHERE `leaderGUID` IN (202628, 202629, 202630) AND `memberGUID` IN (202628, 202680, 202682, 202629, 202681, 202684, 202630, 202683, 202685);
-- Boss' adds should respawn on reset
UPDATE `creature_formations` SET `GroupAI`=539 WHERE `leaderGUID`=202692 AND `memberGUID` IN (202692, 202695, 202696);
DELETE FROM `creature_formations` WHERE `leaderGUID` IN (202608,202611,202612,202614,202617,202621,202623,202626,202632,202642,202654,202655,202657,202658,202659,202660,202661,202663,202666,202667,202668,202669,202690,202691,202697) AND `memberGUID` IN (202622,202621,202617,202618,202663,202638,202639,202660,202648,202649,202659,202637,202647,202612,202678,202679,202613,202691,202702,202703,202704,202697,202665,202664,202667,202640,202641,202619,202611,202677,202676,202610,202658,202674,202636,202675,202607,202626,202673,202672,202655,202656,202657,202634,202635,202654,202645,202646,202671,202670,202608,202609,202690,202701,202700,202698,202699,202661,202662,202666,202651,202650,202642,202686,202688,202644,202614,202615,202669,202653,202652,202668,202687,202689,202643,202620,202623,202624,202632,202633) AND `GroupAI`=3;
INSERT INTO `creature_formations` (`memberGUID`, `leaderGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
(202622, 202621, 0, 0, 3, 0, 0),
(202621, 202621, 0, 0, 3, 0, 0),
(202617, 202617, 0, 0, 3, 0, 0),
(202618, 202617, 0, 0, 3, 0, 0),
(202663, 202663, 0, 0, 3, 0, 0),
(202638, 202663, 0, 0, 3, 0, 0),
(202639, 202663, 0, 0, 3, 0, 0),
(202660, 202660, 0, 0, 3, 0, 0),
(202648, 202660, 0, 0, 3, 0, 0),
(202649, 202660, 0, 0, 3, 0, 0),
(202659, 202659, 0, 0, 3, 0, 0),
(202637, 202659, 0, 0, 3, 0, 0),
(202647, 202659, 0, 0, 3, 0, 0),
(202612, 202612, 0, 0, 3, 0, 0),
(202678, 202612, 0, 0, 3, 0, 0),
(202679, 202612, 0, 0, 3, 0, 0),
(202613, 202612, 0, 0, 3, 0, 0),
(202691, 202691, 0, 0, 3, 0, 0),
(202702, 202691, 0, 0, 3, 0, 0),
(202703, 202691, 0, 0, 3, 0, 0),
(202704, 202691, 0, 0, 3, 0, 0),
(202697, 202697, 0, 0, 3, 0, 0),
(202665, 202697, 0, 0, 3, 0, 0),
(202664, 202697, 0, 0, 3, 0, 0),
(202667, 202667, 0, 0, 3, 0, 0),
(202640, 202667, 0, 0, 3, 0, 0),
(202641, 202667, 0, 0, 3, 0, 0),
(202619, 202667, 0, 0, 3, 0, 0),
(202611, 202611, 0, 0, 3, 0, 0),
(202677, 202611, 0, 0, 3, 0, 0),
(202676, 202611, 0, 0, 3, 0, 0),
(202610, 202611, 0, 0, 3, 0, 0),
(202658, 202658, 0, 0, 3, 0, 0),
(202674, 202658, 0, 0, 3, 0, 0),
(202636, 202658, 0, 0, 3, 0, 0),
(202675, 202658, 0, 0, 3, 0, 0),
(202607, 202658, 0, 0, 3, 0, 0),
(202626, 202626, 0, 0, 3, 0, 0),
(202673, 202626, 0, 0, 3, 0, 0),
(202672, 202626, 0, 0, 3, 0, 0),
(202655, 202655, 0, 0, 3, 0, 0),
(202656, 202655, 0, 0, 3, 0, 0),
(202657, 202657, 0, 0, 3, 0, 0),
(202634, 202657, 0, 0, 3, 0, 0),
(202635, 202657, 0, 0, 3, 0, 0),
(202654, 202654, 0, 0, 3, 0, 0),
(202645, 202654, 0, 0, 3, 0, 0),
(202646, 202654, 0, 0, 3, 0, 0),
(202671, 202654, 0, 0, 3, 0, 0),
(202670, 202654, 0, 0, 3, 0, 0),
(202608, 202608, 0, 0, 3, 0, 0),
(202609, 202608, 0, 0, 3, 0, 0),
(202690, 202690, 0, 0, 3, 0, 0),
(202701, 202690, 0, 0, 3, 0, 0),
(202700, 202690, 0, 0, 3, 0, 0),
(202698, 202690, 0, 0, 3, 0, 0),
(202699, 202690, 0, 0, 3, 0, 0),
(202661, 202661, 0, 0, 3, 0, 0),
(202662, 202661, 0, 0, 3, 0, 0),
(202666, 202666, 0, 0, 3, 0, 0),
(202651, 202666, 0, 0, 3, 0, 0),
(202650, 202666, 0, 0, 3, 0, 0),
(202642, 202642, 0, 0, 3, 0, 0),
(202686, 202642, 0, 0, 3, 0, 0),
(202688, 202642, 0, 0, 3, 0, 0),
(202644, 202642, 0, 0, 3, 0, 0),
(202614, 202614, 0, 0, 3, 0, 0),
(202615, 202614, 0, 0, 3, 0, 0),
(202669, 202669, 0, 0, 3, 0, 0),
(202653, 202669, 0, 0, 3, 0, 0),
(202652, 202669, 0, 0, 3, 0, 0),
(202668, 202668, 0, 0, 3, 0, 0),
(202687, 202668, 0, 0, 3, 0, 0),
(202689, 202668, 0, 0, 3, 0, 0),
(202643, 202668, 0, 0, 3, 0, 0),
(202620, 202668, 0, 0, 3, 0, 0),
(202623, 202623, 0, 0, 3, 0, 0),
(202624, 202623, 0, 0, 3, 0, 0),
(202632, 202632, 0, 0, 3, 0, 0),
(202633, 202632, 0, 0, 3, 0, 0);
data/sql/updates/db_world/2022_11_01_02.sql
+3
View File
@@ -0,0 +1,3 @@
-- DB update 2022_11_01_01 -> 2022_11_01_02
UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`&~(128) WHERE (entry = 6109);
data/sql/updates/db_world/2022_11_01_03.sql
+73
View File
@@ -0,0 +1,73 @@
-- DB update 2022_11_01_02 -> 2022_11_01_03
-- Update AI for patrolling packs and already existing packs
UPDATE `creature_formations` SET `GroupAI`=`GroupAI`|0x001 WHERE `leaderGUID` IN (138113,138150,138153,138156,138160,138163,138166,138234,138235,138249,138252) AND `memberGUID` IN (138113,138114,138150,138151,138152,138153,138154,138155,138156,138157,138158,138160,138161,138162,138163,138164,138165,138166,138167,138168,138233,138234,138235,138236,138249,138250,138251,138252,138253,138254,138187,138213,138186, 138187, 138211, 138212, 138213);
DELETE FROM `creature_formations` WHERE `leaderGUID` IN (138111,138124,138125,138145,138170,138172,138175,138180,138182,138184,138188,138190,138195,138198,138201,138204,138207,138214,138217,138220,138223,138227,138238,138247) AND `memberGUID` IN (138111,138112,138124,138125,138126,138145,138146,138170,138171,138172,138173,138175,138176,138177,138178,138179,138180,138182,138183,138184,138185,138188,138189,138190,138191,138194,138195,138196,138197,138198,138199,138201,138202,138203,138204,138205,138206,138207,138208,138214,138215,138216,138217,138218,138219,138220,138221,138222,138223,138224,138225,138227,138228,138229,138230,138231,138232,138238,138239,138240,138241,138242,138243,138244,138246,138247,138248) AND `GroupAI`=3;
INSERT INTO `creature_formations` (`memberGUID`, `leaderGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
(138111, 138111, 0, 0, 3, 0, 0),
(138112, 138111, 0, 0, 3, 0, 0),
(138170, 138170, 0, 0, 3, 0, 0),
(138171, 138170, 0, 0, 3, 0, 0),
(138172, 138172, 0, 0, 3, 0, 0),
(138173, 138172, 0, 0, 3, 0, 0),
(138175, 138175, 0, 0, 3, 0, 0),
(138176, 138175, 0, 0, 3, 0, 0),
(138177, 138175, 0, 0, 3, 0, 0),
(138180, 138180, 0, 0, 3, 0, 0),
(138179, 138180, 0, 0, 3, 0, 0),
(138178, 138180, 0, 0, 3, 0, 0),
(138182, 138182, 0, 0, 3, 0, 0),
(138183, 138182, 0, 0, 3, 0, 0),
(138184, 138184, 0, 0, 3, 0, 0),
(138185, 138184, 0, 0, 3, 0, 0),
(138188, 138188, 0, 0, 3, 0, 0),
(138189, 138188, 0, 0, 3, 0, 0),
(138190, 138190, 0, 0, 3, 0, 0),
(138191, 138190, 0, 0, 3, 0, 0),
(138195, 138195, 0, 0, 3, 0, 0),
(138196, 138195, 0, 0, 3, 0, 0),
(138124, 138124, 0, 0, 3, 0, 0),
(138194, 138124, 0, 0, 3, 0, 0),
(138125, 138125, 0, 0, 3, 0, 0),
(138197, 138125, 0, 0, 3, 0, 0),
(138199, 138125, 0, 0, 3, 0, 0),
(138201, 138201, 0, 0, 3, 0, 0),
(138203, 138201, 0, 0, 3, 0, 0),
(138202, 138201, 0, 0, 3, 0, 0),
(138204, 138204, 0, 0, 3, 0, 0),
(138206, 138204, 0, 0, 3, 0, 0),
(138205, 138204, 0, 0, 3, 0, 0),
(138207, 138207, 0, 0, 3, 0, 0),
(138208, 138207, 0, 0, 3, 0, 0),
(138198, 138198, 0, 0, 3, 0, 0),
(138126, 138198, 0, 0, 3, 0, 0),
(138214, 138214, 0, 0, 3, 0, 0),
(138215, 138214, 0, 0, 3, 0, 0),
(138216, 138214, 0, 0, 3, 0, 0),
(138217, 138217, 0, 0, 3, 0, 0),
(138218, 138217, 0, 0, 3, 0, 0),
(138219, 138217, 0, 0, 3, 0, 0),
(138220, 138220, 0, 0, 3, 0, 0),
(138221, 138220, 0, 0, 3, 0, 0),
(138222, 138220, 0, 0, 3, 0, 0),
(138223, 138223, 0, 0, 3, 0, 0),
(138224, 138223, 0, 0, 3, 0, 0),
(138225, 138223, 0, 0, 3, 0, 0),
(138227, 138227, 0, 0, 3, 0, 0),
(138228, 138227, 0, 0, 3, 0, 0),
(138229, 138227, 0, 0, 3, 0, 0),
(138230, 138227, 0, 0, 3, 0, 0),
(138231, 138227, 0, 0, 3, 0, 0),
(138232, 138227, 0, 0, 3, 0, 0),
(138145, 138145, 0, 0, 3, 0, 0),
(138146, 138145, 0, 0, 3, 0, 0),
(138238, 138238, 0, 0, 3, 0, 0),
(138243, 138238, 0, 0, 3, 0, 0),
(138239, 138238, 0, 0, 3, 0, 0),
(138244, 138238, 0, 0, 3, 0, 0),
(138242, 138238, 0, 0, 3, 0, 0),
(138246, 138238, 0, 0, 3, 0, 0),
(138240, 138238, 0, 0, 3, 0, 0),
(138241, 138238, 0, 0, 3, 0, 0),
(138247, 138247, 0, 0, 3, 0, 0),
(138248, 138247, 0, 0, 3, 0, 0);
data/sql/updates/db_world/2022_11_01_04.sql
+6
View File
@@ -0,0 +1,6 @@
-- DB update 2022_11_01_03 -> 2022_11_01_04
--
DELETE FROM `creature_queststarter` WHERE (`quest` = 14169) AND (`id` IN (34484));
INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES
(34484, 14169);
data/sql/updates/db_world/2022_11_01_05.sql
+12
View File
@@ -0,0 +1,12 @@
-- DB update 2022_11_01_04 -> 2022_11_01_05
-- Fixed spawntime
UPDATE `creature` SET `spawntimesecs`= 60 WHERE `guid`=66716;
-- Add SmartAI to insert the phrase
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 18548;
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 18548) AND (`source_type` = 0) AND (`id` IN (0, 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`, `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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(18548, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Firewing Courier - In Combat - Say Line 0');
data/sql/updates/db_world/2022_11_02_00.sql
+813
View File
@@ -0,0 +1,813 @@
-- DB update 2022_11_01_05 -> 2022_11_02_00
--
SET @GUID = 141000;
SET @POOL = 10091;
DELETE FROM `creature` WHERE `id1` IN (24222, 17378, 17407, 17408) AND `map` IN (530, 545);
DELETE FROM `waypoint_data` WHERE `id` IN (72020, 130500, 435980, 523990, 524000, 524020, 524030, 524040);
DELETE FROM `creature_addon` WHERE `guid` IN (7202, 13050, 43598, 52399, 52400, 52402, 52403, 52404);
INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`) VALUES
(@GUID+0 , 24222, 530, -972.757, 7128.15, 38.0172, 3.71719, 600, 0, 0, 0, 0, 2),
(@GUID+1 , 24222, 530, -1046.56, 7486.97, 225.065, 2.40165, 600, 0, 0, 0, 0, 2),
(@GUID+2 , 24222, 530, -965.405, 7976.56, 32.7939, 1.14893, 600, 0, 0, 0, 0, 2),
(@GUID+3 , 24222, 530, -2670.27, 8556.48, -27.7147, 3.54215, 600, 0, 0, 0, 0, 2),
(@GUID+4 , 24222, 530, -2286.56, 8621.62, -4.77538, 0.781435, 600, 0, 0, 0, 0, 2),
(@GUID+5 , 24222, 530, -2830.78, 7869.31, -12.2189, 5.31315, 600, 40, 0, 0, 0, 1),
(@GUID+6 , 24222, 530, -2740.06, 6962.79, 3.00595, 5.81579, 600, 0, 0, 0, 0, 2),
(@GUID+7 , 24222, 530, -2369.1, 6513.95, 25.7825, 4.41778, 600, 0, 0, 0, 0, 2),
(@GUID+8 , 24222, 530, -1518.15, 7065.83, 14.6125, 2.7433, 600, 0, 0, 0, 0, 2),
(@GUID+9 , 24222, 530, -1351.06, 7200.54, 209.99, 5.82061, 600, 40, 0, 0, 0, 1),
(@GUID+10 , 24222, 530, -1656.49, 7832.09, 165.836, 5.40165, 600, 40, 0, 0, 0, 1),
(@GUID+11 , 24222, 530, -1761.46, 7408.41, 213.805, 0.5665, 600, 40, 0, 0, 0, 1),
(@GUID+12 , 24222, 530, -1154.52, 9099.88, 45.8203, 0.3151, 600, 40, 0, 0, 0, 1),
(@GUID+13 , 24222, 530, -938.68, 8430.34, 36.8891, 5.0903, 600, 40, 0, 0, 0, 1),
(@GUID+14 , 24222, 530, -2028.35, 6663.95, 13.6002, 1.54151, 600, 40, 0, 0, 0, 1),
(@GUID+15 , 24222, 530, -2395.35, 7609.86, -9.0757, 0.9042, 600, 40, 0, 0, 0, 1),
(@GUID+16 , 24222, 530, -791.584, 7289.89, 42.2148, 6, 600, 40, 0, 0, 0, 1),
(@GUID+17 , 24222, 530, -3320.94, 6765.38, 73.3736, 0.726, 600, 40, 0, 0, 0, 1),
(@GUID+18 , 24222, 530, -1571.51, 6438.22, 30.9567, 5.3952, 600, 40, 0, 0, 0, 1),
(@GUID+19 , 24222, 530, -2229.77, 7790.01, 150.518, 0.2626, 600, 40, 0, 0, 0, 1),
(@GUID+20 , 24222, 530, -1770.42, 8535.14, 197.152, 5.6897, 600, 40, 0, 0, 0, 1),
(@GUID+21 , 24222, 530, -2054.84, 6462.36, 19.6635, 5.0692, 600, 40, 0, 0, 0, 1),
(@GUID+22 , 24222, 530, -2224.49, 6775.29, -8.7093, 2.0965, 600, 40, 0, 0, 0, 1),
(@GUID+23 , 24222, 530, -906.058, 7087.6, 171.717, 3.35982, 600, 40, 0, 0, 0, 1),
(@GUID+24 , 24222, 530, -1083.55, 8285.7, 196.857, 1.02248, 600, 40, 0, 0, 0, 1),
(@GUID+25 , 24222, 530, -1524.93, 8887.04, 40.8823, 0.558453, 600, 40, 0, 0, 0, 1),
(@GUID+26 , 24222, 530, -1533.73, 6369.89, 77.6436, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+27 , 24222, 530, -1880.2, 6415.62, 51.1248, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+28 , 24222, 530, -1647.11, 6699.07, -2.79287, 1.71186, 600, 40, 0, 0, 0, 1),
(@GUID+29 , 24222, 530, -1412.78, 6872.9, 22.0742, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+30 , 24222, 530, -558.212, 8848.82, 307.732, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+31 , 24222, 530, -1037.4, 8959.22, 98.4896, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+32 , 24222, 530, -1541.77, 9476.1, 477.089, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+33 , 24222, 530, -1863.5, 9053.94, 72.3042, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+34 , 24222, 530, -2755.52, 8960.76, 14.9967, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+35 , 24222, 530, -1274.04, 9965.75, 276.065, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+36 , 24222, 530, -1909.55, 7905.94, 61.3013, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+37 , 24222, 530, -2404.71, 7174.66, 35.3836, 4.39218, 600, 40, 0, 0, 0, 1),
(@GUID+38 , 24222, 530, -1661.27, 8545.57, -14.7632, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+39 , 24222, 530, -2073.75, 6512.97, 12.7528, 1.59228, 600, 40, 0, 0, 0, 1),
(@GUID+40 , 24222, 530, -2803.85, 6583.56, 35.5174, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+41 , 24222, 530, -2522.15, 6416.33, 203.865, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+42 , 24222, 530, -1931.32, 8855.98, 31.6673, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+43 , 24222, 530, -1928.35, 9085.71, 291.542, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+44 , 24222, 530, -1000.03, 8885.98, 309.124, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+45 , 24222, 530, -1355.43, 6243, 264.369, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+46 , 24222, 530, -2821.88, 8212.47, 202.871, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+47 , 24222, 530, -2499.75, 8631.88, 193.369, 1.337, 600, 40, 0, 0, 0, 1),
(@GUID+48 , 24222, 530, -2683.02, 7330.68, 67.4309, 5.33918, 600, 40, 0, 0, 0, 1),
(@GUID+49 , 24222, 530, -2561.55, 7187.57, 72.0303, 3.41719, 600, 40, 0, 0, 0, 1),
(@GUID+50 , 24222, 530, -2882.34, 7301.31, 11.2854, 2.0943, 600, 40, 0, 0, 0, 1),
(@GUID+51 , 24222, 530, -2776.53, 6663.2, 22.473, 0.580961, 600, 40, 0, 0, 0, 1),
(@GUID+52 , 24222, 530, -1513.64, 8357.44, -11.5452, 0.349707, 600, 40, 0, 0, 0, 1),
(@GUID+53 , 24222, 530, -2614.26, 7597.16, 5.29295, 4.50389, 600, 40, 0, 0, 0, 1),
(@GUID+54 , 24222, 530, -2917.5, 7251.27, 1.05659, 1.50631, 600, 40, 0, 0, 0, 1),
(@GUID+55 , 24222, 530, -2631.66, 7291.07, 67.4309, 5.62992, 600, 40, 0, 0, 0, 1),
(@GUID+56 , 24222, 530, -2573.31, 7022.04, -3.03017, 5.06145, 600, 40, 0, 0, 0, 1),
(@GUID+57 , 24222, 530, -1642.81, 7010.06, 0.893256, 4.29198, 600, 40, 0, 0, 0, 1),
(@GUID+58 , 24222, 530, -1655.13, 7517.28, 195.422, 2.06914, 600, 40, 0, 0, 0, 1),
(@GUID+59 , 24222, 530, -1014.76, 8192.85, 8.66096, 6.1723, 600, 40, 0, 0, 0, 1),
(@GUID+60 , 24222, 530, -2551.91, 6499.81, 233.107, 3.22769, 600, 40, 0, 0, 0, 1),
(@GUID+61 , 24222, 530, -2578.87, 6392.73, 28.8699, 1.90311, 600, 40, 0, 0, 0, 1),
(@GUID+62 , 24222, 530, -1652.35, 7471.63, 195.422, 4.55947, 600, 40, 0, 0, 0, 1),
(@GUID+63 , 17407, 530, -4135.31, 1656.65, 95.1784, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+64 , 17407, 530, -3345.08, 2235.33, 67.36, 3.00256, 600, 5, 0, 0, 0, 1),
(@GUID+65 , 17407, 530, -3613.46, 2313.72, 74.5317, 4.04243, 600, 5, 0, 0, 0, 1),
(@GUID+66 , 17407, 530, -3743.16, 2268.32, 76.7126, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+67 , 17407, 530, -2940.68, 2105, 169.716, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+68 , 17407, 530, -3210.33, 3020.55, 137.592, 0, 600, 5, 0, 0, 0, 1),
(@GUID+69 , 17407, 530, -3278.6, 2648.37, 61.2525, 0, 600, 5, 0, 0, 0, 1),
(@GUID+70 , 17407, 530, -4656.04, 1104.77, -2.10818, 2.04536, 600, 5, 0, 0, 0, 1),
(@GUID+71 , 17407, 530, -4431.38, 982.198, 39.2977, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+72 , 17407, 530, -3874.12, 1374.3, 40.6612, 0.170603, 600, 5, 0, 0, 0, 1),
(@GUID+73 , 17407, 530, -3753.92, 876.921, 70.8189, 1.13328, 600, 5, 0, 0, 0, 1),
(@GUID+74 , 17407, 530, -3613.86, 1031.01, 55.027, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+75 , 17407, 530, -3052.95, 650.166, -7.2665, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+76 , 17407, 530, -3269.84, 652.122, 8.165, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+77 , 17407, 530, -3291.8, 986.472, 41.0171, 2.52436, 600, 5, 0, 0, 0, 1),
(@GUID+78 , 17407, 530, -3280.52, 1120.93, 55.5956, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+79 , 17407, 530, -2782.96, 795.218, 26.9291, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+80 , 17407, 530, -2707.58, 1605.54, 3.1457, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+81 , 17407, 530, -3393.94, 1661.21, 103.961, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+82 , 17407, 530, -4227.91, 1817.06, 127.113, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+83 , 17407, 530, -3904.11, 1651.36, 88.7646, 1.93206, 600, 5, 0, 0, 0, 1),
(@GUID+84 , 17407, 530, -3258.94, 2613.5, 61.4843, 2.85163, 600, 5, 0, 0, 0, 1),
(@GUID+85 , 17407, 530, -3712.96, 1983.37, 83.9948, 3.22376, 600, 5, 0, 0, 0, 1),
(@GUID+86 , 17407, 530, -4109.98, 865.529, 10.3352, 2.68852, 600, 5, 0, 0, 0, 1),
(@GUID+87 , 17407, 530, -4202.34, 681.075, 23.1916, 3.96658, 600, 5, 0, 0, 0, 1),
(@GUID+88 , 17407, 530, -4114.96, 801.909, 4.73443, 5.71631, 600, 5, 0, 0, 0, 1),
(@GUID+89 , 17407, 530, -3140.47, 3040.95, 101.95, 2.98286, 600, 5, 0, 0, 0, 1),
(@GUID+90 , 17407, 530, -3148.71, 1382.2, 12.6086, 4.35301, 600, 5, 0, 0, 0, 1),
(@GUID+91 , 17407, 530, -3327.11, 989.67, 35.3426, 2.00648, 600, 5, 0, 0, 0, 1),
(@GUID+92 , 17407, 530, -4109.67, 650.403, 1.98813, 3.62707, 600, 5, 0, 0, 0, 1),
(@GUID+93 , 17407, 530, -4483.1, 548.593, 125.758, 4.74948, 600, 5, 0, 0, 0, 1),
(@GUID+94 , 17407, 530, -3195.43, 3010.73, 126.392, 2.73567, 600, 5, 0, 0, 0, 1),
(@GUID+95 , 17407, 530, -3624.12, 2526.71, 75.2732, 0, 600, 5, 0, 0, 0, 1),
(@GUID+96 , 17407, 530, -3483.89, 2448.22, 66.401, 3.1455, 600, 5, 0, 0, 0, 1),
(@GUID+97 , 17407, 530, -3495.44, 2019.69, 71.1061, 0.212732, 600, 5, 0, 0, 0, 1),
(@GUID+98 , 17407, 530, -4127.08, 713.083, 1.44002, 6.1942, 600, 5, 0, 0, 0, 1),
(@GUID+99 , 17407, 530, -3290.33, 874.434, 8.84664, 0.295197, 600, 5, 0, 0, 0, 1),
(@GUID+100, 17407, 530, -2714.81, 1312.64, 86.596, 1.75746, 600, 5, 0, 0, 0, 1),
(@GUID+101, 17407, 530, -3692.8, 771.956, 4.50259, 5.05082, 600, 5, 0, 0, 0, 1),
(@GUID+102, 17407, 530, -4097.58, 721.575, 1.6052, 3.12597, 600, 5, 0, 0, 0, 1),
(@GUID+103, 17407, 530, -3610.28, 2556.05, 79.4277, 0, 600, 5, 0, 0, 0, 1),
(@GUID+104, 17407, 530, -3339.6, 2823.89, 133.588, 5.21361, 600, 5, 0, 0, 0, 1),
(@GUID+105, 17407, 530, -3712.9, 2315.91, 77.3437, 4.25529, 600, 5, 0, 0, 0, 1),
(@GUID+106, 17407, 530, -3467.69, 2356.2, 65.1685, 0, 600, 5, 0, 0, 0, 1),
(@GUID+107, 17407, 530, -3024.8, 2711.58, 65.8579, 2.02781, 600, 5, 0, 0, 0, 1),
(@GUID+108, 17407, 530, -3034.71, 2733.81, 66.0817, 4.69481, 600, 5, 0, 0, 0, 1),
(@GUID+109, 17407, 530, -3832.22, 2185.48, 93.6259, 2.55982, 600, 5, 0, 0, 0, 1),
(@GUID+110, 17407, 530, -3004.65, 2754.05, 72.827, 5.46046, 600, 5, 0, 0, 0, 1),
(@GUID+111, 17407, 530, -3203.06, 2003.6, 92.7583, 1.39216, 600, 5, 0, 0, 0, 1),
(@GUID+112, 17407, 530, -3309.78, 2415.47, 60.6708, 0, 600, 5, 0, 0, 0, 1),
(@GUID+113, 17407, 530, -3203.14, 2336.49, 61.5985, 0, 600, 5, 0, 0, 0, 1),
(@GUID+114, 17407, 530, -3481.09, 1964.61, 79.3604, 0, 600, 5, 0, 0, 0, 1),
(@GUID+115, 17407, 530, -3754.07, 1836.06, 89.9446, 0, 600, 5, 0, 0, 0, 1),
(@GUID+116, 17407, 530, -3125.18, 1458.06, 49.0379, 5.2744, 600, 5, 0, 0, 0, 1),
(@GUID+117, 17407, 530, -3543.28, 2421.04, 75.9391, 1.49527, 600, 5, 0, 0, 0, 1),
(@GUID+118, 17407, 530, -3870.86, 1653.51, 84.4796, 0, 600, 5, 0, 0, 0, 1),
(@GUID+119, 17407, 530, -4617.98, 1854.42, 152.165, 0.545774, 600, 5, 0, 0, 0, 1),
(@GUID+120, 17407, 530, -4023.22, 1715.88, 100.531, 1.83832, 600, 5, 0, 0, 0, 1),
(@GUID+121, 17407, 530, -3680.16, 1681.41, 39.4371, 0, 600, 5, 0, 0, 0, 1),
(@GUID+122, 17407, 530, -3143.53, 1869.39, 127.754, 4.19324, 600, 5, 0, 0, 0, 1),
(@GUID+123, 17407, 530, -3346.63, 1742.45, 99.6251, 0, 600, 5, 0, 0, 0, 1),
(@GUID+124, 17407, 530, -3169.54, 1247.33, 36.136, 3.94012, 600, 5, 0, 0, 0, 1),
(@GUID+125, 17407, 530, -3200.01, 2208.32, 63.6119, 0.381413, 600, 5, 0, 0, 0, 1),
(@GUID+126, 17407, 530, -3182.97, 1518.24, 60.931, 0, 600, 5, 0, 0, 0, 1),
(@GUID+127, 17407, 530, -3718.01, 851.856, 62.2649, 1.56103, 600, 5, 0, 0, 0, 1),
(@GUID+128, 17407, 530, -3199.38, 1290.86, 31.0238, 0, 600, 5, 0, 0, 0, 1),
(@GUID+129, 17407, 530, -2647.31, 1086.09, 53.6028, 0, 600, 5, 0, 0, 0, 1),
(@GUID+130, 17407, 530, -2690.47, 1403.7, 97.6697, 0, 600, 5, 0, 0, 0, 1),
(@GUID+131, 17407, 530, -3312.02, 795.035, -19.3869, 0, 600, 5, 0, 0, 0, 1),
(@GUID+132, 17407, 530, -3605.23, 1095.81, 42.6156, 3.83708, 600, 5, 0, 0, 0, 1),
(@GUID+133, 17407, 530, -4253.91, 1406.46, 134.392, 2.31202, 600, 5, 0, 0, 0, 1),
(@GUID+134, 17407, 530, -3669.82, 1074.14, 68.2889, 0, 600, 5, 0, 0, 0, 1),
(@GUID+135, 17407, 530, -3645.01, 738.124, -3.39476, 0, 600, 5, 0, 0, 0, 1),
(@GUID+136, 17407, 530, -4193.04, 649.664, 18.7272, 4.83965, 600, 5, 0, 0, 0, 1),
(@GUID+137, 17407, 530, -4234.98, 1475.99, 128.822, 2.04318, 600, 5, 0, 0, 0, 1),
(@GUID+138, 17407, 530, -4084.65, 855.649, 7.45207, 0, 600, 5, 0, 0, 0, 1),
(@GUID+139, 17407, 530, -4287.04, 805.089, 22.9139, 0, 600, 5, 0, 0, 0, 1),
(@GUID+140, 17407, 530, -3925.41, 1142.87, 27.5269, 0, 600, 5, 0, 0, 0, 1),
(@GUID+141, 17407, 530, -2979.13, 2044.12, 101.14, 4.69872, 600, 5, 0, 0, 0, 1),
(@GUID+142, 17407, 530, -3381, 2407.82, 60.7839, 0.362198, 600, 5, 0, 0, 0, 1),
(@GUID+143, 17407, 530, -3787.35, 1253.11, 88.8691, 0, 600, 5, 0, 0, 0, 1),
(@GUID+144, 17407, 530, -3775.98, 2421.32, 82.9148, 3.65154, 600, 5, 0, 0, 0, 1),
(@GUID+145, 17407, 530, -3376.29, 2435.94, 59.4694, 4.15741, 600, 5, 0, 0, 0, 1),
(@GUID+146, 17407, 530, -3439.67, 2975.34, 171.708, 3.49095, 600, 5, 0, 0, 0, 1),
(@GUID+147, 17407, 530, -3383.89, 2388.05, 62.6273, 5.20708, 600, 5, 0, 0, 0, 1),
(@GUID+148, 17407, 530, -3915.75, 1001.09, 24.3736, 1.51611, 600, 5, 0, 0, 0, 1),
(@GUID+149, 17407, 530, -3370.89, 1013.77, 32.4731, 1.36421, 600, 5, 0, 0, 0, 1),
(@GUID+150, 17407, 530, -3354.83, 2376.86, 62.0746, 1.21824, 600, 5, 0, 0, 0, 1),
(@GUID+151, 17407, 530, -3839.14, 1772.71, 97.2336, 0.95679, 600, 5, 0, 0, 0, 1),
(@GUID+152, 17407, 530, -3422.18, 2967.34, 170.024, 1.9093, 600, 5, 0, 0, 0, 1),
(@GUID+153, 17407, 530, -3539.85, 823.568, 0.961503, 2.03008, 600, 5, 0, 0, 0, 1),
(@GUID+154, 17407, 530, -3305.43, 959.255, 37.793, 0.95814, 600, 5, 0, 0, 0, 1),
(@GUID+155, 17407, 530, -3327.01, 960.812, 32.2572, 1.61963, 600, 5, 0, 0, 0, 1),
(@GUID+156, 17407, 530, -3282.21, 1219.15, 68.7824, 4.38447, 600, 5, 0, 0, 0, 1),
(@GUID+157, 17407, 530, -3217.94, 2514.66, 62.4541, 4.00358, 600, 5, 0, 0, 0, 1),
(@GUID+158, 17407, 530, -3355.91, 2753.99, 127.608, 4.05881, 600, 5, 0, 0, 0, 1),
(@GUID+159, 17407, 530, -3800.42, 2359.38, 102.314, 4.13196, 600, 5, 0, 0, 0, 1),
(@GUID+160, 17407, 530, -3185.37, 2521.34, 62.8453, 0.227457, 600, 5, 0, 0, 0, 1),
(@GUID+161, 17378, 530, 843.678, 7888.29, 17.9469, 0, 600, 0, 0, 0, 0, 0),
(@GUID+162, 17378, 530, 652.946, 7838.43, 17.4672, 0, 600, 0, 0, 0, 0, 0),
(@GUID+163, 17378, 530, 511.152, 7741.22, 23.2331, 0, 600, 0, 0, 0, 0, 0),
(@GUID+164, 17378, 530, 251.054, 7964.76, 17.7742, 0, 600, 0, 0, 0, 0, 0),
(@GUID+165, 17378, 530, 196.196, 8984.76, 17.2438, 0, 600, 0, 0, 0, 0, 0),
(@GUID+166, 17378, 530, 1257.91, 8669.31, 15.2213, 0, 600, 0, 0, 0, 0, 0),
(@GUID+167, 17378, 530, 1226.87, 7946.05, 22.5447, 0, 600, 0, 0, 0, 0, 0),
(@GUID+168, 17378, 530, 748.635, 6487.36, 19.3371, 0, 600, 0, 0, 0, 0, 0),
(@GUID+169, 17378, 530, 275.997, 5172.51, 25.6477, 0, 600, 0, 0, 0, 0, 0),
(@GUID+170, 17378, 530, -722.758, 5540.27, 18.4871, 0, 600, 0, 0, 0, 0, 0),
(@GUID+171, 17378, 530, -873.243, 5691.36, 17.333, 0, 600, 0, 0, 0, 0, 0),
(@GUID+172, 17378, 530, -518.363, 6182.8, 22.7222, 0, 600, 0, 0, 0, 0, 0),
(@GUID+173, 17378, 530, -292.079, 6264.88, 17.3747, 0, 600, 0, 0, 0, 0, 0),
(@GUID+174, 17378, 530, 98.8607, 6436.07, 22.3731, 0, 600, 0, 0, 0, 0, 0),
(@GUID+175, 17378, 530, 172.073, 6526.14, 22.5222, 0, 600, 0, 0, 0, 0, 0),
(@GUID+176, 17378, 530, -12.8972, 7134.33, 17.3751, 0, 600, 0, 0, 0, 0, 0),
(@GUID+177, 17378, 530, -843.988, 5441.1, 22.0223, 0, 600, 0, 0, 0, 0, 0),
(@GUID+178, 17378, 530, -715.492, 5437.73, 21.2707, 0, 600, 0, 0, 0, 0, 0),
(@GUID+179, 17378, 530, 373.762, 5104.27, 23.985, 0, 600, 0, 0, 0, 0, 0),
(@GUID+180, 17378, 530, 909.233, 5236.92, 8.7638, 0, 600, 0, 0, 0, 0, 0),
(@GUID+181, 17378, 530, 791.597, 5868.08, 23.3537, 0, 600, 0, 0, 0, 0, 0),
(@GUID+182, 17378, 530, 384.058, 5523.99, 19.6734, 0, 600, 0, 0, 0, 0, 0),
(@GUID+183, 17378, 530, 89.169, 6735.26, 21.841, 0, 600, 0, 0, 0, 0, 0),
(@GUID+184, 17378, 530, -97.2687, 8878.26, 18.0488, 0, 600, 0, 0, 0, 0, 0),
(@GUID+185, 17378, 530, 382.624, 8873.8, 21.8588, 0, 600, 0, 0, 0, 0, 0),
(@GUID+186, 17378, 530, 487.241, 8803.62, 22.7691, 0, 600, 0, 0, 0, 0, 0),
(@GUID+187, 17378, 530, 609.537, 5456.88, -9.95864, 1.60793, 600, 0, 0, 0, 0, 0),
(@GUID+188, 17378, 530, -439.254, 5525.89, 18.1936, 0.35328, 600, 0, 0, 0, 0, 0),
(@GUID+189, 17378, 530, -525.953, 6011.29, 22.7923, 0.502929, 600, 0, 0, 0, 0, 0),
(@GUID+190, 17378, 530, -401.413, 6147.73, 21.4036, 1.71186, 600, 0, 0, 0, 0, 0),
(@GUID+191, 17378, 530, -307.26, 5422.82, 61.8655, 3.68536, 600, 0, 0, 0, 0, 0),
(@GUID+192, 17378, 530, 120.518, 6399.53, 17.473, 5.2845, 600, 0, 0, 0, 0, 0),
(@GUID+193, 17378, 530, -533.851, 6053.14, 22.9775, 2.8464, 600, 0, 0, 0, 0, 0),
(@GUID+194, 17378, 530, -95.2801, 7298.31, 21.5071, 5.57147, 600, 0, 0, 0, 0, 0),
(@GUID+195, 17378, 530, 859.476, 8435.17, 21.8294, 2.70284, 600, 0, 0, 0, 0, 0),
(@GUID+196, 17378, 530, 519.096, 7675.25, 17.4991, 1.27165, 600, 0, 0, 0, 0, 0),
(@GUID+197, 17378, 530, -43.791, 7337.79, 22.8332, 4.65375, 600, 0, 0, 0, 0, 0),
(@GUID+198, 17378, 530, 828.972, 8393.24, 22.7278, 3.38207, 600, 20, 0, 0, 0, 1),
(@GUID+199, 17378, 530, -49.3596, 7286.34, 18.0618, 5.3291, 600, 0, 0, 0, 0, 0),
(@GUID+200, 17378, 530, 495.431, 7612.18, 18.1781, 6.00743, 600, 0, 0, 0, 0, 0),
(@GUID+201, 17378, 530, -441.216, 5415.12, 17.7642, 6.13461, 600, 0, 0, 0, 0, 0),
(@GUID+202, 17378, 530, 850.568, 6901.18, 17.7901, 1.61866, 600, 0, 0, 0, 0, 0),
(@GUID+203, 17378, 530, -924.401, 5360.02, 18.1361, 5.20505, 600, 0, 0, 0, 0, 0),
(@GUID+204, 17378, 530, -396.794, 5380.57, 20.6727, 4.01965, 600, 0, 0, 0, 0, 0),
(@GUID+205, 17378, 530, 477.434, 6382.61, 22.4513, 3.16612, 600, 0, 0, 0, 0, 0),
(@GUID+206, 17378, 530, 580.255, 5584.74, 16.0756, 4.01258, 600, 5, 0, 0, 0, 1),
(@GUID+207, 17378, 530, -137.455, 8578.42, 18.385, 0.946616, 600, 0, 0, 0, 0, 0),
(@GUID+208, 17378, 530, 72.2129, 8216.37, 23.2695, 3.6805, 600, 5, 0, 0, 0, 1),
(@GUID+209, 17378, 530, -82.2533, 7448.6, 17.444, 5.69698, 600, 0, 0, 0, 0, 0),
(@GUID+210, 17378, 530, -326.517, 6916.21, 24.692, 1.44147, 600, 0, 0, 0, 0, 0),
(@GUID+211, 17378, 530, 455.585, 8048.11, 17.5321, 3.02329, 600, 0, 0, 0, 0, 0),
(@GUID+212, 17378, 530, 876.003, 7917.18, 20.9644, 0.287154, 600, 0, 0, 0, 0, 0),
(@GUID+213, 17378, 530, 669.566, 8355.79, -22.5481, 4.28885, 600, 0, 0, 0, 0, 0),
(@GUID+214, 17378, 530, -285.074, 8540.66, 21.3965, 3.90213, 600, 0, 0, 0, 0, 0),
(@GUID+215, 17378, 530, -350.385, 6010.82, 22.0275, 1.68466, 600, 0, 0, 0, 0, 0),
(@GUID+216, 17378, 530, -906.558, 5621.5, 17.5625, 3.84609, 600, 0, 0, 0, 0, 0),
(@GUID+217, 17378, 530, 18.5613, 6916.93, 19.1848, 3.96984, 600, 20, 0, 0, 0, 1),
(@GUID+218, 17378, 530, 675.999, 7482.79, 22.8875, 3.19828, 600, 15, 0, 0, 0, 1),
(@GUID+219, 17378, 530, 141.284, 8212.86, 23.2735, 1.30806, 600, 5, 0, 0, 0, 1),
(@GUID+220, 17378, 530, -299.535, 7787.75, 21.0394, 0.0214811, 600, 0, 0, 0, 0, 0),
(@GUID+221, 17378, 530, 190.279, 6428.27, 21.9819, 2.25782, 600, 15, 0, 0, 0, 1),
(@GUID+222, 17378, 530, 898.318, 6997.03, 23.3436, 1.71877, 600, 0, 0, 0, 0, 0),
(@GUID+223, 17378, 530, -974.94, 5573.65, 22.9004, 3.03785, 600, 0, 0, 0, 0, 0),
(@GUID+224, 17378, 530, -171.894, 7237.36, 22.9977, 0.558571, 600, 5, 0, 0, 0, 1),
(@GUID+225, 17378, 530, 1141.78, 7679.73, 21.1497, 2.63171, 600, 25, 0, 0, 0, 1),
(@GUID+226, 17378, 530, 1012.96, 7613.95, 22.6123, 4.99345, 600, 15, 0, 0, 0, 1),
(@GUID+227, 17378, 530, 1108.84, 8630.95, 22.6062, 0.290825, 600, 0, 0, 0, 0, 0),
(@GUID+228, 17378, 530, -238.453, 8098.02, 19.5012, 0.973587, 600, 10, 0, 0, 0, 1),
(@GUID+229, 17378, 530, -103.63, 8154.91, 21.91, 0.99751, 600, 0, 0, 0, 0, 0),
(@GUID+230, 17378, 530, -48.4816, 8604.17, 19.51, 3.95514, 600, 0, 0, 0, 0, 0),
(@GUID+231, 17378, 530, 443.419, 5930.36, 20.5689, 5.90431, 600, 5, 0, 0, 0, 1),
(@GUID+232, 17378, 530, 706.697, 8123.91, 23.5474, 2.81861, 600, 5, 0, 0, 0, 1),
(@GUID+233, 17378, 530, 87.7132, 6049.45, 18.222, 3.60961, 600, 0, 0, 0, 0, 0),
(@GUID+234, 17378, 530, -455.65, 5960.22, 18.3674, 3.91801, 600, 0, 0, 0, 0, 0),
(@GUID+235, 17378, 530, 614.654, 8028.59, 17.9629, 0.562534, 600, 20, 0, 0, 0, 1),
(@GUID+236, 17378, 530, 655.333, 6393.88, 19.1723, 2.43911, 600, 10, 0, 0, 0, 1),
(@GUID+237, 17378, 530, 308.547, 5672.44, 22.9932, 4.31301, 600, 0, 0, 0, 0, 0),
(@GUID+238, 17378, 530, 282.682, 8041.24, 17.747, 4.18235, 600, 20, 0, 0, 0, 1),
(@GUID+239, 17378, 530, -106.022, 7519.85, 17.5973, 4.20415, 600, 0, 0, 0, 0, 0),
(@GUID+240, 17378, 530, 358.052, 6429.27, 23.6899, 1.20334, 600, 0, 0, 0, 0, 0),
(@GUID+241, 17378, 530, 198.059, 7495.46, 23.1778, 4.42518, 600, 0, 0, 0, 0, 0),
(@GUID+242, 17378, 530, 990.196, 8310.34, 22.7137, 2.20433, 600, 25, 0, 0, 0, 1),
(@GUID+243, 17378, 530, 753.529, 6380.71, 21.2665, 2.49845, 600, 0, 0, 0, 0, 0),
(@GUID+244, 17378, 530, -116.361, 7222.38, 18.7038, 0.872555, 600, 20, 0, 0, 0, 1),
(@GUID+245, 17378, 530, -65.1354, 8178.54, 22.6206, 0.330403, 600, 25, 0, 0, 0, 1),
(@GUID+246, 17378, 530, 660.267, 7534.77, 22.0061, 2.50676, 600, 0, 0, 0, 0, 0),
(@GUID+247, 17378, 530, -271.23, 7834.36, 21.8223, 2.82412, 600, 1, 0, 0, 0, 1),
(@GUID+248, 17378, 530, -345.859, 8585.9, 17.6341, 3.60874, 600, 0, 0, 0, 0, 0),
(@GUID+249, 17378, 530, -4.6947, 5918.18, 20.2871, 3.21095, 600, 10, 0, 0, 0, 1),
(@GUID+250, 17378, 530, -142.945, 7406.88, 20.5196, 4.00715, 600, 0, 0, 0, 0, 0),
(@GUID+251, 17378, 530, -154.657, 7537.99, 23.0795, 2.78337, 600, 5, 0, 0, 0, 1),
(@GUID+252, 17378, 530, 2.44376, 8228.33, 23.2081, 3.28073, 600, 30, 0, 0, 0, 1),
(@GUID+253, 17378, 530, 888.426, 7836.52, 22.4165, 3.15511, 600, 5, 0, 0, 0, 1),
(@GUID+254, 17378, 530, 401.014, 5945, 21.1376, 2.54222, 600, 10, 0, 0, 0, 1),
(@GUID+255, 17378, 530, -276.669, 6848.98, 22.4585, 4.15472, 600, 30, 0, 0, 0, 1),
(@GUID+256, 17378, 530, 108.118, 7234.06, 23.7033, 6.23518, 600, 0, 0, 0, 0, 0),
(@GUID+257, 17378, 530, 8.51535, 5984.95, 19.303, 3.66995, 600, 25, 0, 0, 0, 1),
(@GUID+258, 17378, 530, -103.35, 7784.53, 21.7509, 0.0146474, 600, 50, 0, 0, 0, 1),
(@GUID+259, 17378, 530, 205.057, 7546.45, 20.8722, 2.78374, 600, 0, 0, 0, 0, 0),
(@GUID+260, 17378, 530, -77.6055, 7745.52, 22.2328, 0.173823, 600, 15, 0, 0, 0, 1),
(@GUID+261, 17408, 530, 2218.62, 2252.56, 97.1471, 0, 600, 5, 0, 0, 0, 1),
(@GUID+262, 17408, 530, 2664.67, 3085.93, 125.92, 0, 600, 5, 0, 0, 0, 1),
(@GUID+263, 17408, 530, 3013.18, 3667.87, 130.374, 0, 600, 5, 0, 0, 0, 1),
(@GUID+264, 17408, 530, 3126.14, 3234.31, 108.699, 0, 600, 5, 0, 0, 0, 1),
(@GUID+265, 17408, 530, 3226.19, 2688.29, 145.962, 0, 600, 5, 0, 0, 0, 1),
(@GUID+266, 17408, 530, 3300.19, 1898.28, 120.51, 0, 600, 5, 0, 0, 0, 1),
(@GUID+267, 17408, 530, 4238.31, 2317.43, 135.443, 0, 600, 5, 0, 0, 0, 1),
(@GUID+268, 17408, 530, 3258.34, 3950.13, 167.063, 0, 600, 5, 0, 0, 0, 1),
(@GUID+269, 17408, 530, 3435.25, 3604.22, 141.997, 0, 600, 5, 0, 0, 0, 1),
(@GUID+270, 17408, 530, 4041.75, 3758.64, 122.973, 0, 600, 5, 0, 0, 0, 1),
(@GUID+271, 17408, 530, 4240.71, 3207.8, 185.072, 0, 600, 5, 0, 0, 0, 1),
(@GUID+272, 17408, 530, 4515.09, 2969.42, 118.967, 0, 600, 5, 0, 0, 0, 1),
(@GUID+273, 17408, 530, 4754.01, 2918.17, 125.516, 0, 600, 5, 0, 0, 0, 1),
(@GUID+274, 17408, 530, 4769.67, 2736.54, 80.8154, 0, 600, 5, 0, 0, 0, 1),
(@GUID+275, 17408, 530, 4737.06, 2613.33, 211.919, 0, 600, 5, 0, 0, 0, 1),
(@GUID+276, 17408, 530, 4148.77, 2209.58, 173.632, 0, 600, 5, 0, 0, 0, 1),
(@GUID+277, 17408, 530, 4342.97, 1799.17, 106.87, 0, 600, 5, 0, 0, 0, 1),
(@GUID+278, 17408, 530, 4108.71, 1878.53, 229.517, 0, 600, 5, 0, 0, 0, 1),
(@GUID+279, 17408, 530, 4168.93, 1453.99, -121.002, 0, 600, 5, 0, 0, 0, 1),
(@GUID+280, 17408, 530, 4013.91, 1424.44, -126.448, 0, 600, 5, 0, 0, 0, 1),
(@GUID+281, 17408, 530, 3497.48, 1785.15, 81.9445, 0, 600, 5, 0, 0, 0, 1),
(@GUID+282, 17408, 530, 3698.48, 1928.44, 115.7, 0, 600, 5, 0, 0, 0, 1),
(@GUID+283, 17408, 530, 3740.98, 2252.82, 127.42, 0, 600, 5, 0, 0, 0, 1),
(@GUID+284, 17408, 530, 3537.75, 3202.33, 104.146, 0, 600, 5, 0, 0, 0, 1),
(@GUID+285, 17408, 530, 3366.61, 3158.71, 102.359, 0, 600, 5, 0, 0, 0, 1),
(@GUID+286, 17408, 530, 3322.78, 2339.56, 95.5345, 0, 600, 5, 0, 0, 0, 1),
(@GUID+287, 17408, 530, 3289.95, 2036.77, 112.027, 0, 600, 5, 0, 0, 0, 1),
(@GUID+288, 17408, 530, 3129.65, 2029.09, 139.522, 0, 600, 5, 0, 0, 0, 1),
(@GUID+289, 17408, 530, 3190.55, 2536.36, 64.8634, 0, 600, 5, 0, 0, 0, 1),
(@GUID+290, 17408, 530, 2920.87, 2578.96, 118.662, 0, 600, 5, 0, 0, 0, 1),
(@GUID+291, 17408, 530, 2490.6, 2251.63, 104.424, 0, 600, 5, 0, 0, 0, 1),
(@GUID+292, 17408, 530, 2609.04, 3340.67, 143.033, 0, 600, 5, 0, 0, 0, 1),
(@GUID+293, 17408, 530, 2523.79, 3942.53, 126.202, 0, 600, 5, 0, 0, 0, 1),
(@GUID+294, 17408, 530, 2601.25, 4195.67, 149.981, 0, 600, 5, 0, 0, 0, 1),
(@GUID+295, 17408, 530, 3033.48, 4371.7, 114.799, 0, 600, 5, 0, 0, 0, 1),
(@GUID+296, 17408, 530, 3118.86, 4313.12, 121.622, 0, 600, 5, 0, 0, 0, 1),
(@GUID+297, 17408, 530, 5025.73, 3238.16, 5.6121, 0, 600, 5, 0, 0, 0, 1),
(@GUID+298, 17408, 530, 3822.21, 1595.89, 123.283, 6.02944, 600, 5, 0, 0, 0, 1),
(@GUID+299, 17408, 530, 2842.32, 4445.83, 112.383, 2.0148, 600, 5, 0, 0, 0, 1),
(@GUID+300, 17408, 530, 3514.25, 3778.49, 137.986, 6.17278, 600, 5, 0, 0, 0, 1),
(@GUID+301, 17408, 530, 3549.33, 3783.3, 126.204, 0.286217, 600, 5, 0, 0, 0, 1),
(@GUID+302, 17408, 530, 4484.57, 3208.16, 143.961, 2.91699, 600, 5, 0, 0, 0, 1),
(@GUID+303, 17408, 530, 4318.55, 3615.4, 123.09, 4.88316, 600, 5, 0, 0, 0, 1),
(@GUID+304, 17408, 530, 3212.41, 3708.39, 129.143, 3.29053, 600, 5, 0, 0, 0, 1),
(@GUID+305, 17408, 530, 3179.57, 3719.43, 135.152, 4.57823, 600, 10, 0, 0, 0, 1),
(@GUID+306, 17408, 530, 2301.89, 2689.84, 127.07, 5.03285, 600, 5, 0, 0, 0, 1),
(@GUID+307, 17408, 530, 3083.26, 2389.34, 138.275, 0.00807271, 600, 30, 0, 0, 0, 1),
(@GUID+308, 17408, 530, 2315.08, 2547.6, 120.97, 3.55257, 600, 5, 0, 0, 0, 1),
(@GUID+309, 17408, 530, 4463.18, 2596.84, 113.615, 6.09058, 600, 5, 0, 0, 0, 1),
(@GUID+310, 17408, 530, 4873.42, 3190.01, 131.305, 5.77324, 600, 5, 0, 0, 0, 1),
(@GUID+311, 17408, 530, 3204.37, 3681.56, 131.04, 3.25644, 600, 5, 0, 0, 0, 1),
(@GUID+312, 17408, 530, 3875.78, 3748.42, 118.306, 3.081, 600, 5, 0, 0, 0, 1),
(@GUID+313, 17408, 530, 4450.32, 3262.56, 144.646, 5.08043, 600, 20, 0, 0, 0, 1),
(@GUID+314, 17408, 530, 4817.98, 3187.77, 147.896, 1.10846, 600, 5, 0, 0, 0, 1),
(@GUID+315, 17408, 530, 3786.08, 1450.62, -147.474, 4.70255, 600, 5, 0, 0, 0, 1),
(@GUID+316, 17408, 530, 3224.92, 3543.12, 123.817, 6.0946, 600, 5, 0, 0, 0, 1),
(@GUID+317, 17408, 530, 2790.02, 3690.82, 125.557, 4.67136, 600, 5, 0, 0, 0, 1),
(@GUID+318, 17408, 530, 2575.77, 2718.02, 110.319, 5.41275, 600, 5, 0, 0, 0, 1),
(@GUID+319, 17408, 530, 2798.82, 3658.66, 139.816, 6.21675, 600, 5, 0, 0, 0, 1),
(@GUID+320, 17408, 530, 2915.64, 3231.27, 165.4, 4.92491, 600, 5, 0, 0, 0, 1),
(@GUID+321, 17408, 530, 3913.95, 4081.3, 190.419, 5.35433, 600, 20, 0, 0, 0, 1),
(@GUID+322, 17408, 530, 3494.92, 3909.82, 139.08, 0.649559, 600, 5, 0, 0, 0, 1),
(@GUID+323, 17408, 530, 4513, 3249.15, 144.59, 3.63445, 600, 5, 0, 0, 0, 1),
(@GUID+324, 17408, 530, 3556.32, 3862.23, 106.117, 1.7883, 600, 5, 0, 0, 0, 1),
(@GUID+325, 17408, 530, 2716.91, 3564.7, 136.954, 1.54541, 600, 5, 0, 0, 0, 1),
(@GUID+326, 17408, 530, 2214.82, 2786.01, 120.67, 5.6057, 600, 5, 0, 0, 0, 1),
(@GUID+327, 17408, 530, 3247.46, 1984.93, 127.996, 3.79818, 600, 5, 0, 0, 0, 1),
(@GUID+328, 17408, 530, 3244.89, 2729.13, 151.233, 4.82596, 600, 5, 0, 0, 0, 1),
(@GUID+329, 17408, 530, 3848.04, 3719.48, 102.622, 4.94102, 600, 5, 0, 0, 0, 1),
(@GUID+330, 17378, 545, -215.653, -120.219, -7.70576, 1.153, 86400, 0, 0, 1, 0, 2);
DELETE FROM `creature_addon` WHERE `guid` IN (@GUID+0, @GUID+1, @GUID+2, @GUID+3, @GUID+4, @GUID+6, @GUID+7, @GUID+8, @GUID+330);
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
(@GUID+0, (@GUID+0)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+1, (@GUID+1)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+2, (@GUID+2)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+3, (@GUID+3)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+4, (@GUID+4)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+6, (@GUID+6)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+7, (@GUID+7)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+8, (@GUID+8)*10, 0, 0, 0, 0, 0, NULL),
(@GUID+330, (@GUID+330)*10, 0, 0, 0, 0, 0, NULL);
DELETE FROM `waypoint_data` WHERE `id` IN ((@GUID+0)*10, (@GUID+1)*10, (@GUID+2)*10, (@GUID+3)*10, (@GUID+4)*10, (@GUID+6)*10, (@GUID+7)*10, (@GUID+8)*10, (@GUID+330)*10);
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`) VALUES
((@GUID+0)*10, 1, -972.757, 7128.15, 38.2672, 3.71719),
((@GUID+0)*10, 2, -795.648, 7205.7, 39.6899, 0.339978),
((@GUID+1)*10, 1, -1046.56, 7486.97, 229.16, 2.40165),
((@GUID+1)*10, 2, -1069.78, 7421.03, 228.622, 4.41226),
((@GUID+1)*10, 3, -1119.78, 7498.12, 218.884, 2.13461),
((@GUID+2)*10, 1, -965.388, 7968.49, 35.9964, 4.72013),
((@GUID+2)*10, 2, -1014.64, 8027.04, 26.0385, 2.199),
((@GUID+2)*10, 3, -878.702, 8082.89, 32.1764, 0.290487),
((@GUID+2)*10, 4, -869.792, 8008.34, 41.453, 4.76726),
((@GUID+3)*10, 1, -2670.27, 8556.48, -24.3327, 3.54215),
((@GUID+3)*10, 2, -2727.6, 8505.54, -33.2203, 3.9859),
((@GUID+3)*10, 3, -2798.87, 8408.73, -32.8769, 4.1901),
((@GUID+3)*10, 4, -2753.05, 8142.68, -41.5723, 5.45065),
((@GUID+3)*10, 5, -2668.57, 8092.38, -40.8327, 6.16379),
((@GUID+3)*10, 6, -2541.15, 8080.54, -42.7048, 0.191619),
((@GUID+3)*10, 7, -2443.69, 8129.17, -36.6802, 0.545049),
((@GUID+3)*10, 8, -2383.76, 8191.97, -33.1643, 1.06734),
((@GUID+3)*10, 9, -2354.92, 8321.24, -32.3505, 1.61712),
((@GUID+3)*10, 10, -2379.65, 8410.24, -30.9855, 1.95484),
((@GUID+3)*10, 11, -2456.4, 8494.97, -29.0302, 2.47634),
((@GUID+3)*10, 12, -2566.02, 8530.06, -25.9058, 2.99078),
((@GUID+3)*10, 13, -2670.74, 8520.71, -30.7958, 3.45809),
((@GUID+4)*10, 1, -2286.56, 8621.62, -5.12038, 0.781435),
((@GUID+4)*10, 2, -2208.61, 8513.88, -5.39454, 6.28314),
((@GUID+4)*10, 3, -2209.42, 8573.6, 2.2257, 1.33906),
((@GUID+4)*10, 4, -2280.99, 8652.49, 0.706009, 2.41898),
((@GUID+6)*10, 1, -2740.06, 6962.79, -2.00595, 4.98013),
((@GUID+6)*10, 2, -2708.33, 6930.69, 5.90239, 5.7341),
((@GUID+6)*10, 3, -2713.82, 6842.92, 4.49263, 4.5403),
((@GUID+6)*10, 4, -2821.07, 6757.41, 12.1712, 3.88057),
((@GUID+6)*10, 5, -2827.28, 6723.3, 21.978, 4.52459),
((@GUID+6)*10, 6, -2806.46, 6586.45, 41.6987, 4.86624),
((@GUID+6)*10, 7, -2740.08, 6641.43, 22.961, 0.731117),
((@GUID+6)*10, 8, -2706.18, 6733.12, 24.1225, 1.28875),
((@GUID+6)*10, 9, -2728.09, 6881.95, 2.40176, 2.40402),
((@GUID+7)*10, 1, -2369.1, 6513.95, 45.4725, 4.41778),
((@GUID+7)*10, 2, -2383.58, 6477.35, 27.9339, 4.28426),
((@GUID+7)*10, 3, -2395.76, 6431.19, 22.4845, 4.48061),
((@GUID+7)*10, 4, -2381.16, 6457.17, 20.261, 0.36119),
((@GUID+7)*10, 5, -2284.68, 6488.93, 16.614, 0.337628),
((@GUID+7)*10, 6, -2197.57, 6495.5, 25.7769, 0.027395),
((@GUID+7)*10, 7, -2145.82, 6435.28, 42.102, 5.39952),
((@GUID+7)*10, 8, -2031.99, 6339.93, 59.739, 5.25029),
((@GUID+7)*10, 9, -1950.56, 6362.55, 59.9186, 0.337628),
((@GUID+7)*10, 10, -1885.45, 6416.22, 55.2037, 0.463292),
((@GUID+7)*10, 11, -1784.83, 6480.16, 51.1629, 0.541832),
((@GUID+7)*10, 12, -2005.43, 6490.27, 110.293, 2.65848),
((@GUID+7)*10, 13, -2159.16, 6562.93, 28.7363, 2.34825),
((@GUID+8)*10, 1, -1518.15, 7065.83, 18.9225, 2.7433),
((@GUID+8)*10, 2, -1585.41, 7114.7, 15.0063, 2.81791),
((@GUID+8)*10, 3, -1608.95, 6993.19, 5.14389, 4.94241),
((@GUID+8)*10, 4, -1540.55, 7013.53, 12.4748, 0.320346),
((@GUID+330)*10, 1, -219.243, -87.3214, -7.75556, 0),
((@GUID+330)*10, 2, -237.991, -82.869, -7.75556, 0),
((@GUID+330)*10, 3, -234.545, -83.6392, -7.75556, 0),
((@GUID+330)*10, 4, -235.09, -83.4633, -7.75556, 0),
((@GUID+330)*10, 5, -231.35, -83.3915, -7.75556, 0),
((@GUID+330)*10, 6, -234.325, -82.7669, -7.75556, 0),
((@GUID+330)*10, 7, -235.124, -83.1971, -7.75556, 0),
((@GUID+330)*10, 8, -233.011, -83.6481, -7.75556, 0),
((@GUID+330)*10, 9, -237.363, -82.7379, -7.75556, 0),
((@GUID+330)*10, 10, -234.96, -85.4146, -7.75556, 0),
((@GUID+330)*10, 11, -229.661, -81.5138, -7.75556, 0),
((@GUID+330)*10, 12, -235.264, -80.6116, -7.75556, 0),
((@GUID+330)*10, 13, -237.991, -82.869, -7.75556, 0),
((@GUID+330)*10, 14, -253.723, -91.4525, -7.75556, 0),
((@GUID+330)*10, 15, -262.447, -110.889, -7.97124, 0),
((@GUID+330)*10, 16, -335.276, -141.766, -6.82003, 0),
((@GUID+330)*10, 17, -331.479, -141.833, -7.7941, 0),
((@GUID+330)*10, 18, -330.438, -164.24, -7.75556, 0),
((@GUID+330)*10, 19, -330.976, -164.392, -7.75556, 0),
((@GUID+330)*10, 20, -330.095, -164.167, -7.75556, 0),
((@GUID+330)*10, 21, -329.231, -165.631, -7.75556, 0),
((@GUID+330)*10, 22, -331.191, -164.605, -7.75556, 0),
((@GUID+330)*10, 23, -333.171, -161.72, -7.75556, 0),
((@GUID+330)*10, 24, -331.78, -164.623, -7.75556, 0),
((@GUID+330)*10, 25, -328.278, -160.304, -7.75556, 0),
((@GUID+330)*10, 26, -330.536, -164.397, -7.75556, 0),
((@GUID+330)*10, 27, -329.347, -165.82, -7.75556, 0),
((@GUID+330)*10, 28, -334.77, -164.946, -7.75556, 0),
((@GUID+330)*10, 29, -320.341, -181.457, -7.75556, 0),
((@GUID+330)*10, 30, -304.362, -198.961, -7.75556, 0),
((@GUID+330)*10, 31, -311.984, -183.922, -7.75556, 0),
((@GUID+330)*10, 32, -313.644, -188.334, -7.75556, 0),
((@GUID+330)*10, 33, -310.435, -183.843, -7.75556, 0),
((@GUID+330)*10, 34, -312.96, -183.704, -7.75556, 0),
((@GUID+330)*10, 35, -317.773, -191.87, -7.75556, 0),
((@GUID+330)*10, 36, -304.362, -198.961, -7.75556, 0),
((@GUID+330)*10, 37, -333.949, -179.522, -7.75556, 0),
((@GUID+330)*10, 38, -324.346, -185.989, -7.75556, 0),
((@GUID+330)*10, 39, -323.858, -185.208, -7.75556, 0),
((@GUID+330)*10, 40, -324.521, -186.18, -7.75556, 0),
((@GUID+330)*10, 41, -321.846, -190.393, -7.75556, 0),
((@GUID+330)*10, 42, -323.434, -183.941, -7.75556, 0),
((@GUID+330)*10, 43, -326.084, -191.174, -7.75556, 0),
((@GUID+330)*10, 44, -333.949, -179.522, -7.75556, 0),
((@GUID+330)*10, 45, -352.853, -193.908, -7.75556, 0),
((@GUID+330)*10, 46, -348.563, -190.33, -7.75556, 0),
((@GUID+330)*10, 47, -349.433, -189.558, -7.75556, 0),
((@GUID+330)*10, 48, -347.874, -190.309, -7.75556, 0),
((@GUID+330)*10, 49, -347.422, -190.672, -7.75556, 0),
((@GUID+330)*10, 50, -343.647, -188.482, -7.75556, 0),
((@GUID+330)*10, 51, -350.772, -190.348, -7.75556, 0),
((@GUID+330)*10, 52, -352.463, -186.964, -7.75556, 0),
((@GUID+330)*10, 53, -348.771, -190.514, -7.75556, 0),
((@GUID+330)*10, 54, -277.588, -157.507, -6.15013, 0),
((@GUID+330)*10, 55, -298.171, -148.8, -8.11589, 0),
((@GUID+330)*10, 56, -296.19, -142.717, -8.05584, 0),
((@GUID+330)*10, 57, -295.476, -145.628, -8.02618, 0),
((@GUID+330)*10, 58, -295.074, -143.135, -8.01944, 0),
((@GUID+330)*10, 59, -293.665, -146.041, -7.96776, 0),
((@GUID+330)*10, 60, -295.095, -145.075, -8.01542, 0),
((@GUID+330)*10, 61, -277.588, -157.507, -6.15013, 0),
((@GUID+330)*10, 62, -249.289, -179.469, -6.57473, 0),
((@GUID+330)*10, 63, -259.792, -172.408, -7.1401, 0);
DELETE FROM `pool_creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+329;
INSERT INTO `pool_creature` (`guid`, `pool_entry`, `description`) VALUES
(@GUID+0 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+1 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+2 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+3 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+4 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+5 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+6 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+7 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+8 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+9 , @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+10, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+11, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+12, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+13, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+14, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+15, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+16, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+17, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+18, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+19, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+20, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+21, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+22, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+23, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+24, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+25, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+26, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+27, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+28, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+29, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+30, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+31, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+32, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+33, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+34, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+35, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+36, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+37, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+38, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+39, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+40, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+41, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+42, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+43, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+44, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+45, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+46, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+47, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+48, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+49, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+50, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+51, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+52, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+53, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+54, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+55, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+56, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+57, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+58, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+59, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+60, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+61, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+62, @POOL+0, 'Windy Cloud (24222) - Nagrand'),
(@GUID+63 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+64 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+65 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+66 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+67 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+68 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+69 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+70 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+71 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+72 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+73 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+74 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+75 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+76 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+77 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+78 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+79 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+80 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+81 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+82 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+83 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+84 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+85 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+86 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+87 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+88 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+89 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+90 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+91 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+92 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+93 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+94 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+95 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+96 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+97 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+98 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+99 , @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+100, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+101, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+102, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+103, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+104, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+105, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+106, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+107, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+108, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+109, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+110, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+111, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+112, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+113, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+114, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+115, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+116, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+117, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+118, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+119, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+120, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+121, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+122, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+123, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+124, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+125, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+126, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+127, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+128, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+129, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+130, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+131, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+132, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+133, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+134, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+135, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+136, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+137, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+138, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+139, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+140, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+141, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+142, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+143, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+144, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+145, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+146, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+147, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+148, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+149, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+150, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+151, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+152, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+153, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+154, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+155, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+156, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+157, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+158, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+159, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+160, @POOL+1, 'Felmist (17407) - Shadowmoon Valley'),
(@GUID+161, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+162, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+163, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+164, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+165, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+166, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+167, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+168, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+169, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+170, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+171, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+172, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+173, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+174, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+175, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+176, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+177, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+178, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+179, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+180, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+181, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+182, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+183, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+184, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+185, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+186, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+187, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+188, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+189, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+190, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+191, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+192, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+193, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+194, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+195, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+196, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+197, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+198, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+199, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+200, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+201, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+202, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+203, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+204, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+205, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+206, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+207, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+208, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+209, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+210, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+211, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+212, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+213, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+214, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+215, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+216, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+217, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+218, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+219, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+220, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+221, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+222, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+223, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+224, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+225, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+226, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+227, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+228, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+229, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+230, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+231, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+232, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+233, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+234, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+235, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+236, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+237, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+238, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+239, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+240, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+241, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+242, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+243, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+244, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+245, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+246, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+247, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+248, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+249, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+250, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+251, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+252, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+253, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+254, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+255, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+256, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+257, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+258, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+259, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+260, @POOL+2, 'Swamp Gas (17378) - Zangarmarsh'),
(@GUID+261, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+262, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+263, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+264, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+265, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+266, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+267, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+268, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+269, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+270, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+271, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+272, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+273, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+274, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+275, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+276, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+277, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+278, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+279, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+280, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+281, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+282, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+283, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+284, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+285, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+286, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+287, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+288, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+289, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+290, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+291, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+292, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+293, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+294, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+295, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+296, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+297, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+298, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+299, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+300, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+301, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+302, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+303, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+304, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+305, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+306, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+307, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+308, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+309, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+310, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+311, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+312, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+313, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+314, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+315, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+316, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+317, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+318, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+319, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+320, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+321, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+322, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+323, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+324, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+325, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+326, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+327, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+328, @POOL+3, 'Arcane Vortex (17408) - Netherstorm'),
(@GUID+329, @POOL+3, 'Arcane Vortex (17408) - Netherstorm');
DELETE FROM `pool_template` WHERE `entry` BETWEEN @POOL+0 AND @POOL+3;
INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
(@POOL+0, 15, 'Nagrand - Windy Cloud (24222)'),
(@POOL+1, 18, 'Shadowmoon Valley - Felmist (17407)'),
(@POOL+2, 18, 'Zangarmarsh - Swamp Gas (17378)'),
(@POOL+3, 15, 'Netherstorm - Arcane Vortex (17408)');
data/sql/updates/db_world/2022_11_02_01.sql
+250
View File
@@ -0,0 +1,250 @@
-- DB update 2022_11_02_00 -> 2022_11_02_01
-- Isle of Quel'Danas
DELETE FROM `gameobject` WHERE `guid` IN (75573,75574,75575,75570,75571,75572,13539,27743,27742,75582,75583,75584,75585,75586,75587,75579,75580,75581,75576,75577,75578);
DELETE FROM `pool_template` WHERE `entry` IN (2017,4870,4871,4872,4873,4874,4875);
DELETE FROM `pool_pool` WHERE `mother_pool`=2017;
DELETE FROM `pool_gameobject` WHERE `pool_entry` IN (4870,4871,4872,4873,4874,4875);
-- Ores
SET @GUID = 103803; -- 124
SET @POOLMOTHER = 8282; -- 7
SET @POOL = 13130; -- 62
DELETE FROM `pool_template` WHERE `description` LIKE '%Isle of Quel\'Danas - Rich Adamantite Deposit%' AND `entry` BETWEEN @POOLMOTHER+0 AND @POOLMOTHER+3;
INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
(@POOLMOTHER+0, 1, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 1'),
(@POOLMOTHER+1, 1, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 2'),
(@POOLMOTHER+2, 1, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 3'),
(@POOLMOTHER+3, 1, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 4');
DELETE FROM `pool_pool` WHERE `description` LIKE '%Isle of Quel\'Danas - Rich Adamantite Deposit%' AND `pool_id` BETWEEN @POOL+0 AND @POOL+72 AND `mother_pool` BETWEEN @POOLMOTHER+0 AND @POOLMOTHER+6;
INSERT INTO `pool_pool` (`pool_id`, `mother_pool`, `chance`, `description`) VALUES
(@POOL+0, @POOLMOTHER+0, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 1'),
(@POOL+1, @POOLMOTHER+0, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 1'),
(@POOL+2, @POOLMOTHER+0, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 1'),
(@POOL+3, @POOLMOTHER+0, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 1'),
(@POOL+4, @POOLMOTHER+0, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 1'),
(@POOL+5, @POOLMOTHER+1, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 2'),
(@POOL+6, @POOLMOTHER+1, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 2'),
(@POOL+7, @POOLMOTHER+1, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 2'),
(@POOL+8, @POOLMOTHER+1, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 2'),
(@POOL+9 , @POOLMOTHER+2, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 3'),
(@POOL+10, @POOLMOTHER+2, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 3'),
(@POOL+11, @POOLMOTHER+2, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 3'),
(@POOL+12, @POOLMOTHER+2, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 3'),
(@POOL+13, @POOLMOTHER+2, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 3'),
(@POOL+14, @POOLMOTHER+3, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 4'),
(@POOL+15, @POOLMOTHER+3, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 4'),
(@POOL+16, @POOLMOTHER+3, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 4'),
(@POOL+17, @POOLMOTHER+3, 0, 'Isle of Quel\'Danas - Rich Adamantite Deposit - Group 4');
DELETE FROM `pool_template` WHERE `description`='Isle of Quel\'Danas - Adamantite / Khorium / Rich' AND `entry` BETWEEN @POOL+0 AND @POOL+72;
INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
(@POOL+0 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+1 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+2 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+3 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+4 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+5 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+6 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+7 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+8 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+9 , 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+10, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+11, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+12, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+13, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+14, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+15, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+16, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich'),
(@POOL+17, 1, 'Isle of Quel\'Danas - Adamantite / Khorium / Rich');
DELETE FROM `pool_gameobject` WHERE `description` LIKE '%Isle of Quel\'Danas%' AND `guid` BETWEEN @GUID+0 AND @GUID+53 AND `pool_entry` BETWEEN @POOL+0 AND @POOL+17;
INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES
(@GUID+0 , @POOL+0 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+3 , @POOL+1 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+6 , @POOL+2 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+9 , @POOL+3 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+12, @POOL+4 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+15, @POOL+5 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+18, @POOL+6 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+21, @POOL+7 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+24, @POOL+8 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+27, @POOL+9 , 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+30, @POOL+10, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+33, @POOL+11, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+36, @POOL+12, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+39, @POOL+13, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+42, @POOL+14, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+45, @POOL+15, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+48, @POOL+16, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+51, @POOL+17, 0, 'Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+1 , @POOL+0 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+4 , @POOL+1 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+7 , @POOL+2 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+10, @POOL+3 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+13, @POOL+4 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+16, @POOL+5 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+19, @POOL+6 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+22, @POOL+7 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+25, @POOL+8 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+28, @POOL+9 , 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+31, @POOL+10, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+34, @POOL+11, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+37, @POOL+12, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+40, @POOL+13, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+43, @POOL+14, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+46, @POOL+15, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+49, @POOL+16, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+52, @POOL+17, 4, 'Khorium for Rich Adamantite - Isle of Quel\'Danas'),
(@GUID+2 , @POOL+0 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+5 , @POOL+1 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+8 , @POOL+2 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+11, @POOL+3 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+14, @POOL+4 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+17, @POOL+5 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+20, @POOL+6 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+23, @POOL+7 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+26, @POOL+8 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+29, @POOL+9 , 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+32, @POOL+10, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+35, @POOL+11, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+38, @POOL+12, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+41, @POOL+13, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+44, @POOL+14, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+47, @POOL+15, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+50, @POOL+16, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas'),
(@GUID+53, @POOL+17, 30, 'Rich Adamantite Deposit - Isle of Quel\'Danas');
DELETE FROM `gameobject` WHERE `map`=530 AND `ZoneId`=4080 AND `id` IN (181556, 181557, 181569) AND `guid` BETWEEN @GUID+0 AND @GUID+53;
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
(@GUID+0 , 181556, 530, 4080, 0, 1, 1, 12439.2, -6560.38, 8.40562, 4.55531, 0, 0, -0.760405, 0.649449, 90, 255, 1, '', 0),
(@GUID+3 , 181556, 530, 4080, 0, 1, 1, 12579.2, -6529.24, 3.68, 3.3571, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+6 , 181556, 530, 4080, 0, 1, 1, 12794.2, -6484.48, 2.82513, -1.90241, 0, 0, 0.814116, -0.580703, 90, 255, 1, '', 0),
(@GUID+9 , 181556, 530, 4080, 0, 1, 1, 12784.3, -6611.37, 4.4867, 0.488691, 0, 0, 0.241921, 0.970296, 90, 255, 1, '', 0),
(@GUID+12, 181556, 530, 4080, 0, 1, 1, 12843.7, -6753.46, 3.81772, 5.51524, 0, 0, -0.374606, 0.927184, 90, 255, 1, '', 0),
(@GUID+15, 181556, 530, 4080, 0, 1, 1, 12744.3, -6833.59, 9.05111, 0.226892, 0, 0, 0.113203, 0.993572, 90, 255, 1, '', 0),
(@GUID+18, 181556, 530, 4080, 0, 1, 1, 12657.4, -6998.76, 18.59, 4.5823, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+21, 181556, 530, 4080, 0, 1, 1, 12527.3, -6938.96, 19.906, 0.087266, 0, 0, 0.0436192, 0.999048, 90, 255, 1, '', 0),
(@GUID+24, 181556, 530, 4080, 0, 1, 1, 12449.8, -6883.67, 21.6143, 3.07177, 0, 0, 0.999391, 0.0349061, 90, 255, 1, '', 0),
(@GUID+27, 181556, 530, 4080, 0, 1, 1, 12668.8, -7320.17, 4.67212, -0.802851, 0, 0, 0.390731, -0.920505, 90, 255, 1, '', 0),
(@GUID+30, 181556, 530, 4080, 0, 1, 1, 12669.4, -7369.6, 3.43107, 2.77507, 0, 0, 0.983254, 0.182238, 90, 255, 1, '', 0),
(@GUID+33, 181556, 530, 4080, 0, 1, 1, 12579, -7351.96, -7.5, 3.7576, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+36, 181556, 530, 4080, 0, 1, 1, 12387.5, -7277.79, 7.13722, 2.23402, 0, 0, 0.898793, 0.438373, 90, 255, 1, '', 0),
(@GUID+39, 181556, 530, 4080, 0, 1, 1, 12298.7, -7281.93, 16.1219, 2.14675, 0, 0, 0.878817, 0.47716, 90, 255, 1, '', 0),
(@GUID+42, 181556, 530, 4080, 0, 1, 1, 12155.2, -7274.7, 4.08998, 0.226893, 0, 0, 0.113203, 0.993572, 90, 255, 1, '', 0),
(@GUID+45, 181556, 530, 4080, 0, 1, 1, 11921.5, -7250.44, 4.03, 1.4721, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+48, 181556, 530, 4080, 0, 1, 1, 11851.8, -7210.55, 9.72, 0.8163, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+51, 181556, 530, 4080, 0, 1, 1, 11666.1, -7135.6, 16.2156, 3.82227, 0, 0, -0.942641, 0.333808, 90, 255, 1, '', 0),
-- Khorium
(@GUID+1 , 181557, 530, 4080, 0, 1, 1, 12439.2, -6560.38, 8.40562, 4.55531, 0, 0, -0.760405, 0.649449, 90, 255, 1, '', 0),
(@GUID+4 , 181557, 530, 4080, 0, 1, 1, 12579.2, -6529.24, 3.68, 3.3571, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+7 , 181557, 530, 4080, 0, 1, 1, 12794.2, -6484.48, 2.82513, -1.90241, 0, 0, 0.814116, -0.580703, 90, 255, 1, '', 0),
(@GUID+10, 181557, 530, 4080, 0, 1, 1, 12784.3, -6611.37, 4.4867, 0.488691, 0, 0, 0.241921, 0.970296, 90, 255, 1, '', 0),
(@GUID+13, 181557, 530, 4080, 0, 1, 1, 12843.7, -6753.46, 3.81772, 5.51524, 0, 0, -0.374606, 0.927184, 90, 255, 1, '', 0),
(@GUID+16, 181557, 530, 4080, 0, 1, 1, 12744.3, -6833.59, 9.05111, 0.226892, 0, 0, 0.113203, 0.993572, 90, 255, 1, '', 0),
(@GUID+19, 181557, 530, 4080, 0, 1, 1, 12657.4, -6998.76, 18.59, 4.5823, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+22, 181557, 530, 4080, 0, 1, 1, 12527.3, -6938.96, 19.906, 0.087266, 0, 0, 0.0436192, 0.999048, 90, 255, 1, '', 0),
(@GUID+25, 181557, 530, 4080, 0, 1, 1, 12449.8, -6883.67, 21.6143, 3.07177, 0, 0, 0.999391, 0.0349061, 90, 255, 1, '', 0),
(@GUID+28, 181557, 530, 4080, 0, 1, 1, 12668.8, -7320.17, 4.67212, -0.802851, 0, 0, 0.390731, -0.920505, 90, 255, 1, '', 0),
(@GUID+31, 181557, 530, 4080, 0, 1, 1, 12669.4, -7369.6, 3.43107, 2.77507, 0, 0, 0.983254, 0.182238, 90, 255, 1, '', 0),
(@GUID+34, 181557, 530, 4080, 0, 1, 1, 12579, -7351.96, -7.5, 3.7576, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+37, 181557, 530, 4080, 0, 1, 1, 12387.5, -7277.79, 7.13722, 2.23402, 0, 0, 0.898793, 0.438373, 90, 255, 1, '', 0),
(@GUID+40, 181557, 530, 4080, 0, 1, 1, 12298.7, -7281.93, 16.1219, 2.14675, 0, 0, 0.878817, 0.47716, 90, 255, 1, '', 0),
(@GUID+43, 181557, 530, 4080, 0, 1, 1, 12155.2, -7274.7, 4.08998, 0.226893, 0, 0, 0.113203, 0.993572, 90, 255, 1, '', 0),
(@GUID+46, 181557, 530, 4080, 0, 1, 1, 11921.5, -7250.44, 4.03, 1.4721, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+49, 181557, 530, 4080, 0, 1, 1, 11851.8, -7210.55, 9.72, 0.8163, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+52, 181557, 530, 4080, 0, 1, 1, 11666.1, -7135.6, 16.2156, 3.82227, 0, 0, -0.942641, 0.333808, 90, 255, 1, '', 0),
-- Rich Adamantite Deposit
(@GUID+2 , 181569, 530, 4080, 0, 1, 1, 12439.2, -6560.38, 8.40562, 4.55531, 0, 0, -0.760405, 0.649449, 90, 255, 1, '', 0),
(@GUID+5 , 181569, 530, 4080, 0, 1, 1, 12579.2, -6529.24, 3.68, 3.3571, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+8 , 181569, 530, 4080, 0, 1, 1, 12794.2, -6484.48, 2.82513, -1.90241, 0, 0, 0.814116, -0.580703, 90, 255, 1, '', 0),
(@GUID+11, 181569, 530, 4080, 0, 1, 1, 12784.3, -6611.37, 4.4867, 0.488691, 0, 0, 0.241921, 0.970296, 90, 255, 1, '', 0),
(@GUID+14, 181569, 530, 4080, 0, 1, 1, 12843.7, -6753.46, 3.81772, 5.51524, 0, 0, -0.374606, 0.927184, 90, 255, 1, '', 0),
(@GUID+17, 181569, 530, 4080, 0, 1, 1, 12744.3, -6833.59, 9.05111, 0.226892, 0, 0, 0.113203, 0.993572, 90, 255, 1, '', 0),
(@GUID+20, 181569, 530, 4080, 0, 1, 1, 12657.4, -6998.76, 18.59, 4.5823, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+23, 181569, 530, 4080, 0, 1, 1, 12527.3, -6938.96, 19.906, 0.087266, 0, 0, 0.0436192, 0.999048, 90, 255, 1, '', 0),
(@GUID+26, 181569, 530, 4080, 0, 1, 1, 12449.8, -6883.67, 21.6143, 3.07177, 0, 0, 0.999391, 0.0349061, 90, 255, 1, '', 0),
(@GUID+29, 181569, 530, 4080, 0, 1, 1, 12668.8, -7320.17, 4.67212, -0.802851, 0, 0, 0.390731, -0.920505, 90, 255, 1, '', 0),
(@GUID+32, 181569, 530, 4080, 0, 1, 1, 12669.4, -7369.6, 3.43107, 2.77507, 0, 0, 0.983254, 0.182238, 90, 255, 1, '', 0),
(@GUID+35, 181569, 530, 4080, 0, 1, 1, 12579, -7351.96, -7.5, 3.7576, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+38, 181569, 530, 4080, 0, 1, 1, 12387.5, -7277.79, 7.13722, 2.23402, 0, 0, 0.898793, 0.438373, 90, 255, 1, '', 0),
(@GUID+41, 181569, 530, 4080, 0, 1, 1, 12298.7, -7281.93, 16.1219, 2.14675, 0, 0, 0.878817, 0.47716, 90, 255, 1, '', 0),
(@GUID+44, 181569, 530, 4080, 0, 1, 1, 12155.2, -7274.7, 4.08998, 0.226893, 0, 0, 0.113203, 0.993572, 90, 255, 1, '', 0),
(@GUID+47, 181569, 530, 4080, 0, 1, 1, 11921.5, -7250.44, 4.03, 1.4721, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+50, 181569, 530, 4080, 0, 1, 1, 11851.8, -7210.55, 9.72, 0.8163, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+53, 181569, 530, 4080, 0, 1, 1, 11666.1, -7135.6, 16.2156, 3.82227, 0, 0, -0.942641, 0.333808, 90, 255, 1, '', 0);
-- Herbs
SET @GUID = 103857; -- 124
SET @POOLMOTHER = 8286; -- 7
DELETE FROM `pool_template` WHERE `description` LIKE '%Isle of Quel\'Danas%' AND `entry` BETWEEN @POOLMOTHER+0 AND @POOLMOTHER+4;
INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
(@POOLMOTHER+0, 7, 'Isle of Quel\'Danas - Mana Thistle - Group 1'),
(@POOLMOTHER+1, 7, 'Isle of Quel\'Danas - Mana Thistle - Group 2'),
(@POOLMOTHER+2, 7, 'Isle of Quel\'Danas - Mana Thistle - Group 3'),
(@POOLMOTHER+3, 7, 'Isle of Quel\'Danas - Mana Thistle - Group 4'),
(@POOLMOTHER+4, 7, 'Isle of Quel\'Danas - Nightmare Vine');
DELETE FROM `pool_gameobject` WHERE `description` LIKE '%Isle of Quel\'Danas%' AND `pool_entry` BETWEEN @POOLMOTHER+0 AND @POOLMOTHER+4;
INSERT INTO `pool_gameobject` (`guid`, `pool_entry`, `chance`, `description`) VALUES
-- GROUP 1
(@GUID+0, @POOLMOTHER+0, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+1, @POOLMOTHER+0, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+2, @POOLMOTHER+0, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(27591 , @POOLMOTHER+0, 0, 'Mana Thistle - Isle of Quel\'Danas'),
-- GROUP 2
(@GUID+3, @POOLMOTHER+1, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+4, @POOLMOTHER+1, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(23985 , @POOLMOTHER+1, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+5, @POOLMOTHER+1, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+6, @POOLMOTHER+1, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+7, @POOLMOTHER+1, 0, 'Mana Thistle - Isle of Quel\'Danas'),
-- GROUP 3
(@GUID+8, @POOLMOTHER+2, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+9, @POOLMOTHER+2, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+10, @POOLMOTHER+2, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+11, @POOLMOTHER+2, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+12, @POOLMOTHER+2, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+13, @POOLMOTHER+2, 0, 'Mana Thistle - Isle of Quel\'Danas'),
-- GROUP 4
(@GUID+14, @POOLMOTHER+3, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+15, @POOLMOTHER+3, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(@GUID+16, @POOLMOTHER+3, 0, 'Mana Thistle - Isle of Quel\'Danas'),
(27617 , @POOLMOTHER+3, 0, 'Mana Thistle - Isle of Quel\'Danas'),
-- GROUP 5
(@GUID+17, @POOLMOTHER+4, 0, 'Nightmare Vine - Isle of Quel\'Danas'),
(@GUID+18, @POOLMOTHER+4, 0, 'Nightmare Vine - Isle of Quel\'Danas'),
(27592 , @POOLMOTHER+4, 0, 'Nightmare Vine - Isle of Quel\'Danas'),
(@GUID+19, @POOLMOTHER+4, 0, 'Nightmare Vine - Isle of Quel\'Danas');
DELETE FROM `gameobject` WHERE `ZoneId`=4080 AND `map`=530 AND `id` IN (181280, 181281) AND `guid` BETWEEN @GUID+0 AND @GUID+19;
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
(@GUID+0 , 181281, 530, 4080, 0, 1, 1, 12481.6, -6463.23, 8, 1.6123, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+1 , 181281, 530, 4080, 0, 1, 1, 12537, -6509.81, 5.5, 2.6824, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+2 , 181281, 530, 4080, 0, 1, 1, 12589, -6439.65, 8.89884, 3.05433, 0, 0, 0.999048, 0.0436193, 90, 255, 1, '', 0),
(@GUID+3 , 181281, 530, 4080, 0, 1, 1, 12668.2, -6866.72, 4.9949, 3.28124, 0, 0, -0.997563, 0.0697661, 90, 255, 1, '', 0),
(@GUID+4 , 181281, 530, 4080, 0, 1, 1, 12599.2, -6872.46, 5.33, 5.2043, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+5 , 181281, 530, 4080, 0, 1, 1, 12714.5, -6958.97, 16.75, 2.4986, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+6 , 181281, 530, 4080, 0, 1, 1, 12668.9, -7047.05, 21.1201, 4.5204, 0, 0, -0.771625, 0.636078, 90, 255, 1, '', 0),
(@GUID+7 , 181281, 530, 4080, 0, 1, 1, 12695.7, -7066.04, 19.2946, 2.63544, 0, 0, 0.968147, 0.250381, 90, 255, 1, '', 0),
(@GUID+8 , 181281, 530, 4080, 0, 1, 1, 12656.8, -7361.54, 4.33, 5.436, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+9 , 181281, 530, 4080, 0, 1, 1, 12669.5, -7421.55, 2.85874, 0.645772, 0, 0, 0.317305, 0.948324, 90, 255, 1, '', 0),
(@GUID+10, 181281, 530, 4080, 0, 1, 1, 12478.2, -7364.87, 2.8825, 4.29351, 0, 0, -0.83867, 0.54464, 90, 255, 1, '', 0),
(@GUID+11, 181281, 530, 4080, 0, 1, 1, 12479.3, -7268.38, 4.83, 6.1154, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+12, 181281, 530, 4080, 0, 1, 1, 12426.1, -7298.33, 1.93, 4.5564, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+13, 181281, 530, 4080, 0, 1, 1, 12330.4, -7352.54, 2.83294, -0.977383, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+14, 181281, 530, 4080, 0, 1, 1, 12020.1, -7295, 8.71, 4.5564, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+15, 181281, 530, 4080, 0, 1, 1, 11946.8, -7295, 2.21, 1.4148, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+16, 181281, 530, 4080, 0, 1, 1, 11818.5, -7233.01, 6.7881, 4.43314, 0, 0, -0.798635, 0.601815, 90, 255, 1, '', 0),
(@GUID+17, 181280, 530, 4080, 0, 1, 1, 11722.8, -7105.36, 24.47, 2.5693, 0, 0, 0, 0, 90, 255, 1, '', 0),
(@GUID+18, 181280, 530, 4080, 0, 1, 1, 11660.1, -7063.5, 10.4082, 2.79252, 0, 0, 0.984807, 0.173652, 90, 255, 1, '', 0),
(@GUID+19, 181280, 530, 4080, 0, 1, 1, 11702.8, -7005.54, 21.78, 1.3362, 0, 0, 0, 0, 90, 255, 1, '', 0);
UPDATE `gameobject` SET `ZoneId`=4080 WHERE `guid` IN (27592, 27617, 23985, 27591);
data/sql/updates/db_world/2022_11_03_00.sql
+3
View File
@@ -0,0 +1,3 @@
-- DB update 2022_11_02_01 -> 2022_11_03_00
--
UPDATE `gameobject` SET `spawntimesecs`=0 WHERE `id` IN (184466, 185302) AND `guid` IN (25331, 28524);
data/sql/updates/db_world/2022_11_03_01.sql
+20
View File
@@ -0,0 +1,20 @@
-- DB update 2022_11_03_00 -> 2022_11_03_01
--
SET @GUID = 29318;
DELETE FROM `gameobject` WHERE `id`=183934 AND `guid` IN (24782,24783,24784,24785,24786);
DELETE FROM `gameobject` WHERE `id`=183934 AND `guid` BETWEEN @GUID+0 AND @GUID+12;
INSERT INTO `gameobject` (`guid`, `id`, `map`, `ZoneId`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
(@GUID+0 , 183934, 530, 3483, 193.659, 3062.06, -0.588734, 2.04204, 0, 0, 0.852641, 0.522496, 120, 255, 1),
(@GUID+1 , 183934, 530, 3483, 185.525, 3007.74, -0.824237, 2.65289, 0, 0, 0.970294, 0.241927, 120, 255, 1),
(@GUID+2 , 183934, 530, 3483, 74.2638, 3039.5, -0.616187, 4.41568, 0, 0, 0.803858, -0.594822, 120, 255, 1),
(@GUID+3 , 183934, 530, 3483, -15.5903, 3096.01, 0.048549, 2.86233, 0, 0, 0.990267, 0.139178, 120, 255, 1),
(@GUID+4 , 183934, 530, 3483, 9.58778, 3181.05, 9.55561, 2.11185, 0, 0, 0.870356, 0.492423, 120, 255, 1),
(@GUID+5 , 183934, 530, 3483, 44.8782, 3077.43, -1.22251, 0.0523589, 0, 0, 0.0261765, 0.999657, 120, 255, 1),
(@GUID+6 , 183934, 530, 3483, 22.7167, 3097.81, -0.868156, 5.5676, 0, 0, 0.350208, -0.936672, 120, 255, 1),
(@GUID+7 , 183934, 530, 3483, 263.389, 3016.84, -0.839023, 6.00393, 0, 0, 0.139174, -0.990268, 120, 255, 1),
(@GUID+8 , 183934, 530, 3483, 20.0564, 3070.53, -0.681531, 5.96903, 0, 0, 0.156433, -0.987689, 120, 255, 1),
(@GUID+9 , 183934, 530, 3483, 26.9473, 3130.27, -0.856446, 4.76475, 0, 0, 0.688354, -0.725375, 120, 255, 1),
(@GUID+10, 183934, 530, 3483, 101.729, 3043.01, -1.22253, 5.48033, 0, 0, 0.390733, -0.920504, 120, 255, 1),
(@GUID+11, 183934, 530, 3483, 174.773, 3039.32, -0.794917, 0.680677, 0, 0, 0.333806, 0.942642, 120, 255, 1),
(@GUID+12, 183934, 530, 3483, 263.389, 3016.84, -0.839023, 6.00393, 0, 0, 0.139174, -0.990268, 120, 255, 1);
data/sql/updates/db_world/2022_11_03_02.sql
+1886
View File
File diff suppressed because it is too large Load Diff
data/sql/updates/db_world/2022_11_03_03.sql
+1304
View File
File diff suppressed because it is too large Load Diff
data/sql/updates/db_world/2022_11_03_04.sql
+1313
View File
File diff suppressed because it is too large Load Diff
data/sql/updates/db_world/2022_11_03_05.sql
+1456
View File
File diff suppressed because it is too large Load Diff
data/sql/updates/db_world/2022_11_03_06.sql
+1316
View File
File diff suppressed because it is too large Load Diff
data/sql/updates/db_world/2022_11_03_07.sql
+1284
View File
File diff suppressed because it is too large Load Diff
data/sql/updates/db_world/2022_11_03_08.sql
+1326
View File
File diff suppressed because it is too large Load Diff
env/docker/etc/dbimport.conf.dockerdist
Vendored
-1
View File
@@ -2,7 +2,6 @@
# Files in LogsDir will reflect on your host directory: docker/worldserver/logs
LogsDir = "/azerothcore/env/dist/logs"
# Files in TempDir will reflect on your host directory: docker/authserver/temp
TempDir = "/azerothcore/env/dist/temp"
DataDir = "/azerothcore/env/dist/data"
# Change this configuration accordingly with your docker setup
env/docker/etc/worldserver.conf.dockerdist
Vendored
-1
View File
@@ -7,7 +7,6 @@
# Files in LogsDir will reflect on your host directory: docker/worldserver/logs
LogsDir = "/azerothcore/env/dist/logs"
# Files in TempDir will reflect on your host directory: docker/authserver/temp
TempDir = "/azerothcore/env/dist/temp"
DataDir = "/azerothcore/env/dist/data"
# Change this configuration accordingly with your docker setup
src/server/apps/worldserver/worldserver.conf.dist
+3 -2
View File
@@ -2919,8 +2919,9 @@ Battleground.SpeedBuffRespawn = 150
#
# Wintergrasp.Enable
# Description: Enable the Wintergrasp battlefield.
# Default: 0 - (Disabled)
# 1 - (Enabled, Experimental as of still being in development)
# Default: 1 - (Enabled, Experimental as of still being in development)
# 0 - (Battleground disabled, Wintergrasp world processing still occurs)
# 2 - (Disable all Wintergrasp processing)
Wintergrasp.Enable = 1
src/server/game/Battlefield/BattlefieldMgr.cpp
+6
View File
@@ -40,6 +40,12 @@ BattlefieldMgr* BattlefieldMgr::instance()
void BattlefieldMgr::InitBattlefield()
{
if (sWorld->getIntConfig(CONFIG_WINTERGRASP_ENABLE) == 2)
{
LOG_INFO("server.loading", "Battlefield: Wintergrasp is disabled.");
LOG_INFO("server.loading", " ");
return;
}
Battlefield* pBf = new BattlefieldWG;
// respawn, init variables
if (!pBf->SetupBattlefield())
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ bool BattlefieldWG::SetupBattlefield()
InitStalker(BATTLEFIELD_WG_NPC_STALKER, WintergraspStalkerPos[0], WintergraspStalkerPos[1], WintergraspStalkerPos[2], WintergraspStalkerPos[3]);
m_MaxPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MAX);
m_IsEnabled = sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE);
m_IsEnabled = sWorld->getIntConfig(CONFIG_WINTERGRASP_ENABLE) == 1;
m_MinPlayer = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN);
m_MinLevel = sWorld->getIntConfig(CONFIG_WINTERGRASP_PLR_MIN_LVL);
m_BattleTime = sWorld->getIntConfig(CONFIG_WINTERGRASP_BATTLETIME) * MINUTE * IN_MILLISECONDS;
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -8700,7 +8700,7 @@ void Player::SendBGWeekendWorldStates()
void Player::SendBattlefieldWorldStates()
{
/// Send misc stuff that needs to be sent on every login, like the battle timers.
if (sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE))
if (sWorld->getIntConfig(CONFIG_WINTERGRASP_ENABLE) == 1)
{
if (BattlefieldWG* wg = (BattlefieldWG*)sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG))
{
src/server/game/Entities/Player/PlayerStorage.cpp
+2
View File
@@ -2593,6 +2593,8 @@ Item* Player::StoreNewItem(ItemPosCountVec const& dest, uint32 item, bool update
stmt->SetData(1, ss.str());
CharacterDatabase.Execute(stmt);
}
sScriptMgr->OnLootItem(this, pItem, count, ObjectGuid::Empty);
}
return pItem;
}
src/server/game/Entities/Unit/Unit.cpp
+4 -1
View File
@@ -4327,6 +4327,7 @@ Aura* Unit::_TryStackingOrRefreshingExistingAura(SpellInfo const* newAura, uint8
// try to increase stack amount
foundAura->ModStackAmount(1, AURA_REMOVE_BY_DEFAULT, periodicReset);
sScriptMgr->OnAuraApply(this, foundAura);
return foundAura;
}
}
@@ -4473,6 +4474,8 @@ void Unit::_ApplyAura(AuraApplication* aurApp, uint8 effMask)
if (effMask & 1 << i && (!aurApp->GetRemoveMode()))
aurApp->_HandleEffect(i, true);
}
sScriptMgr->OnAuraApply(this, aura);
}
// removes aura application from lists and unapplies effects
@@ -11200,7 +11203,7 @@ void Unit::SendHealSpellLog(Unit* victim, uint32 SpellID, uint32 Damage, uint32
int32 Unit::HealBySpell(HealInfo& healInfo, bool critical)
{
uint32 heal = healInfo.GetHeal();
sScriptMgr->ModifyHealRecieved(this, healInfo.GetTarget(), heal);
sScriptMgr->ModifyHealReceived(this, healInfo.GetTarget(), heal, healInfo.GetSpellInfo());
healInfo.SetHeal(heal);
// calculate heal absorb and reduce healing
src/server/game/Maps/MapUpdater.cpp
+6 -1
View File
@@ -15,9 +15,10 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "MapUpdater.h"
#include "DatabaseEnv.h"
#include "LFGMgr.h"
#include "Map.h"
#include "MapUpdater.h"
#include "Metric.h"
class UpdateRequest
@@ -140,6 +141,10 @@ void MapUpdater::update_finished()
void MapUpdater::WorkerThread()
{
LoginDatabase.WarnAboutSyncQueries(true);
CharacterDatabase.WarnAboutSyncQueries(true);
WorldDatabase.WarnAboutSyncQueries(true);
while (1)
{
UpdateRequest* request = nullptr;
src/server/game/Scripting/ScriptDefines/UnitScript.cpp
+10 -2
View File
@@ -77,11 +77,11 @@ void ScriptMgr::ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& dama
});
}
void ScriptMgr::ModifyHealRecieved(Unit* target, Unit* attacker, uint32& damage)
void ScriptMgr::ModifyHealReceived(Unit* target, Unit* healer, uint32& heal, SpellInfo const* spellInfo)
{
ExecuteScript<UnitScript>([&](UnitScript* script)
{
script->ModifyHealRecieved(target, attacker, damage);
script->ModifyHealReceived(target, healer, heal, spellInfo);
});
}
@@ -242,3 +242,11 @@ void ScriptMgr::OnUnitDeath(Unit* unit, Unit* killer)
script->OnUnitDeath(unit, killer);
});
}
void ScriptMgr::OnAuraApply(Unit* unit, Aura* aura)
{
ExecuteScript<UnitScript>([&](UnitScript* script)
{
script->OnAuraApply(unit, aura);
});
}
src/server/game/Scripting/ScriptMgr.h
+5 -2
View File
@@ -432,13 +432,15 @@ public:
virtual void ModifySpellDamageTaken(Unit* /*target*/, Unit* /*attacker*/, int32& /*damage*/) { }
// Called when Heal is Recieved
virtual void ModifyHealRecieved(Unit* /*target*/, Unit* /*attacker*/, uint32& /*damage*/) { }
virtual void ModifyHealReceived(Unit* /*target*/, Unit* /*healer*/, uint32& /*heal*/, SpellInfo const* /*spellInfo*/) { }
//Called when Damage is Dealt
virtual uint32 DealDamage(Unit* /*AttackerUnit*/, Unit* /*pVictim*/, uint32 damage, DamageEffectType /*damagetype*/) { return damage; }
virtual void OnBeforeRollMeleeOutcomeAgainst(Unit const* /*attacker*/, Unit const* /*victim*/, WeaponAttackType /*attType*/, int32& /*attackerMaxSkillValueForLevel*/, int32& /*victimMaxSkillValueForLevel*/, int32& /*attackerWeaponSkill*/, int32& /*victimDefenseSkill*/, int32& /*crit_chance*/, int32& /*miss_chance*/, int32& /*dodge_chance*/, int32& /*parry_chance*/, int32& /*block_chance*/ ) { };
virtual void OnAuraApply(Unit* /*unit*/, Aura* /*aura*/) { }
virtual void OnAuraRemove(Unit* /*unit*/, AuraApplication* /*aurApp*/, AuraRemoveMode /*mode*/) { }
[[nodiscard]] virtual bool IfNormalReaction(Unit const* /*unit*/, Unit const* /*target*/, ReputationRank& /*repRank*/) { return true; }
@@ -2472,9 +2474,10 @@ public: /* UnitScript */
void ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage);
void ModifyMeleeDamage(Unit* target, Unit* attacker, uint32& damage);
void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage);
void ModifyHealRecieved(Unit* target, Unit* attacker, uint32& addHealth);
void ModifyHealReceived(Unit* target, Unit* healer, uint32& addHealth, SpellInfo const* spellInfo);
uint32 DealDamage(Unit* AttackerUnit, Unit* pVictim, uint32 damage, DamageEffectType damagetype);
void OnBeforeRollMeleeOutcomeAgainst(Unit const* attacker, Unit const* victim, WeaponAttackType attType, int32& attackerMaxSkillValueForLevel, int32& victimMaxSkillValueForLevel, int32& attackerWeaponSkill, int32& victimDefenseSkill, int32& crit_chance, int32& miss_chance, int32& dodge_chance, int32& parry_chance, int32& block_chance);
void OnAuraApply(Unit* /*unit*/, Aura* /*aura*/);
void OnAuraRemove(Unit* unit, AuraApplication* aurApp, AuraRemoveMode mode);
bool IfNormalReaction(Unit const* unit, Unit const* target, ReputationRank& repRank);
bool IsNeedModSpellDamagePercent(Unit const* unit, AuraEffect* auraEff, float& doneTotalMod, SpellInfo const* spellProto);
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+1
View File
@@ -6619,6 +6619,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
// Script Hook For HandlePeriodicDamageAurasTick -- Allow scripts to change the Damage pre class mitigation calculations
sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, heal);
sScriptMgr->ModifyHealReceived(target, caster, heal, GetSpellInfo());
HealInfo healInfo(caster, target, heal, GetSpellInfo(), GetSpellInfo()->GetSchoolMask());
Unit::CalcHealAbsorb(healInfo);
src/server/game/Spells/SpellMgr.cpp
+1 -1
View File
@@ -1143,7 +1143,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
if (!player)
return false;
if (!sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE))
if (sWorld->getIntConfig(CONFIG_WINTERGRASP_ENABLE) != 1)
return false;
Battlefield* Bf = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG);
src/server/game/World/IWorld.h
+1 -1
View File
@@ -139,7 +139,6 @@ enum WorldBoolConfigs
CONFIG_ALLOW_TICKETS,
CONFIG_DELETE_CHARACTER_TICKET_TRACE,
CONFIG_PRESERVE_CUSTOM_CHANNELS,
CONFIG_WINTERGRASP_ENABLE,
CONFIG_PDUMP_NO_PATHS,
CONFIG_PDUMP_NO_OVERWRITE,
CONFIG_ENABLE_MMAPS, // pussywizard
@@ -312,6 +311,7 @@ enum WorldIntConfigs
CONFIG_BATTLEGROUND_SPEED_BUFF_RESPAWN,
CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_LIMIT_MIN_LEVEL,
CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_LIMIT_MIN_PLAYERS,
CONFIG_WINTERGRASP_ENABLE,
CONFIG_ARENA_MAX_RATING_DIFFERENCE,
CONFIG_ARENA_RATING_DISCARD_TIMER,
CONFIG_ARENA_PREV_OPPONENTS_DISCARD_TIMER,
src/server/game/World/World.cpp
+1 -1
View File
@@ -1385,7 +1385,7 @@ void World::LoadConfigSettings(bool reload)
MMAP::MMapFactory::InitializeDisabledMaps();
// Wintergrasp
m_bool_configs[CONFIG_WINTERGRASP_ENABLE] = sConfigMgr->GetOption<bool>("Wintergrasp.Enable", false);
m_int_configs[CONFIG_WINTERGRASP_ENABLE] = sConfigMgr->GetOption<int32>("Wintergrasp.Enable", 1);
m_int_configs[CONFIG_WINTERGRASP_PLR_MAX] = sConfigMgr->GetOption<int32>("Wintergrasp.PlayerMax", 100);
m_int_configs[CONFIG_WINTERGRASP_PLR_MIN] = sConfigMgr->GetOption<int32>("Wintergrasp.PlayerMin", 0);
m_int_configs[CONFIG_WINTERGRASP_PLR_MIN_LVL] = sConfigMgr->GetOption<int32>("Wintergrasp.PlayerMinLvl", 77);
src/server/scripts/Commands/cs_group.cpp
+2 -2
View File
@@ -33,7 +33,7 @@ public:
{
static ChatCommandTable groupCommandTable =
{
{ "list", HandleGroupListCommand, SEC_GAMEMASTER, Console::No },
{ "list", HandleGroupListCommand, SEC_GAMEMASTER, Console::Yes },
{ "join", HandleGroupJoinCommand, SEC_GAMEMASTER, Console::No },
{ "remove", HandleGroupRemoveCommand, SEC_GAMEMASTER, Console::No },
{ "disband", HandleGroupDisbandCommand, SEC_GAMEMASTER, Console::No },
@@ -219,7 +219,7 @@ public:
return true;
}
handler->PSendSysMessage(LANG_GROUP_TYPE, (groupTarget->isRaidGroup() ? "raid" : "party"));
handler->PSendSysMessage(LANG_GROUP_TYPE, (groupTarget->isRaidGroup() ? "Raid" : "Party"), groupTarget->GetMembersCount());
for (auto const& slot : groupTarget->GetMemberSlots())
{
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+13
View File
@@ -340,6 +340,19 @@ struct boss_veklor : public boss_twinemperorsAI
_scheduler
.Schedule(4s, [this](TaskContext context)
{
if (me->GetVictim())
{
if (!me->IsWithinDist(me->GetVictim(), 45.0f))
{
me->GetMotionMaster()->MoveChase(me->GetVictim(), 45.0f, 0);
}
else
{
me->StopMoving();
me->GetMotionMaster()->Clear();
}
}
DoCastVictim(SPELL_SHADOW_BOLT);
context.Repeat(2500ms);
})
src/server/scripts/Northrend/zone_wintergrasp.cpp
+1 -1
View File
@@ -350,7 +350,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (!sWorld->getBoolConfig(CONFIG_WINTERGRASP_ENABLE))
if (sWorld->getIntConfig(CONFIG_WINTERGRASP_ENABLE) != 1)
return;
ScriptedAI::UpdateAI(diff);
src/server/scripts/Spells/spell_mage.cpp
+22 -9
View File
@@ -789,12 +789,13 @@ class spell_mage_master_of_elements : public AuraScript
bool CheckProc(ProcEventInfo& eventInfo)
{
_spellInfo = eventInfo.GetSpellInfo();
if (!_spellInfo || !eventInfo.GetActor() || !eventInfo.GetActionTarget())
if (!eventInfo.GetActor() || !eventInfo.GetActionTarget())
{
return false;
}
_spellInfo = eventInfo.GetSpellInfo();
bool selectCaster = false;
// Triggered spells cost no mana so we need triggering spellInfo
if (SpellInfo const* triggeredByAuraSpellInfo = eventInfo.GetTriggerAuraSpell())
@@ -803,6 +804,13 @@ class spell_mage_master_of_elements : public AuraScript
selectCaster = true;
}
if (!_spellInfo)
{
return false;
}
_ticksModifier = 1;
// If spell is periodic, mana amount is divided by tick number
if (eventInfo.GetTriggerAuraEffectIndex() >= EFFECT_0)
{
@@ -812,24 +820,29 @@ class spell_mage_master_of_elements : public AuraScript
{
if (AuraEffect const* aurEff = target->GetAuraEffect(_spellInfo->Id, eventInfo.GetTriggerAuraEffectIndex(), caster->GetGUID()))
{
ticksModifier = aurEff->GetTotalTicks();
_ticksModifier = std::max(1, aurEff->GetTotalTicks());
}
}
}
}
return _spellInfo; // eventInfo.GetSpellInfo()
return true;
}
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
int32 mana = int32(_spellInfo->CalcPowerCost(GetTarget(), eventInfo.GetSchoolMask()) / ticksModifier);
mana = CalculatePct(mana, aurEff->GetAmount());
if (Unit* target = GetTarget())
{
int32 mana = int32(_spellInfo->CalcPowerCost(target, eventInfo.GetSchoolMask()) / _ticksModifier);
mana = CalculatePct(mana, aurEff->GetAmount());
if (mana > 0)
GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, nullptr, aurEff);
if (mana > 0)
{
target->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, target, true, nullptr, aurEff);
}
}
}
void Register() override
@@ -840,7 +853,7 @@ class spell_mage_master_of_elements : public AuraScript
private:
SpellInfo const* _spellInfo = nullptr;
uint8 ticksModifier = 1;
uint8 _ticksModifier = 0;
};
enum SilvermoonPolymorph