yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update naxx40_creatures.sql (#584)

Browse Source 
naxx40_creatures code cleanup part 2
This commit is contained in:
Grimfeather
2025-07-28 17:27:44 +02:00
committed by GitHub
parent 815919b90d
commit 7433e89a91
1 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
sql/world/base/naxx40_creatures.sql
View File

@@ -2894,8 +2894,6 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`,
(@GUID+1058, @CENTRY+90, 0, 0, 533, 0, 0, 4, 1, 0, 2770.1, -3782.59, 274.983, 1.02974, 3600, 0, 0, 13033, 0, 0, 0, 0, 0, '', 0, 0, NULL), (@GUID+1058, @CENTRY+90, 0, 0, 533, 0, 0, 4, 1, 0, 2770.1, -3782.59, 274.983, 1.02974, 3600, 0, 0, 13033, 0, 0, 0, 0, 0, '', 0, 0, NULL),
(@GUID+1059, @CENTRY+90, 0, 0, 533, 0, 0, 4, 1, 0, 2846.52, -3789.07, 274.983, 2.23402, 3600, 0, 0, 13033, 0, 0, 0, 0, 0, '', 0, 0, NULL); (@GUID+1059, @CENTRY+90, 0, 0, 533, 0, 0, 4, 1, 0, 2846.52, -3789.07, 274.983, 2.23402, 3600, 0, 0, 13033, 0, 0, 0, 0, 0, '', 0, 0, NULL);
SET @WPID := 3611600; -- way point id
DELETE FROM `waypoint_data` WHERE `id` IN (@WPID+1020,@WPID+1030,@WPID+1080,@WPID+1090,@WPID+1100,@WPID+1110,@WPID+1120,@WPID+1520,@WPID+1530,@WPID+1600,@WPID+1630,@WPID+1780,@WPID+1830,@WPID+2200,@WPID+2300, DELETE FROM `waypoint_data` WHERE `id` IN (@WPID+1020,@WPID+1030,@WPID+1080,@WPID+1090,@WPID+1100,@WPID+1110,@WPID+1120,@WPID+1520,@WPID+1530,@WPID+1600,@WPID+1630,@WPID+1780,@WPID+1830,@WPID+2200,@WPID+2300,
@WPID+2330,@WPID+2340,@WPID+2410,@WPID+2450,@WPID+2480,@WPID+2530,@WPID+2570,@WPID+2590,@WPID+2620,@WPID+2630,@WPID+2670,@WPID+2810,@WPID+2900,@WPID+3040,@WPID+3200,@WPID+3210,@WPID+3220,@WPID+3230,@WPID+3240, @WPID+2330,@WPID+2340,@WPID+2410,@WPID+2450,@WPID+2480,@WPID+2530,@WPID+2570,@WPID+2590,@WPID+2620,@WPID+2630,@WPID+2670,@WPID+2810,@WPID+2900,@WPID+3040,@WPID+3200,@WPID+3210,@WPID+3220,@WPID+3230,@WPID+3240,
@@ -4294,42 +4292,42 @@ INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`,
(@GUID+994, @GUID+996, 6.6079, 294.9752887094066, 515, 0, 0), (@GUID+994, @GUID+996, 6.6079, 294.9752887094066, 515, 0, 0),
(@GUID+999, @GUID+997, 14.0084, 129.0971315254917, 515, 0, 0), (@GUID+999, @GUID+997, 14.0084, 129.0971315254917, 515, 0, 0),
(@GUID+999, @GUID+998, 13.0754, 55.966059062142705, 515, 0, 0), (@GUID+999, @GUID+998, 13.0754, 55.966059062142705, 515, 0, 0),
(@GUID+999, 362000, 7.50705, 146.83533190494686, 515, 0, 0), (@GUID+999, @GUID+1000, 7.50705, 146.83533190494686, 515, 0, 0),
(@GUID+999, 362001, 5.55853, 63.037389578088295, 515, 0, 0), (@GUID+999, @GUID+1001, 5.55853, 63.037389578088295, 515, 0, 0),
(362004, 362002, 17.0155, 299.56639952178983, 515, 0, 0), (@GUID+1004, @GUID+1002, 17.0155, 299.56639952178983, 515, 0, 0),
(362004, 362003, 15.8089, 241.83345321102274, 515, 0, 0), (@GUID+1004, @GUID+1003, 15.8089, 241.83345321102274, 515, 0, 0),
(362004, 362005, 8.0545, 314.10692244661993, 515, 0, 0), (@GUID+1004, @GUID+1005, 8.0545, 314.10692244661993, 515, 0, 0),
(362004, 362006, 7.17237, 231.67720333453374, 515, 0, 0), (@GUID+1004, @GUID+1006, 7.17237, 231.67720333453374, 515, 0, 0),
(362009, 362007, 15.2191, 255.29681548100683, 515, 0, 0), (@GUID+1009, @GUID+1007, 15.2191, 255.29681548100683, 515, 0, 0),
(362009, 362008, 14.2481, 195.22104474594974, 515, 0, 0), (@GUID+1009, @GUID+1008, 14.2481, 195.22104474594974, 515, 0, 0),
(362009, 362010, 6.34493, 262.6449992035596, 515, 0, 0), (@GUID+1009, @GUID+1010, 6.34493, 262.6449992035596, 515, 0, 0),
(362009, 362011, 5.95976, 189.60491243807743, 515, 0, 0), (@GUID+1009, @GUID+1011, 5.95976, 189.60491243807743, 515, 0, 0),
(362014, 362012, 16.6061, 146.0755898686034, 515, 0, 0), (@GUID+1014, @GUID+1012, 16.6061, 146.0755898686034, 515, 0, 0),
(362014, 362013, 15.9731, 206.8492231981298, 515, 0, 0), (@GUID+1014, @GUID+1013, 15.9731, 206.8492231981298, 515, 0, 0),
(362014, 362015, 7.88315, 213.72643561308507, 515, 0, 0), (@GUID+1014, @GUID+1015, 7.88315, 213.72643561308507, 515, 0, 0),
(362014, 362016, 7.52905, 138.84027883169136, 515, 0, 0), (@GUID+1014, @GUID+1016, 7.52905, 138.84027883169136, 515, 0, 0),
(362019, 362017, 15.2536, 344.5739532027015, 515, 0, 0), (@GUID+1019, @GUID+1017, 15.2536, 344.5739532027015, 515, 0, 0),
(362019, 362018, 15.1485, 282.1599417057155, 515, 0, 0), (@GUID+1019, @GUID+1018, 15.1485, 282.1599417057155, 515, 0, 0),
(362019, 362020, 6.68047, 352.2458580795032, 515, 0, 0), (@GUID+1019, @GUID+1020, 6.68047, 352.2458580795032, 515, 0, 0),
(362019, 362021, 6.65651, 275.5124853666077, 515, 0, 0), (@GUID+1019, @GUID+1021, 6.65651, 275.5124853666077, 515, 0, 0),
(362024, 362022, 17.4459, 162.56989887482953, 515, 0, 0), (@GUID+1024, @GUID+1022, 17.4459, 162.56989887482953, 515, 0, 0),
(362024, 362023, 15.3585, 111.00255139746517, 515, 0, 0), (@GUID+1024, @GUID+1023, 15.3585, 111.00255139746517, 515, 0, 0),
(362024, 362025, 6.76385, 169.52503354992257, 515, 0, 0), (@GUID+1024, @GUID+1025, 6.76385, 169.52503354992257, 515, 0, 0),
(362024, 362026, 6.22538, 109.62458790017554, 515, 0, 0), (@GUID+1024, @GUID+1026, 6.22538, 109.62458790017554, 515, 0, 0),
(362027, 362028, 18.3816, 299.6477595286985, 515, 0, 0), (@GUID+1027, @GUID+1028, 18.3816, 299.6477595286985, 515, 0, 0),
(362027, 362029, 16.4744, 248.44538616683246, 515, 0, 0), (@GUID+1027, @GUID+1029, 16.4744, 248.44538616683246, 515, 0, 0),
(362027, 362030, 7.88833, 304.7373436228456, 515, 0, 0), (@GUID+1027, @GUID+1030, 7.88833, 304.7373436228456, 515, 0, 0),
(362027, 362031, 7.82758, 241.49082444953453, 515, 0, 0), (@GUID+1027, @GUID+1031, 7.82758, 241.49082444953453, 515, 0, 0),
(362034, 362032, 14.6274, 122.81694113306274, 515, 0, 0), (@GUID+1034, @GUID+1032, 14.6274, 122.81694113306274, 515, 0, 0),
(362034, 362033, 14.7307, 59.785281132925746, 515, 0, 0), (@GUID+1034, @GUID+1033, 14.7307, 59.785281132925746, 515, 0, 0),
(362034, 362035, 7.43685, 122.88225832170765, 515, 0, 0), (@GUID+1034, @GUID+1035, 7.43685, 122.88225832170765, 515, 0, 0),
(362034, 362036, 7.38238, 60.17088172904879, 515, 0, 0), (@GUID+1034, @GUID+1036, 7.38238, 60.17088172904879, 515, 0, 0),
(362039, 362037, 16.8078, 265.2668540740783, 515, 0, 0), (@GUID+1039, @GUID+1037, 16.8078, 265.2668540740783, 515, 0, 0),
(362039, 362038, 16.0982, 193.6419730625692, 515, 0, 0), (@GUID+1039, @GUID+1038, 16.0982, 193.6419730625692, 515, 0, 0),
(362039, 362040, 7.77125, 269.0856177786252, 515, 0, 0), (@GUID+1039, @GUID+1040, 7.77125, 269.0856177786252, 515, 0, 0),
(362039, 362041, 7.14206, 184.61559595807822, 515, 0, 0), (@GUID+1039, @GUID+1041, 7.14206, 184.61559595807822, 515, 0, 0),
(362042, @GUID+181, 15.0093, 432.41182094302746, 515, 0, 0), (@GUID+1042, @GUID+181, 15.0093, 432.41182094302746, 515, 0, 0),
(362042, @GUID+182, 17.0826, 277.8180675342141, 515, 0, 0), (@GUID+1042, @GUID+182, 17.0826, 277.8180675342141, 515, 0, 0),
(@GUID+984, @GUID+984, 0, 0, 515, 0, 0), (@GUID+984, @GUID+984, 0, 0, 515, 0, 0),
(@GUID+473, @GUID+473, 0, 0, 515, 0, 0), (@GUID+473, @GUID+473, 0, 0, 515, 0, 0),
(@GUID+985, @GUID+985, 0, 0, 515, 0, 0), (@GUID+985, @GUID+985, 0, 0, 515, 0, 0),
@@ -4339,30 +4337,30 @@ INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`,
(@GUID+487, @GUID+487, 0, 0, 515, 0, 0), (@GUID+487, @GUID+487, 0, 0, 515, 0, 0),
(@GUID+999, @GUID+999, 0, 0, 515, 0, 0), (@GUID+999, @GUID+999, 0, 0, 515, 0, 0),
(@GUID+491, @GUID+491, 0, 0, 515, 0, 0), (@GUID+491, @GUID+491, 0, 0, 515, 0, 0),
(362004, 362004, 0, 0, 515, 0, 0), (@GUID+1004, @GUID+1004, 0, 0, 515, 0, 0),
(@GUID+495, @GUID+495, 0, 0, 515, 0, 0), (@GUID+495, @GUID+495, 0, 0, 515, 0, 0),
(362009, 362009, 0, 0, 515, 0, 0), (@GUID+1009, @GUID+1009, 0, 0, 515, 0, 0),
(@GUID+500, @GUID+500, 0, 0, 515, 0, 0), (@GUID+500, @GUID+500, 0, 0, 515, 0, 0),
(362014, 362014, 0, 0, 515, 0, 0), (@GUID+1014, @GUID+1014, 0, 0, 515, 0, 0),
(@GUID+505, @GUID+505, 0, 0, 515, 0, 0), (@GUID+505, @GUID+505, 0, 0, 515, 0, 0),
(362019, 362019, 0, 0, 515, 0, 0), (@GUID+1019, @GUID+1019, 0, 0, 515, 0, 0),
(@GUID+509, @GUID+509, 0, 0, 515, 0, 0), (@GUID+509, @GUID+509, 0, 0, 515, 0, 0),
(@GUID+0, @GUID+0, 0, 0, 515, 0, 0), (@GUID+0, @GUID+0, 0, 0, 515, 0, 0),
(@GUID+513, @GUID+513, 0, 0, 515, 0, 0), (@GUID+513, @GUID+513, 0, 0, 515, 0, 0),
(@GUID+2, @GUID+2, 0, 0, 515, 0, 0), (@GUID+2, @GUID+2, 0, 0, 515, 0, 0),
(362024, 362024, 0, 0, 515, 0, 0), (@GUID+1024, @GUID+1024, 0, 0, 515, 0, 0),
(@GUID+4, @GUID+4, 0, 0, 515, 0, 0), (@GUID+4, @GUID+4, 0, 0, 515, 0, 0),
(362027, 362027, 0, 0, 515, 0, 0), (@GUID+1027, @GUID+1027, 0, 0, 515, 0, 0),
(@GUID+6, @GUID+6, 0, 0, 515, 0, 0), (@GUID+6, @GUID+6, 0, 0, 515, 0, 0),
(@GUID+518, @GUID+518, 0, 0, 515, 0, 0), (@GUID+518, @GUID+518, 0, 0, 515, 0, 0),
(@GUID+8, @GUID+8, 0, 0, 515, 0, 0), (@GUID+8, @GUID+8, 0, 0, 515, 0, 0),
(@GUID+10, @GUID+10, 0, 0, 515, 0, 0), (@GUID+10, @GUID+10, 0, 0, 515, 0, 0),
(@GUID+522, @GUID+522, 0, 0, 515, 0, 0), (@GUID+522, @GUID+522, 0, 0, 515, 0, 0),
(@GUID+12, @GUID+12, 0, 0, 515, 0, 0), (@GUID+12, @GUID+12, 0, 0, 515, 0, 0),
(362034, 362034, 0, 0, 515, 0, 0), (@GUID+1034, @GUID+1034, 0, 0, 515, 0, 0),
(362039, 362039, 0, 0, 515, 0, 0), (@GUID+1039, @GUID+1039, 0, 0, 515, 0, 0),
(@GUID+17, @GUID+17, 0, 0, 515, 0, 0), (@GUID+17, @GUID+17, 0, 0, 515, 0, 0),
(362042, 362042, 0, 0, 515, 0, 0), (@GUID+1042, @GUID+1042, 0, 0, 515, 0, 0),
(@GUID+20, @GUID+20, 0, 0, 515, 0, 0), (@GUID+20, @GUID+20, 0, 0, 515, 0, 0),
(@GUID+21, @GUID+21, 0, 0, 515, 0, 0), (@GUID+21, @GUID+21, 0, 0, 515, 0, 0),
(@GUID+31, @GUID+31, 0, 0, 515, 0, 0), (@GUID+31, @GUID+31, 0, 0, 515, 0, 0),
@@ -4736,8 +4734,8 @@ UPDATE `creature` SET `equipment_id` = 1 WHERE `id1` IN (@CENTRY+5,@CENTRY+7,@CE
DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+1043; DELETE FROM `creature_addon` WHERE `guid` BETWEEN @GUID AND @GUID+1043;
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
(@GUID+60, 3620600, 0, 0, 1, 0, ''), (@GUID+60, @WPID+600, 0, 0, 1, 0, ''),
(@GUID+63, 3620630, 0, 0, 1, 0, ''), (@GUID+63, @WPID+630, 0, 0, 1, 0, ''),
(@GUID+102, @WPID+1020, 0, 0, 0, 0, NULL), (@GUID+102, @WPID+1020, 0, 0, 0, 0, NULL),
(@GUID+103, @WPID+1030, 0, 0, 0, 0, NULL), (@GUID+103, @WPID+1030, 0, 0, 0, 0, NULL),
(@GUID+108, @WPID+1080, 0, 0, 0, 0, NULL), (@GUID+108, @WPID+1080, 0, 0, 0, 0, NULL),
@@ -5181,7 +5179,7 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
-- Gothik Visuals -- Gothik Visuals
-- re-do spawn locations for triggers -- re-do spawn locations for triggers
SET @CGUID := 362100; SET @CGUID := @GUID + 1100;
DELETE FROM `creature` WHERE `id1`= @CENTRY+47 AND `guid` BETWEEN @CGUID AND @CGUID+14; DELETE FROM `creature` WHERE `id1`= @CENTRY+47 AND `guid` BETWEEN @CGUID AND @CGUID+14;
INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`,
`wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES