Skip to content

Commit

Permalink
Merge branch 'vmangos:development' into soothsaying
Browse files Browse the repository at this point in the history
  • Loading branch information
@FlagFlayer
FlagFlayer authored Aug 5, 2023
2 parents 6113a2d + 8a70352 commit 0904eb7
Show file tree
Hide file tree
Showing 58 changed files with 1,604 additions and 299 deletions.
7 changes: 5 additions & 2 deletions contrib/mmap/src/TerrainBuilder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,9 +766,12 @@ namespace MMAP
float inDist = -1.0f;
if (it->IsUnderObject(v, up, isM2, &outDist, &inDist)) // inDist < outDist
{
//if there are less than 1.5y between terrain and model then mark the terrain as unwalkable
if (inDist < 1.5f)
// If terrain is under wmo, mark terrain as unwalkable
// If there are less than 1.5y between terrain and m2 then mark the terrain as unwalkable
if (!isM2 || inDist < 1.5f)
{
terrainInsideModelsVerts[t] = inDist;
}
}
}
}
Expand Down
33 changes: 33 additions & 0 deletions sql/migrations/20230708060723_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20230708060723');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20230708060723');
-- Add your query below.


SET @OGUID = 90977;
-- Spawn Risen Protector pre 1.6.0
INSERT INTO `creature` (`guid`, `id`, `id2`, `id3`, `id4`, `id5`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecsmin`, `spawntimesecsmax`, `wander_distance`, `health_percent`, `mana_percent`, `movement_type`, `spawn_flags`, `visibility_mod`, `patch_min`, `patch_max`) VALUES
(@OGUID, 10487, 0, 0, 0, 0, 289, 195.727, 128.917, 109.794, 1.3257, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
(@OGUID+1, 10487, 0, 0, 0, 0, 289, 169.733, 156.674, 109.507, 6.28001, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
(@OGUID+2, 10487, 0, 0, 0, 0, 289, 169.875, 149.593, 109.508, 0.358109, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
(@OGUID+3, 10487, 0, 0, 0, 0, 289, 204.894, 129.028, 109.794, 1.76239, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
(@OGUID+4, 10487, 0, 0, 0, 0, 289, 236.687, 189.963, 95.8464, 1.00923, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
(@OGUID+5, 10487, 0, 0, 0, 0, 289, 245.316, 189.926, 95.8464, 2.25248, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
(@OGUID+6, 10487, 0, 0, 0, 0, 289, 197.778, 176.974, 109.796, 4.78456, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
(@OGUID+7, 10487, 0, 0, 0, 0, 289, 204.641, 176.899, 109.796, 4.78456, 7200, 7200, 0, 100, 100, 0, 0, 0, 0, 3),
-- Spawn Risen Warrior pre 1.6.0
(@OGUID+8, 10486, 0, 0, 0, 0, 289, -18.4563, 152.231, 83.8604, 3.47225, 7200, 7200, 0, 100, 0, 0, 0, 0, 0, 3),
(@OGUID+9, 10486, 0, 0, 0, 0, 289, -18.1193, 131.767, 83.8999, 2.71828, 7200, 7200, 0, 100, 0, 0, 0, 0, 0, 3);


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
54 changes: 54 additions & 0 deletions sql/migrations/20230723234305_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20230723234305');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20230723234305');
-- Add your query below.


-- Gremnik Rizzlesprang
INSERT INTO `creature` (`guid`, `id`, `id2`, `id3`, `id4`, `id5`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecsmin`, `spawntimesecsmax`, `wander_distance`, `health_percent`, `mana_percent`, `movement_type`, `spawn_flags`, `visibility_mod`, `patch_min`, `patch_max`) VALUES (222222, 16123, 0, 0, 0, 0, 0, -14456.8, 448.044, 20.4907, 0.0174533, 120, 120, 0, 100, 100, 0, 0, 0, 8, 10);
UPDATE `creature_template` SET `level_min`=60, `level_max`=60, `gossip_menu_id`=7092, `npc_flags`=1, `auras`='27978 27614', `flags_extra`=(64 | 524288) WHERE `entry`=16123;
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (7092, 8345);
INSERT INTO `npc_text` (`ID`, `Probability0`, `BroadcastTextID0`) VALUES (8345, 1, 11932);

-- Bodley
UPDATE `creature` SET `position_x`=-7535.76, `position_y`=-1211.09, `position_z`=285.555, `orientation`=5.27089 WHERE `id`=16033;
UPDATE `creature_template` SET `gossip_menu_id`=7044, `base_attack_time`=2000, `auras`='27978 27614', `flags_extra`=(64 | 524288) WHERE `entry`=16033;
UPDATE `npc_text` SET `ID`=8271 WHERE `ID`=50002;
UPDATE `gossip_menu` SET `text_id`=8271 WHERE `text_id`=50002;
UPDATE `gossip_menu` SET `entry`=7044 WHERE `entry`=57006;
UPDATE `gossip_menu_option` SET `menu_id`=7044 WHERE `menu_id`=57006;
UPDATE `gossip_menu_option` SET `action_menu_id`=7044 WHERE `action_menu_id`=57006;
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_broadcast_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `box_broadcast_text`) VALUES (7044, 3, 0, 'Bodley, tell me what\'s going on.', 11915, 1, 1, 7087, 0, 0, 0, NULL, 0);
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (7087, 8338);
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_broadcast_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `box_broadcast_text`) VALUES (7087, 0, 0, 'You were telling me about The Veiled Blade and how you took the wrong mission.', 11917, 1, 1, 7086, 0, 0, 0, NULL, 0);
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (7086, 8339);
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_broadcast_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `box_broadcast_text`) VALUES (7086, 0, 0, 'No, no, please continue... it\'s just that the air up here is so, um, smoky.', 11919, 1, 1, 7085, 0, 0, 0, NULL, 0);
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (7085, 8340);
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_broadcast_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `box_broadcast_text`) VALUES (7085, 0, 0, 'Please continue, Bodley.', 11921, 1, 1, 7090, 0, 0, 0, NULL, 0);
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (7090, 8341);
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_broadcast_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `box_broadcast_text`) VALUES (7090, 0, 0, 'I thought you were almost done?', 11923, 1, 1, 7089, 0, 0, 0, NULL, 0);
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (7089, 8342);
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_broadcast_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `box_broadcast_text`) VALUES (7089, 0, 0, 'What happened to your mercenary company, The Veiled Blade?', 11925, 1, 1, 7088, 0, 0, 0, NULL, 0);
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (7088, 8343);
INSERT INTO `npc_text` (`ID`, `Probability0`, `BroadcastTextID0`) VALUES (8338, 1, 11916);
INSERT INTO `npc_text` (`ID`, `Probability0`, `BroadcastTextID0`) VALUES (8339, 1, 11918);
INSERT INTO `npc_text` (`ID`, `Probability0`, `BroadcastTextID0`) VALUES (8340, 1, 11920);
INSERT INTO `npc_text` (`ID`, `Probability0`, `BroadcastTextID0`) VALUES (8341, 1, 11922);
INSERT INTO `npc_text` (`ID`, `Probability0`, `BroadcastTextID0`) VALUES (8342, 1, 11924);
INSERT INTO `npc_text` (`ID`, `Probability0`, `BroadcastTextID0`) VALUES (8343, 1, 11926);

-- Mux Manascrambler
UPDATE `gossip_menu_option` SET `id`=2 WHERE `menu_id`=7083 && `id`=0 && `option_broadcast_text`=11909;


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
116 changes: 116 additions & 0 deletions sql/migrations/20230725065632_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20230725065632');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20230725065632');
-- Add your query below.


-- Delete duplicate Astranaar Sentinel
DELETE FROM `creature` WHERE `guid`=33410;

-- Pathing for Astranaar Sentinel Entry: 6087
SET @NPC := 33413;
UPDATE `creature` SET `position_x`=2645.7234,`position_y`=-442.4761,`position_z`=107.194725 WHERE `guid`=@NPC;
DELETE FROM `creature_movement` WHERE `id`=@NPC;
INSERT INTO `creature_movement` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`waittime`,`wander_distance`,`script_id`) VALUES
(@NPC,1,2645.7234,-442.4761,107.194725,100,0,0,0),
(@NPC,2,2658.7644,-434.1358,107.194725,100,0,0,0),
(@NPC,3,2684.7383,-415.6828,107.21438,100,0,0,0),
(@NPC,4,2705.6597,-394.95422,107.214386,100,0,0,0),
(@NPC,5,2721.69,-379.51324,107.214386,100,0,0,0),
(@NPC,6,2736.5925,-365.57443,107.214386,100,0,0,0),
(@NPC,7,2749.4338,-349.57028,107.214386,100,0,0,0),
(@NPC,8,2767.6445,-329.04007,107.21438,100,0,0,0),
(@NPC,9,2782.6555,-312.45688,107.21438,100,0,0,0),
(@NPC,10,2791.0723,-298.3219,107.21438,100,0,0,0),
(@NPC,11,2798.0388,-287.2158,107.21438,100,0,0,0),
(@NPC,12,2805.2146,-274.97836,107.190025,100,0,0,0),
(@NPC,13,2798.0388,-287.2158,107.21438,100,0,0,0),
(@NPC,14,2791.0723,-298.3219,107.21438,100,0,0,0),
(@NPC,15,2782.6555,-312.45688,107.21438,100,0,0,0),
(@NPC,16,2767.6445,-329.04007,107.21438,100,0,0,0),
(@NPC,17,2749.4338,-349.57028,107.214386,100,0,0,0),
(@NPC,18,2736.5925,-365.57443,107.214386,100,0,0,0),
(@NPC,19,2721.69,-379.51324,107.214386,100,0,0,0),
(@NPC,20,2705.6597,-394.95422,107.214386,100,0,0,0),
(@NPC,21,2684.7383,-415.6828,107.21438,100,0,0,0),
(@NPC,22,2658.7644,-434.1358,107.194725,100,0,0,0);
-- .go xyz 2645.7234 -442.4761 107.194725

-- Pathing for Astranaar Sentinel Entry: 6087
SET @NPC := 33470;
UPDATE `creature` SET `movement_type`=2 WHERE `guid`=@NPC;
INSERT INTO `creature_movement` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`waittime`,`wander_distance`,`script_id`) VALUES
(@NPC,1,2823.7024,-296.85733,107.84359,100,0,0,0),
(@NPC,2,2821.8506,-289.82333,107.53719,100,0,0,0),
(@NPC,3,2817.993,-286.45898,107.315025,100,0,0,0),
(@NPC,4,2810.1743,-283.33398,107.315025,100,0,0,0),
(@NPC,5,2803.291,-282.6996,107.190025,100,0,0,0),
(@NPC,6,2799.5122,-287.38785,107.21438,100,0,0,0),
(@NPC,7,2796.3928,-291.52942,107.21438,100,0,0,0),
(@NPC,8,2793.6445,-296.2667,107.21438,100,0,0,0),
(@NPC,9,2791.0938,-302.96487,107.21438,100,0,0,0),
(@NPC,10,2785.3215,-313.17014,107.21438,100,0,0,0),
(@NPC,11,2780.1306,-321.05685,107.1426,100,0,0,0),
(@NPC,12,2774.8816,-327.74765,107.21438,100,0,0,0),
(@NPC,13,2769.8115,-333.0998,107.21438,100,0,0,0),
(@NPC,14,2763.125,-339.6059,107.214386,100,0,0,0),
(@NPC,15,2760.0176,-346.51062,107.339386,100,0,0,0),
(@NPC,16,2761.8682,-355.02643,108.214386,100,0,0,0),
(@NPC,17,2767.5347,-367.2466,108.80243,100,0,0,0),
(@NPC,18,2771.2917,-377.81268,107.758606,100,0,0,0),
(@NPC,19,2771.5457,-383.1066,108.13666,100,0,0,0),
(@NPC,20,2768.631,-389.2321,108.996765,100,0,0,0),
(@NPC,21,2765.227,-397.44858,111.38155,100,0,0,0),
(@NPC,22,2757.5203,-414.58624,111.50181,100,0,0,0),
(@NPC,23,2750.6567,-433.05362,111.50181,100,0,0,0),
(@NPC,24,2749.1055,-440.9328,111.50181,100,0,0,0),
(@NPC,25,2746.1392,-450.5363,111.30181,100,0,0,0),
(@NPC,26,2738.044,-463.1001,108.16593,100,0,0,0),
(@NPC,27,2729.2544,-469.0395,107.79058,100,0,0,0),
(@NPC,28,2718.493,-471.28397,108.55401,100,0,0,0),
(@NPC,29,2711.4038,-471.69873,108.91924,100,0,0,0),
(@NPC,30,2702.9114,-467.1467,108.803764,100,0,0,0),
(@NPC,31,2702.2424,-460.72217,108.797646,100,0,0,0),
(@NPC,32,2702.4402,-447.1789,108.52177,100,0,0,0),
(@NPC,33,2698.6252,-433.9829,108.45462,100,0,0,0),
(@NPC,34,2689.544,-420.3718,107.47146,100,0,0,0),
(@NPC,35,2678.1943,-408.132,107.14358,100,0,0,0),
(@NPC,36,2668.6748,-399.03287,108.292854,100,0,0,0),
(@NPC,37,2659.2148,-394.34335,108.46484,100,0,0,0),
(@NPC,38,2646.2434,-387.60773,105.83447,100,0,0,0),
(@NPC,39,2655.3237,-392.3471,108.075806,100,0,0,0),
(@NPC,40,2658.9094,-394.25815,108.49133,100,0,0,0),
(@NPC,41,2666.898,-398.4877,108.34632,100,0,0,0),
(@NPC,42,2674.0522,-404.0911,107.515526,100,0,0,0),
(@NPC,43,2678.0898,-408.00937,107.15603,100,0,0,0),
(@NPC,44,2691.4788,-413.30206,107.21438,100,0,0,0),
(@NPC,45,2699.847,-404.61526,107.21438,100,0,0,0),
(@NPC,46,2707.3774,-396.97864,107.214386,100,0,0,0),
(@NPC,47,2716.3293,-389.54385,107.214386,100,0,0,0),
(@NPC,48,2723.576,-382.50485,107.214386,100,0,0,0),
(@NPC,49,2730.319,-376.26825,107.214386,100,0,0,0),
(@NPC,50,2737.1714,-367.54065,107.214386,100,0,0,0),
(@NPC,51,2744.9607,-359.17148,107.214386,100,0,0,0),
(@NPC,52,2755.6228,-347.09854,107.214386,100,0,0,0),
(@NPC,53,2763.2327,-338.7212,107.214386,100,0,0,0),
(@NPC,54,2772.483,-330.12537,107.21438,100,0,0,0),
(@NPC,55,2782.3674,-319.08865,107.21438,100,0,0,0),
(@NPC,56,2793.6628,-309.5094,108.095116,100,0,0,0),
(@NPC,57,2796.8376,-308.63672,108.38404,100,0,0,0),
(@NPC,58,2809.383,-307.43652,109.23097,100,0,0,0),
(@NPC,59,2816.944,-306.3248,108.84589,100,0,0,0),
(@NPC,60,2822.346,-302.97867,108.20392,100,0,0,0);
-- .go xyz 2823.7024 -296.85733 107.84359


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
23 changes: 23 additions & 0 deletions sql/migrations/20230726004747_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
DROP PROCEDURE IF EXISTS add_migration;
delimiter ??
CREATE PROCEDURE `add_migration`()
BEGIN
DECLARE v INT DEFAULT 1;
SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20230726004747');
IF v=0 THEN
INSERT INTO `migrations` VALUES ('20230726004747');
-- Add your query below.


-- Remove run script from Baron Geddon and assign extra flag.
UPDATE `creature_movement` SET `script_id`=0 WHERE `id`=56655;
UPDATE `creature_template` SET `flags_extra`=(`flags_extra` | 33554432) WHERE `entry`=12056;
DELETE FROM `creature_movement_scripts` WHERE `id`=5;


-- End of migration.
END IF;
END??
delimiter ;
CALL add_migration();
DROP PROCEDURE IF EXISTS add_migration;
Loading

0 comments on commit 0904eb7

Please sign in to comment.