fang139842/azerothcore-mirror
1
0
Fork 0
mirror of https://github.com/azerothcore/azerothcore-wotlk.git synced 2025-11-10 21:04:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into feature/bg-mmr-matchmaking-hooks

Browse Source
This commit is contained in:
blinkysc 2025-11-05 07:11:37 -06:00 committed by GitHub
commit cf776898fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 185 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
data/sql/updates/db_world/2025_11_05_00.sql Normal file
View File

@ -0,0 +1,183 @@
-- DB update 2025_11_04_01 -> 2025_11_05_00
-- Change Spawn Point
UPDATE `creature` SET `position_x` = 532.0706, `position_y` = 1473.9459, `position_z` = 109.76107, `orientation` = 5.4972 WHERE (`id1` = 6497) AND (`guid` IN (44738));
-- Delete old waypoint and create a new one in waypoint_data (sniffed wp)
DELETE FROM `waypoints` WHERE (`entry` IN (6497));
DELETE FROM `waypoint_data` WHERE `id` = 649700;
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(649700, 1, 550.32355, 1453.3601, 102.83995, NULL, 0, 0, 0, 100, 0),
(649700, 2, 560.8089, 1444.4222, 100.17067, NULL, 0, 0, 0, 100, 0),
(649700, 3, 579.13367, 1414.7158, 95.58017, NULL, 0, 0, 0, 100, 0),
(649700, 4, 593.57294, 1391.2076, 90.5457, NULL, 0, 0, 0, 100, 0),
(649700, 5, 605.4873, 1365.1119, 86.89633, NULL, 0, 0, 0, 100, 0),
(649700, 6, 615.50714, 1349.1395, 85.748085, NULL, 0, 0, 0, 100, 0),
(649700, 7, 633.94946, 1310.1539, 84.25693, NULL, 0, 0, 0, 100, 0),
(649700, 8, 643.6682, 1301.1842, 85.17119, NULL, 0, 0, 0, 100, 0),
(649700, 9, 661.93774, 1305.103, 83.19177, NULL, 0, 0, 0, 100, 0),
(649700, 10, 679.4544, 1316.6484, 81.121284, NULL, 0, 0, 0, 100, 0),
(649700, 11, 701.6529, 1333.9889, 77.97731, NULL, 0, 0, 0, 100, 0),
(649700, 12, 716.3771, 1350.1677, 76.052864, NULL, 0, 0, 0, 100, 0),
(649700, 13, 735.5919, 1359.9868, 74.7311, NULL, 0, 0, 0, 100, 0),
(649700, 14, 759.6556, 1362.045, 71.884674, NULL, 0, 0, 0, 100, 0),
(649700, 15, 788.24805, 1362.3418, 67.00611, NULL, 0, 0, 0, 100, 0),
(649700, 16, 817.2476, 1361.4927, 60.508972, NULL, 0, 0, 0, 100, 0),
(649700, 17, 838.4114, 1360.8605, 56.570217, NULL, 0, 0, 0, 100, 0),
(649700, 18, 866.9464, 1361.3516, 51.768867, NULL, 0, 0, 0, 100, 0),
(649700, 19, 888.2806, 1355.868, 48.78437, NULL, 0, 0, 0, 100, 0),
(649700, 20, 917.56415, 1347.1743, 45.49018, NULL, 0, 0, 0, 100, 0),
(649700, 21, 942.1607, 1334.9868, 45.564545, NULL, 0, 0, 0, 100, 0),
(649700, 22, 976.56726, 1310.7413, 46.00013, NULL, 0, 0, 0, 100, 0),
(649700, 23, 1005.0521, 1289.1754, 45.481735, NULL, 0, 0, 0, 100, 0),
(649700, 24, 1033.7482, 1272.1211, 46.23719, NULL, 0, 0, 0, 100, 0),
(649700, 25, 1055.1008, 1253.4108, 45.855003, NULL, 0, 0, 0, 100, 0),
(649700, 26, 1080.6647, 1228.3652, 45.75068, NULL, 0, 0, 0, 100, 0),
(649700, 27, 1106.6715, 1205.8969, 46.48162, NULL, 0, 0, 0, 100, 0),
(649700, 28, 1126.8285, 1195.9891, 47.394684, NULL, 0, 0, 0, 100, 0),
(649700, 29, 1154.6526, 1177.5419, 48.430305, NULL, 0, 0, 0, 100, 0),
(649700, 30, 1187.787, 1155.515, 46.71021, NULL, 0, 0, 0, 100, 0),
(649700, 31, 1214.3774, 1137.9454, 47.540554, NULL, 0, 0, 0, 100, 0),
(649700, 32, 1245.4918, 1111.4078, 50.944595, NULL, 0, 0, 0, 100, 0),
(649700, 33, 1259.9783, 1096.3925, 52.763363, NULL, 0, 0, 0, 100, 0),
(649700, 34, 1281.7661, 1077.2633, 54.107376, NULL, 0, 0, 0, 100, 0),
(649700, 35, 1305.2642, 1048.9967, 54.54281, NULL, 0, 0, 0, 100, 0),
(649700, 36, 1318.6704, 1023.2604, 54.663284, NULL, 0, 0, 0, 100, 0),
(649700, 37, 1332.5304, 990.83575, 54.651577, NULL, 0, 0, 0, 100, 0),
(649700, 38, 1339.3923, 960.9286, 54.73848, NULL, 0, 0, 0, 100, 0),
(649700, 39, 1345.629, 924.2967, 53.814915, NULL, 0, 0, 0, 100, 0),
(649700, 40, 1357.6875, 883.0408, 52.67861, NULL, 0, 0, 0, 100, 0),
(649700, 41, 1374.4548, 840.12335, 50.35277, NULL, 0, 0, 0, 100, 0),
(649700, 42, 1390.0712, 800.3881, 48.731716, NULL, 0, 0, 0, 100, 0),
(649700, 43, 1407.2906, 766.57434, 46.998886, NULL, 0, 0, 0, 100, 0),
(649700, 44, 1421.0477, 732.81036, 45.700684, NULL, 0, 0, 0, 100, 0),
(649700, 45, 1438.3928, 700.6654, 44.742863, NULL, 0, 0, 0, 100, 0),
(649700, 46, 1462.6694, 666.44934, 46.350983, NULL, 0, 0, 0, 100, 0),
(649700, 47, 1493.479, 632.8775, 46.6881, NULL, 0, 0, 0, 100, 0),
(649700, 48, 1527.412, 601.90704, 46.683678, NULL, 0, 0, 0, 100, 0),
(649700, 49, 1569.2615, 578.867, 41.605648, NULL, 0, 0, 0, 100, 0),
(649700, 50, 1599.7749, 566.5255, 37.452827, NULL, 0, 0, 0, 100, 0),
(649700, 51, 1633.1173, 557.6922, 33.72048, NULL, 0, 0, 0, 100, 0),
(649700, 52, 1666.5055, 548.7752, 33.39571, NULL, 0, 0, 0, 100, 0),
(649700, 53, 1699.4762, 543.5129, 33.418396, NULL, 0, 0, 0, 100, 0),
(649700, 54, 1733.0693, 534.8109, 33.39686, NULL, 0, 0, 0, 100, 0),
(649700, 55, 1766.3834, 526.622, 33.396313, NULL, 0, 0, 0, 100, 0),
(649700, 56, 1799.5571, 518.5047, 33.451973, NULL, 0, 0, 0, 100, 0),
(649700, 57, 1833.5399, 506.51108, 34.09343, NULL, 0, 0, 0, 100, 0),
(649700, 58, 1846.7709, 500.30872, 34.65273, NULL, 0, 0, 0, 100, 0),
(649700, 59, 1866.7739, 482.8489, 34.661674, NULL, 0, 0, 0, 100, 0),
(649700, 60, 1876.65, 467.884, 34.267147, NULL, 0, 0, 0, 100, 0),
(649700, 61, 1890.4196, 433.71887, 33.8925, NULL, 0, 0, 0, 100, 0),
(649700, 62, 1899.9106, 400.08536, 34.257324, NULL, 0, 0, 0, 100, 0),
(649700, 63, 1911.1168, 366.9929, 33.98939, NULL, 0, 0, 0, 100, 0),
(649700, 64, 1929.4626, 333.79535, 35.294994, NULL, 0, 0, 0, 100, 0),
(649700, 65, 1946.6372, 299.84537, 38.30006, NULL, 0, 0, 0, 100, 0),
(649700, 66, 1967.2408, 265.27518, 37.96951, NULL, 0, 0, 0, 100, 0),
(649700, 67, 1984.9171, 233.64508, 36.106697, NULL, 0, 0, 0, 100, 0),
(649700, 68, 2000.3663, 214.46593, 34.19722, NULL, 0, 0, 0, 100, 0),
(649700, 69, 2008.7366, 199.68561, 33.87147, NULL, 0, 0, 0, 100, 0),
(649700, 70, 2033.007, 168.96138, 33.986916, NULL, 0, 0, 0, 100, 0),
(649700, 71, 2066.642, 154.05067, 33.89913, NULL, 0, 0, 0, 100, 0),
(649700, 72, 2100.0747, 154.13618, 35.464554, NULL, 0, 0, 0, 100, 0),
(649700, 73, 2133.1018, 165.71138, 37.972244, NULL, 0, 0, 0, 100, 0),
(649700, 74, 2159.929, 180.03609, 41.871323, NULL, 0, 0, 0, 100, 0),
(649700, 75, 2162.2976, 200.29182, 42.721146, NULL, 0, 0, 0, 100, 0),
(649700, 76, 2164.7114, 218.72179, 40.85692, NULL, 0, 0, 0, 100, 0),
(649700, 77, 2181.5547, 232.85938, 36.67536, NULL, 0, 0, 0, 100, 0),
(649700, 78, 2200.375, 243.88374, 34.444607, NULL, 0, 0, 0, 100, 0),
(649700, 79, 2218.8154, 249.37343, 33.94611, NULL, 0, 0, 0, 100, 0),
(649700, 80, 2229.708, 247.84766, 33.11627, NULL, 0, 0, 0, 100, 0),
(649700, 81, 2235.1897, 251.33485, 33.6035, NULL, 2000, 0, 0, 100, 0),
(649700, 82, 2229.708, 247.84766, 33.11627, NULL, 0, 0, 0, 100, 0),
(649700, 83, 2218.8154, 249.37343, 33.94611, NULL, 0, 0, 0, 100, 0),
(649700, 84, 2200.375, 243.88374, 34.444607, NULL, 0, 0, 0, 100, 0),
(649700, 85, 2181.5547, 232.85938, 36.67536, NULL, 0, 0, 0, 100, 0),
(649700, 86, 2164.7114, 218.72179, 40.85692, NULL, 0, 0, 0, 100, 0),
(649700, 87, 2162.2976, 200.29182, 42.721146, NULL, 0, 0, 0, 100, 0),
(649700, 88, 2159.929, 180.03609, 41.871323, NULL, 0, 0, 0, 100, 0),
(649700, 89, 2133.1018, 165.71138, 37.972244, NULL, 0, 0, 0, 100, 0),
(649700, 90, 2100.0747, 154.13618, 35.464554, NULL, 0, 0, 0, 100, 0),
(649700, 91, 2066.642, 154.05067, 33.89913, NULL, 0, 0, 0, 100, 0),
(649700, 92, 2033.007, 168.96138, 33.986916, NULL, 0, 0, 0, 100, 0),
(649700, 93, 2008.7366, 199.68561, 33.87147, NULL, 0, 0, 0, 100, 0),
(649700, 94, 2000.3663, 214.46593, 34.19722, NULL, 0, 0, 0, 100, 0),
(649700, 95, 1984.9171, 233.64508, 36.106697, NULL, 0, 0, 0, 100, 0),
(649700, 96, 1967.2408, 265.27518, 37.96951, NULL, 0, 0, 0, 100, 0),
(649700, 97, 1946.6372, 299.84537, 38.30006, NULL, 0, 0, 0, 100, 0),
(649700, 98, 1929.4626, 333.79535, 35.294994, NULL, 0, 0, 0, 100, 0),
(649700, 99, 1911.1168, 366.9929, 33.98939, NULL, 0, 0, 0, 100, 0),
(649700, 100, 1899.9106, 400.08536, 34.257324, NULL, 0, 0, 0, 100, 0),
(649700, 101, 1890.4196, 433.71887, 33.8925, NULL, 0, 0, 0, 100, 0),
(649700, 102, 1876.65, 467.884, 34.267147, NULL, 0, 0, 0, 100, 0),
(649700, 103, 1866.7739, 482.8489, 34.661674, NULL, 0, 0, 0, 100, 0),
(649700, 104, 1846.7709, 500.30872, 34.65273, NULL, 0, 0, 0, 100, 0),
(649700, 105, 1833.5399, 506.51108, 34.09343, NULL, 0, 0, 0, 100, 0),
(649700, 106, 1799.5571, 518.5047, 33.451973, NULL, 0, 0, 0, 100, 0),
(649700, 107, 1766.3834, 526.622, 33.396313, NULL, 0, 0, 0, 100, 0),
(649700, 108, 1733.0693, 534.8109, 33.39686, NULL, 0, 0, 0, 100, 0),
(649700, 109, 1699.4762, 543.5129, 33.418396, NULL, 0, 0, 0, 100, 0),
(649700, 110, 1666.5055, 548.7752, 33.39571, NULL, 0, 0, 0, 100, 0),
(649700, 111, 1633.1173, 557.6922, 33.72048, NULL, 0, 0, 0, 100, 0),
(649700, 112, 1599.7749, 566.5255, 37.452827, NULL, 0, 0, 0, 100, 0),
(649700, 113, 1569.2615, 578.867, 41.605648, NULL, 0, 0, 0, 100, 0),
(649700, 114, 1527.412, 601.90704, 46.683678, NULL, 0, 0, 0, 100, 0),
(649700, 115, 1493.479, 632.8775, 46.6881, NULL, 0, 0, 0, 100, 0),
(649700, 116, 1462.6694, 666.44934, 46.350983, NULL, 0, 0, 0, 100, 0),
(649700, 117, 1438.3928, 700.6654, 44.742863, NULL, 0, 0, 0, 100, 0),
(649700, 118, 1421.0477, 732.81036, 45.700684, NULL, 0, 0, 0, 100, 0),
(649700, 119, 1407.2906, 766.57434, 46.998886, NULL, 0, 0, 0, 100, 0),
(649700, 120, 1390.0712, 800.3881, 48.731716, NULL, 0, 0, 0, 100, 0),
(649700, 121, 1374.4548, 840.12335, 50.35277, NULL, 0, 0, 0, 100, 0),
(649700, 122, 1357.6875, 883.0408, 52.67861, NULL, 0, 0, 0, 100, 0),
(649700, 123, 1345.629, 924.2967, 53.814915, NULL, 0, 0, 0, 100, 0),
(649700, 124, 1339.3923, 960.9286, 54.73848, NULL, 0, 0, 0, 100, 0),
(649700, 125, 1332.5304, 990.83575, 54.651577, NULL, 0, 0, 0, 100, 0),
(649700, 126, 1318.6704, 1023.2604, 54.663284, NULL, 0, 0, 0, 100, 0),
(649700, 127, 1305.2642, 1048.9967, 54.54281, NULL, 0, 0, 0, 100, 0),
(649700, 128, 1281.7661, 1077.2633, 54.107376, NULL, 0, 0, 0, 100, 0),
(649700, 129, 1259.9783, 1096.3925, 52.763363, NULL, 0, 0, 0, 100, 0),
(649700, 130, 1245.4918, 1111.4078, 50.944595, NULL, 0, 0, 0, 100, 0),
(649700, 131, 1214.3774, 1137.9454, 47.540554, NULL, 0, 0, 0, 100, 0),
(649700, 132, 1187.787, 1155.515, 46.71021, NULL, 0, 0, 0, 100, 0),
(649700, 133, 1154.6526, 1177.5419, 48.430305, NULL, 0, 0, 0, 100, 0),
(649700, 134, 1126.8285, 1195.9891, 47.394684, NULL, 0, 0, 0, 100, 0),
(649700, 135, 1106.6715, 1205.8969, 46.48162, NULL, 0, 0, 0, 100, 0),
(649700, 136, 1080.6647, 1228.3652, 45.75068, NULL, 0, 0, 0, 100, 0),
(649700, 137, 1055.1008, 1253.4108, 45.855003, NULL, 0, 0, 0, 100, 0),
(649700, 138, 1033.7482, 1272.1211, 46.23719, NULL, 0, 0, 0, 100, 0),
(649700, 139, 1005.0521, 1289.1754, 45.481735, NULL, 0, 0, 0, 100, 0),
(649700, 140, 976.56726, 1310.7413, 46.00013, NULL, 0, 0, 0, 100, 0),
(649700, 141, 942.1607, 1334.9868, 45.564545, NULL, 0, 0, 0, 100, 0),
(649700, 142, 917.56415, 1347.1743, 45.49018, NULL, 0, 0, 0, 100, 0),
(649700, 143, 888.2806, 1355.868, 48.78437, NULL, 0, 0, 0, 100, 0),
(649700, 144, 866.9464, 1361.3516, 51.768867, NULL, 0, 0, 0, 100, 0),
(649700, 145, 838.4114, 1360.8605, 56.570217, NULL, 0, 0, 0, 100, 0),
(649700, 146, 817.2476, 1361.4927, 60.508972, NULL, 0, 0, 0, 100, 0),
(649700, 147, 788.24805, 1362.3418, 67.00611, NULL, 0, 0, 0, 100, 0),
(649700, 148, 759.6556, 1362.045, 71.884674, NULL, 0, 0, 0, 100, 0),
(649700, 149, 735.5919, 1359.9868, 74.7311, NULL, 0, 0, 0, 100, 0),
(649700, 150, 716.3771, 1350.1677, 76.052864, NULL, 0, 0, 0, 100, 0),
(649700, 151, 701.6529, 1333.9889, 77.97731, NULL, 0, 0, 0, 100, 0),
(649700, 152, 679.4544, 1316.6484, 81.121284, NULL, 0, 0, 0, 100, 0),
(649700, 153, 661.93774, 1305.103, 83.19177, NULL, 0, 0, 0, 100, 0),
(649700, 154, 643.6682, 1301.1842, 85.17119, NULL, 0, 0, 0, 100, 0),
(649700, 155, 633.94946, 1310.1539, 84.25693, NULL, 0, 0, 0, 100, 0),
(649700, 156, 615.50714, 1349.1395, 85.748085, NULL, 0, 0, 0, 100, 0),
(649700, 157, 605.4873, 1365.1119, 86.89633, NULL, 0, 0, 0, 100, 0),
(649700, 158, 593.57294, 1391.2076, 90.5457, NULL, 0, 0, 0, 100, 0),
(649700, 159, 579.13367, 1414.7158, 95.58017, NULL, 0, 0, 0, 100, 0),
(649700, 160, 560.8089, 1444.4222, 100.17067, NULL, 0, 0, 0, 100, 0),
(649700, 161, 550.32355, 1453.3601, 102.83995, NULL, 0, 0, 0, 100, 0),
(649700, 162, 532.0706, 1473.9459, 109.76107, NULL, 2000, 0, 0, 100, 0);
-- Edit SmartAI
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 6497;
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 6497);
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(6497, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Reset - Set Reactstate Defensive'),
(6497, 0, 1, 0, 11, 0, 100, 512, 0, 0, 0, 0, 0, 0, 232, 649700, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Respawn - Start Path 649700'),
(6497, 0, 2, 3, 62, 0, 100, 512, 125, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Gossip Option 0 Selected - Close Gossip'),
(6497, 0, 3, 4, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 2, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Gossip Option 0 Selected - Set Faction 14'),
(6497, 0, 4, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Gossip Option 0 Selected - Start Attacking'),
(6497, 0, 5, 0, 7, 0, 100, 512, 0, 0, 0, 0, 0, 0, 2, 68, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Astor Hadren - On Evade - Set Faction 68');

2
src/common/Collision/Maps/MapDefines.h
View File

@ -26,7 +26,7 @@
#define SIZE_OF_GRIDS 533.3333f
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
#define MMAP_VERSION 17
#define MMAP_VERSION 18
struct MmapTileRecastConfig
{

2
src/tools/mmaps_generator/Config.cpp
View File

@ -25,7 +25,7 @@ namespace MMAP
{
float ComputeBaseUnitDim(int vertexPerMapEdge)
{
return GRID_SIZE / static_cast<float>(vertexPerMapEdge - 1);
return GRID_SIZE / static_cast<float>(vertexPerMapEdge);
}
std::pair<uint32, uint32> MakeTileKey(uint32 x, uint32 y)