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

Organize creature GUIDs (#700)

Browse Source 
- reorganize the guids used for Into the Breach, Maraudon Patrols and Alterac Valley
- cleanup the 00_cleanup.sql file
- improve zone_alterac_valley with the use of wpid
This commit is contained in:
Grimfeather
2025-09-05 08:36:08 +02:00
committed by GitHub
parent 0cb4c9b9e1
commit e26dc1dd86
4 changed files with 224 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
data/sql/world/base/zone_alterac_valley.sql
View File

@@ -1,4 +1,5 @@
SET @CGUID := 670000;
SET @CGUID := 657000;
SET @WPID := 6570000;
/* VANILLA AV */
@@ -170,78 +171,78 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`,
DELETE FROM `creature_addon` WHERE `guid` IN (@CGUID+88, @CGUID+89, @CGUID+105, @CGUID+106, @CGUID+114, @CGUID+133, @CGUID+138, @CGUID+139);
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
(@CGUID+088, 6700880, 0, 0, 0, 0, 0, NULL),
(@CGUID+089, 6700890, 0, 0, 0, 0, 0, NULL),
(@CGUID+105, 6701050, 0, 0, 0, 0, 0, NULL),
(@CGUID+106, 6701060, 0, 0, 0, 0, 0, NULL),
(@CGUID+114, 6701140, 0, 0, 0, 0, 0, NULL),
(@CGUID+133, 6701330, 0, 0, 0, 0, 0, NULL),
(@CGUID+138, 6701380, 0, 0, 0, 0, 0, NULL),
(@CGUID+139, 6701390, 0, 0, 0, 0, 0, NULL);
(@CGUID+088, @WPID+880, 0, 0, 0, 0, 0, NULL),
(@CGUID+089, @WPID+890, 0, 0, 0, 0, 0, NULL),
(@CGUID+105, @WPID+1050, 0, 0, 0, 0, 0, NULL),
(@CGUID+106, @WPID+1060, 0, 0, 0, 0, 0, NULL),
(@CGUID+114, @WPID+1140, 0, 0, 0, 0, 0, NULL),
(@CGUID+133, @WPID+1330, 0, 0, 0, 0, 0, NULL),
(@CGUID+138, @WPID+1380, 0, 0, 0, 0, 0, NULL),
(@CGUID+139, @WPID+1390, 0, 0, 0, 0, 0, NULL);
DELETE FROM `waypoint_data` WHERE `id` IN (6700880, 6700890, 6701050, 6701060, 6701140, 6701330, 6701380, 6701390);
DELETE FROM `waypoint_data` WHERE `id` IN (@WPID+880, @WPID+890, @WPID+1050, @WPID+1060, @WPID+1140, @WPID+1330, @WPID+1380, @WPID+1390);
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(6700880, 1, 107.532, 91.634, 3.44018, NULL, 0, 0, 0, 100, 0),
(6700880, 2, 135.909, 68.6533, 3.74254, NULL, 0, 0, 0, 100, 0),
(6700880, 3, 173.596, 71.678, 13.3575, NULL, 0, 0, 0, 100, 0),
(6700880, 4, 188.311, 86.4007, 16.829, NULL, 0, 0, 0, 100, 0),
(6700880, 5, 216.921, 121.522, 13.6167, NULL, 0, 0, 0, 100, 0),
(6700880, 6, 190.155, 90.6858, 17.334, NULL, 0, 0, 0, 100, 0),
(6700880, 7, 173.998, 72.3586, 13.3698, NULL, 0, 0, 0, 100, 0),
(6700880, 8, 142.47, 66.9583, 4.86477, NULL, 0, 0, 0, 100, 0),
(6700890, 1, 34.4731, 67.0783, -0.96716, NULL, 0, 0, 0, 100, 0),
(6700890, 2, 18.8568, 33.434, 0.513404, NULL, 0, 0, 0, 100, 0),
(6700890, 3, 8.27625, 12.1935, -3.36688, NULL, 0, 0, 0, 100, 0),
(6700890, 4, 22.8894, 38.2457, 0.652063, NULL, 0, 0, 0, 100, 0),
(6700890, 5, 33.8784, 70.2081, -1.25908, NULL, 0, 0, 0, 100, 0),
(6700890, 6, 4.04712, 99.1641, 2.97839, NULL, 0, 0, 0, 100, 0),
(6700890, 7, -4.3458, 128.547, 10.5413, NULL, 0, 0, 0, 100, 0),
(6700890, 8, 5.94824, 97.7592, 2.19971, NULL, 0, 0, 0, 100, 0),
(6701050, 1, -1552.87, -462.513, 69.469, NULL, 0, 0, 0, 100, 0),
(6701050, 2, -1559.73, -453.094, 68.9309, NULL, 0, 0, 0, 100, 0),
(6701050, 3, -1571.22, -445.56, 68.1062, NULL, 0, 0, 0, 100, 0),
(6701050, 4, -1571.89, -451.277, 67.0615, NULL, 0, 0, 0, 100, 0),
(6701050, 5, -1558.92, -476.742, 59.8373, NULL, 0, 0, 0, 100, 0),
(6701050, 6, -1573.17, -446.339, 68.4464, NULL, 0, 0, 0, 100, 0),
(6701050, 7, -1566.42, -445.995, 67.7643, NULL, 0, 0, 0, 100, 0),
(6701060, 1, -1514.54, -447.915, 70.2823, NULL, 0, 0, 0, 100, 0),
(6701060, 2, -1495.22, -442.945, 69.4469, NULL, 0, 0, 0, 100, 0),
(6701060, 3, -1480.59, -465.892, 69.4469, NULL, 0, 0, 0, 100, 0),
(6701060, 4, -1491.62, -453.084, 69.4469, NULL, 0, 0, 0, 100, 0),
(6701060, 5, -1502.4, -457.219, 69.4345, NULL, 0, 0, 0, 100, 0),
(6701060, 6, -1482.83, -437.001, 70.0186, NULL, 0, 0, 0, 100, 0),
(6701060, 7, -1479.76, -464.368, 69.4469, NULL, 0, 0, 0, 100, 0),
(6701060, 8, -1495.49, -441.992, 69.4469, NULL, 0, 0, 0, 100, 0),
(6701140, 1, -1539.52, -460.755, 70.077, NULL, 0, 0, 0, 100, 0),
(6701140, 2, -1517.66, -448.317, 70.4951, NULL, 0, 0, 0, 100, 0),
(6701140, 3, -1510.93, -453.055, 69.447, NULL, 0, 0, 0, 100, 0),
(6701140, 4, -1513.69, -461.901, 69.447, NULL, 0, 0, 0, 100, 0),
(6701140, 5, -1535.12, -472.623, 69.6797, NULL, 0, 0, 0, 100, 0),
(6701330, 1, -1594.06, -367.967, 69.0143, NULL, 0, 0, 0, 100, 0),
(6701330, 2, -1567.27, -395.809, 65.3724, NULL, 0, 0, 0, 100, 0),
(6701330, 3, -1573.34, -415.208, 71.257, NULL, 0, 0, 0, 100, 0),
(6701330, 4, -1596.75, -443.826, 77.3819, NULL, 0, 0, 0, 100, 0),
(6701330, 5, -1611.53, -440.844, 80.1471, NULL, 0, 0, 0, 100, 0),
(6701330, 6, -1611.88, -422.006, 76.6271, NULL, 0, 0, 0, 100, 0),
(6701330, 7, -1601.56, -400.693, 80.8361, NULL, 0, 0, 0, 100, 0),
(6701330, 8, -1616.2, -435.566, 80.0329, NULL, 0, 0, 0, 100, 0),
(6701330, 9, -1594.53, -443.173, 76.8117, NULL, 0, 0, 0, 100, 0),
(6701330, 10, -1573.21, -415.46, 71.2936, NULL, 0, 0, 0, 100, 0),
(6701330, 11, -1569.72, -394.342, 65.5518, NULL, 0, 0, 0, 100, 0),
(6701380, 1, -1638.22, -460.302, 51.8857, NULL, 0, 0, 0, 100, 0),
(6701380, 2, -1646.52, -447.43, 49.9786, NULL, 0, 0, 0, 100, 0),
(6701380, 3, -1638.71, -427.875, 49.1378, NULL, 0, 0, 0, 100, 0),
(6701380, 4, -1663.81, -421.352, 45.5899, NULL, 0, 0, 0, 100, 0),
(6701380, 5, -1638.18, -426.447, 48.9697, NULL, 0, 0, 0, 100, 0),
(6701380, 6, -1645.98, -446.584, 49.8422, NULL, 0, 0, 0, 100, 0),
(6701390, 1, 24.0984, 88.1343, 20.8263, NULL, 0, 0, 0, 100, 0),
(6701390, 2, -1.99808, 80.9053, 19.3438, NULL, 0, 0, 0, 100, 0),
(6701390, 3, -14.1757, 58.9795, 16.3095, NULL, 0, 0, 0, 100, 0),
(6701390, 4, -15.216, 36.8524, 16.8846, NULL, 0, 0, 0, 100, 0),
(6701390, 5, -14.1757, 58.9795, 16.3095, NULL, 0, 0, 0, 100, 0),
(6701390, 6, -2.69029, 79.8757, 19.3488, NULL, 0, 0, 0, 100, 0),
(6701390, 7, 24.0984, 88.1343, 20.8263, NULL, 0, 0, 0, 100, 0),
(6701390, 8, 42.8103, 103.346, 21.9067, NULL, 0, 0, 0, 100, 0);
(@WPID+880, 1, 107.532, 91.634, 3.44018, NULL, 0, 0, 0, 100, 0),
(@WPID+880, 2, 135.909, 68.6533, 3.74254, NULL, 0, 0, 0, 100, 0),
(@WPID+880, 3, 173.596, 71.678, 13.3575, NULL, 0, 0, 0, 100, 0),
(@WPID+880, 4, 188.311, 86.4007, 16.829, NULL, 0, 0, 0, 100, 0),
(@WPID+880, 5, 216.921, 121.522, 13.6167, NULL, 0, 0, 0, 100, 0),
(@WPID+880, 6, 190.155, 90.6858, 17.334, NULL, 0, 0, 0, 100, 0),
(@WPID+880, 7, 173.998, 72.3586, 13.3698, NULL, 0, 0, 0, 100, 0),
(@WPID+880, 8, 142.47, 66.9583, 4.86477, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 1, 34.4731, 67.0783, -0.96716, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 2, 18.8568, 33.434, 0.513404, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 3, 8.27625, 12.1935, -3.36688, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 4, 22.8894, 38.2457, 0.652063, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 5, 33.8784, 70.2081, -1.25908, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 6, 4.04712, 99.1641, 2.97839, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 7, -4.3458, 128.547, 10.5413, NULL, 0, 0, 0, 100, 0),
(@WPID+890, 8, 5.94824, 97.7592, 2.19971, NULL, 0, 0, 0, 100, 0),
(@WPID+1050, 1, -1552.87, -462.513, 69.469, NULL, 0, 0, 0, 100, 0),
(@WPID+1050, 2, -1559.73, -453.094, 68.9309, NULL, 0, 0, 0, 100, 0),
(@WPID+1050, 3, -1571.22, -445.56, 68.1062, NULL, 0, 0, 0, 100, 0),
(@WPID+1050, 4, -1571.89, -451.277, 67.0615, NULL, 0, 0, 0, 100, 0),
(@WPID+1050, 5, -1558.92, -476.742, 59.8373, NULL, 0, 0, 0, 100, 0),
(@WPID+1050, 6, -1573.17, -446.339, 68.4464, NULL, 0, 0, 0, 100, 0),
(@WPID+1050, 7, -1566.42, -445.995, 67.7643, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 1, -1514.54, -447.915, 70.2823, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 2, -1495.22, -442.945, 69.4469, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 3, -1480.59, -465.892, 69.4469, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 4, -1491.62, -453.084, 69.4469, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 5, -1502.4, -457.219, 69.4345, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 6, -1482.83, -437.001, 70.0186, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 7, -1479.76, -464.368, 69.4469, NULL, 0, 0, 0, 100, 0),
(@WPID+1060, 8, -1495.49, -441.992, 69.4469, NULL, 0, 0, 0, 100, 0),
(@WPID+1140, 1, -1539.52, -460.755, 70.077, NULL, 0, 0, 0, 100, 0),
(@WPID+1140, 2, -1517.66, -448.317, 70.4951, NULL, 0, 0, 0, 100, 0),
(@WPID+1140, 3, -1510.93, -453.055, 69.447, NULL, 0, 0, 0, 100, 0),
(@WPID+1140, 4, -1513.69, -461.901, 69.447, NULL, 0, 0, 0, 100, 0),
(@WPID+1140, 5, -1535.12, -472.623, 69.6797, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 1, -1594.06, -367.967, 69.0143, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 2, -1567.27, -395.809, 65.3724, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 3, -1573.34, -415.208, 71.257, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 4, -1596.75, -443.826, 77.3819, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 5, -1611.53, -440.844, 80.1471, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 6, -1611.88, -422.006, 76.6271, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 7, -1601.56, -400.693, 80.8361, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 8, -1616.2, -435.566, 80.0329, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 9, -1594.53, -443.173, 76.8117, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 10, -1573.21, -415.46, 71.2936, NULL, 0, 0, 0, 100, 0),
(@WPID+1330, 11, -1569.72, -394.342, 65.5518, NULL, 0, 0, 0, 100, 0),
(@WPID+1380, 1, -1638.22, -460.302, 51.8857, NULL, 0, 0, 0, 100, 0),
(@WPID+1380, 2, -1646.52, -447.43, 49.9786, NULL, 0, 0, 0, 100, 0),
(@WPID+1380, 3, -1638.71, -427.875, 49.1378, NULL, 0, 0, 0, 100, 0),
(@WPID+1380, 4, -1663.81, -421.352, 45.5899, NULL, 0, 0, 0, 100, 0),
(@WPID+1380, 5, -1638.18, -426.447, 48.9697, NULL, 0, 0, 0, 100, 0),
(@WPID+1380, 6, -1645.98, -446.584, 49.8422, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 1, 24.0984, 88.1343, 20.8263, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 2, -1.99808, 80.9053, 19.3438, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 3, -14.1757, 58.9795, 16.3095, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 4, -15.216, 36.8524, 16.8846, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 5, -14.1757, 58.9795, 16.3095, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 6, -2.69029, 79.8757, 19.3488, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 7, 24.0984, 88.1343, 20.8263, NULL, 0, 0, 0, 100, 0),
(@WPID+1390, 8, 42.8103, 103.346, 21.9067, NULL, 0, 0, 0, 100, 0);
/* WOTLK AV */
@@ -337,14 +338,14 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`,
-- Using the same waypoints as in the TBC version
DELETE FROM `creature_addon` WHERE `guid` IN (@CGUID+164, @CGUID+165, @CGUID+181, @CGUID+182, @CGUID+190, @CGUID+209, @CGUID+214, @CGUID+215);
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
(@CGUID+164, 6700880, 0, 0, 0, 0, 0, NULL),
(@CGUID+165, 6700890, 0, 0, 0, 0, 0, NULL),
(@CGUID+181, 6701050, 0, 0, 0, 0, 0, NULL),
(@CGUID+182, 6701060, 0, 0, 0, 0, 0, NULL),
(@CGUID+190, 6701140, 0, 0, 0, 0, 0, NULL),
(@CGUID+209, 6701330, 0, 0, 0, 0, 0, NULL),
(@CGUID+214, 6701380, 0, 0, 0, 0, 0, NULL),
(@CGUID+215, 6701390, 0, 0, 0, 0, 0, NULL);
(@CGUID+164, @WPID+880, 0, 0, 0, 0, 0, NULL),
(@CGUID+165, @WPID+890, 0, 0, 0, 0, 0, NULL),
(@CGUID+181, @WPID+1050, 0, 0, 0, 0, 0, NULL),
(@CGUID+182, @WPID+1060, 0, 0, 0, 0, 0, NULL),
(@CGUID+190, @WPID+1140, 0, 0, 0, 0, 0, NULL),
(@CGUID+209, @WPID+1330, 0, 0, 0, 0, 0, NULL),
(@CGUID+214, @WPID+1380, 0, 0, 0, 0, 0, NULL),
(@CGUID+215, @WPID+1390, 0, 0, 0, 0, 0, NULL);
-- undo previous way of starting waypoints
UPDATE `creature_template` SET `flags_extra` = 0 WHERE `entry` IN (10991, 11678, 11837, 11839, 13959);-- DONT_OVERRIDE_SAI_ENTRY (134217728)