Skip to content

Commit

Permalink
Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
Rochet2 committed Nov 11, 2024
2 parents d5770f4 + a377ce2 commit 3b15828
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 0 deletions.
51 changes: 51 additions & 0 deletions sql/updates/world/3.3.5/2024_11_10_00_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
-- Rivendark
SET @NPC=23061;
DELETE FROM `creature_text` WHERE `CreatureID`=@NPC;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(@NPC,0,0,"Get away from my clutch!!!",14,0,100,0,0,7274,21696,0,'Rivendark'),
(@NPC,0,1,"I know you by your stench, little $n. Here, in my perch, is where your bones shall finally rest.",14,0,100,0,0,7274,21706,0,'Rivendark'),
(@NPC,0,2,"I tire of interruptions from the insignificant. Your time has come, $n!",14,0,100,0,0,7274,21710,0,'Rivendark'),
(@NPC,0,3,"The Skyguard shall pay for your temerity, $n!",14,0,100,0,0,7274,21714,0,'Rivendark'),
(@NPC,0,4,"I believe that I shall feast upon both $r and ogre flesh tonight.",14,0,100,0,0,7274,21718,0,'Rivendark'),
(@NPC,0,5,"Little $r, you will now come to appreciate my wrath!",14,0,100,0,0,7274,21720,0,'Rivendark'),
(@NPC,0,6,"You have dared to defile my perch and must now be cleansed in fire!",14,0,100,0,0,7274,21726,0,'Rivendark'),
(@NPC,0,7,"What's this?! $n and $g his : her; friends come to play?",14,0,100,0,0,7274,21733,0,'Rivendark');

-- Furywing
SET @NPC=23261;
DELETE FROM `creature_text` WHERE `CreatureID`=@NPC;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(@NPC,0,0,"Get away from my clutch!!!",14,0,100,0,0,7274,21696,0,'Furywing'),
(@NPC,0,1,"I know you by your stench, little $n. Here, in my perch, is where your bones shall finally rest.",14,0,100,0,0,7274,21706,0,'Furywing'),
(@NPC,0,2,"I tire of interruptions from the insignificant. Your time has come, $n!",14,0,100,0,0,7274,21710,0,'Furywing'),
(@NPC,0,3,"The Skyguard shall pay for your temerity, $n!",14,0,100,0,0,7274,21714,0,'Furywing'),
(@NPC,0,4,"I believe that I shall feast upon both $r and ogre flesh tonight.",14,0,100,0,0,7274,21718,0,'Furywing'),
(@NPC,0,5,"Little $r, you will now come to appreciate my wrath!",14,0,100,0,0,7274,21720,0,'Furywing'),
(@NPC,0,6,"You have dared to defile my perch and must now be cleansed in fire!",14,0,100,0,0,7274,21726,0,'Furywing'),
(@NPC,0,7,"What's this?! $n and $g his : her; friends come to play?",14,0,100,0,0,7274,21733,0,'Furywing');

-- Insidion
SET @NPC=23281;
DELETE FROM `creature_text` WHERE `CreatureID`=@NPC;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(@NPC,0,0,"Get away from my clutch!!!",14,0,100,0,0,7274,21696,0,'Insidion'),
(@NPC,0,1,"I know you by your stench, little $n. Here, in my perch, is where your bones shall finally rest.",14,0,100,0,0,7274,21706,0,'Insidion'),
(@NPC,0,2,"I tire of interruptions from the insignificant. Your time has come, $n!",14,0,100,0,0,7274,21710,0,'Insidion'),
(@NPC,0,3,"The Skyguard shall pay for your temerity, $n!",14,0,100,0,0,7274,21714,0,'Insidion'),
(@NPC,0,4,"I believe that I shall feast upon both $r and ogre flesh tonight.",14,0,100,0,0,7274,21718,0,'Insidion'),
(@NPC,0,5,"Little $r, you will now come to appreciate my wrath!",14,0,100,0,0,7274,21720,0,'Insidion'),
(@NPC,0,6,"You have dared to defile my perch and must now be cleansed in fire!",14,0,100,0,0,7274,21726,0,'Insidion'),
(@NPC,0,7,"What's this?! $n and $g his : her; friends come to play?",14,0,100,0,0,7274,21733,0,'Insidion');

-- Obsidia
SET @NPC=23282;
DELETE FROM `creature_text` WHERE `CreatureID`=@NPC;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(@NPC,0,0,"Get away from my clutch!!!",14,0,100,0,0,7274,21696,0,'Obsidia'),
(@NPC,0,1,"I know you by your stench, little $n. Here, in my perch, is where your bones shall finally rest.",14,0,100,0,0,7274,21706,0,'Obsidia'),
(@NPC,0,2,"I tire of interruptions from the insignificant. Your time has come, $n!",14,0,100,0,0,7274,21710,0,'Obsidia'),
(@NPC,0,3,"The Skyguard shall pay for your temerity, $n!",14,0,100,0,0,7274,21714,0,'Obsidia'),
(@NPC,0,4,"I believe that I shall feast upon both $r and ogre flesh tonight.",14,0,100,0,0,7274,21718,0,'Obsidia'),
(@NPC,0,5,"Little $r, you will now come to appreciate my wrath!",14,0,100,0,0,7274,21720,0,'Obsidia'),
(@NPC,0,6,"You have dared to defile my perch and must now be cleansed in fire!",14,0,100,0,0,7274,21726,0,'Obsidia'),
(@NPC,0,7,"What's this?! $n and $g his : her; friends come to play?",14,0,100,0,0,7274,21733,0,'Obsidia');
104 changes: 104 additions & 0 deletions sql/updates/world/3.3.5/2024_11_10_01_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
-- Hildana Deathstealer
SET @GUID = 151987;
SET @PATH = @GUID * 10;
UPDATE `creature` SET `position_x`=7192.40869140625,`position_y`=2087.502197265625,`position_z`=591.82122802734375,`orientation`=5.334992408752441406, `wander_distance`=0,`MovementType`=2 WHERE `guid`=@GUID;
DELETE FROM `creature_template_movement` WHERE `CreatureId`=32495;
INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`, `InteractionPauseTimer`) VALUES
(32495, 0, 0, 1, 0, 0, 0, NULL);
DELETE FROM `creature_addon` WHERE `guid`=@GUID;
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `MountCreatureID`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvPFlags`, `emote`, `visibilityDistanceType`, `auras`) VALUES
(@GUID, @PATH, 0, 0, 0, 3, 0, 1, 0, 0, 0, NULL);
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(@PATH, 0, 7222.452, 2049.397, 586.3735, NULL, 0, 0, 0, 100, 0),
(@PATH, 1, 7242.69, 2020.932, 586.3621, NULL, 0, 0, 0, 100, 0),
(@PATH, 2, 7239.754, 1992.342, 582.9315, NULL, 0, 0, 0, 100, 0),
(@PATH, 3, 7217.938, 1967.975, 582.8708, NULL, 0, 0, 0, 100, 0),
(@PATH, 4, 7215.49, 1953.749, 579.5094, NULL, 0, 0, 0, 100, 0),
(@PATH, 5, 7209.799, 1933.954, 573.6544, NULL, 0, 0, 0, 100, 0),
(@PATH, 6, 7189.471, 1920.425, 566.2871, NULL, 0, 0, 0, 100, 0),
(@PATH, 7, 7176.588, 1908.39, 561.8888, NULL, 0, 0, 0, 100, 0),
(@PATH, 8, 7158.939, 1897.289, 554.6441, NULL, 0, 0, 0, 100, 0),
(@PATH, 9, 7142.65, 1883.022, 546.8456, NULL, 0, 0, 0, 100, 0),
(@PATH, 10, 7146.625, 1871.005, 542.7414, NULL, 0, 0, 0, 100, 0),
(@PATH, 11, 7143.43, 1853.5, 534.7924, NULL, 0, 0, 0, 100, 0),
(@PATH, 12, 7140.116, 1829.073, 522.2319, NULL, 0, 0, 0, 100, 0),
(@PATH, 13, 7147.326, 1802.581, 511.2054, NULL, 0, 0, 0, 100, 0),
(@PATH, 14, 7160.529, 1777.781, 502.085, NULL, 0, 0, 0, 100, 0),
(@PATH, 15, 7154.228, 1756.151, 497.3007, NULL, 0, 0, 0, 100, 0),
(@PATH, 16, 7136.289, 1737.988, 497.017, NULL, 0, 0, 0, 100, 0),
(@PATH, 17, 7111.468, 1737.822, 502.8012, NULL, 0, 0, 0, 100, 0),
(@PATH, 18, 7093.092, 1746.867, 507.5394, NULL, 0, 0, 0, 100, 0),
(@PATH, 19, 7074.251, 1757.452, 510.6808, NULL, 0, 0, 0, 100, 0),
(@PATH, 20, 7053.318, 1765.741, 513.947, NULL, 0, 0, 0, 100, 0),
(@PATH, 21, 7029.345, 1773.791, 517.5663, NULL, 0, 0, 0, 100, 0),
(@PATH, 22, 7011.002, 1761.331, 518.4968, NULL, 0, 0, 0, 100, 0),
(@PATH, 23, 6997.615, 1747.272, 519.6525, NULL, 0, 0, 0, 100, 0),
(@PATH, 24, 6977.209, 1726.555, 523.2506, NULL, 0, 0, 0, 100, 0),
(@PATH, 25, 6959.343, 1709.8, 528.5284, NULL, 0, 0, 0, 100, 0),
(@PATH, 26, 6944.034, 1703.351, 531.3673, NULL, 0, 0, 0, 100, 0),
(@PATH, 27, 6922.215, 1702.405, 535.2693, NULL, 0, 0, 0, 100, 0),
(@PATH, 28, 6905.099, 1705.328, 538.6309, NULL, 0, 0, 0, 100, 0),
(@PATH, 29, 6886.74, 1703.085, 543.012, NULL, 0, 0, 0, 100, 0),
(@PATH, 30, 6864.976, 1700.863, 548.3915, NULL, 0, 0, 0, 100, 0),
(@PATH, 31, 6848.176, 1702.512, 552.8682, NULL, 0, 0, 0, 100, 0),
(@PATH, 32, 6832.075, 1708.631, 557.7967, NULL, 0, 0, 0, 100, 0),
(@PATH, 33, 6821.65, 1718.504, 562.5582, NULL, 0, 0, 0, 100, 0),
(@PATH, 34, 6809.965, 1730.085, 568.9621, NULL, 0, 0, 0, 100, 0),
(@PATH, 35, 6803.283, 1742.857, 574.6663, NULL, 0, 0, 0, 100, 0),
(@PATH, 36, 6801.305, 1755.202, 578.022, NULL, 0, 0, 0, 100, 0),
(@PATH, 37, 6798.108, 1766.889, 580.5387, NULL, 0, 0, 0, 100, 0),
(@PATH, 38, 6797.701, 1780.178, 582.3558, NULL, 0, 0, 0, 100, 0),
(@PATH, 39, 6800.344, 1789.98, 584.1855, NULL, 0, 0, 0, 100, 0),
(@PATH, 40, 6804.535, 1803.005, 587.1995, NULL, 0, 0, 0, 100, 0),
(@PATH, 41, 6809.243, 1811.058, 589.2962, NULL, 0, 0, 0, 100, 0),
(@PATH, 42, 6804.535, 1803.005, 587.1995, NULL, 0, 0, 0, 100, 0),
(@PATH, 43, 6800.344, 1789.98, 584.1855, NULL, 0, 0, 0, 100, 0),
(@PATH, 44, 6797.701, 1780.178, 582.3558, NULL, 0, 0, 0, 100, 0),
(@PATH, 45, 6798.108, 1766.889, 580.5387, NULL, 0, 0, 0, 100, 0),
(@PATH, 46, 6801.272, 1755.311, 578.0976, NULL, 0, 0, 0, 100, 0),
(@PATH, 47, 6803.283, 1742.857, 574.6663, NULL, 0, 0, 0, 100, 0),
(@PATH, 48, 6809.965, 1730.085, 568.9621, NULL, 0, 0, 0, 100, 0),
(@PATH, 49, 6821.65, 1718.504, 562.5582, NULL, 0, 0, 0, 100, 0),
(@PATH, 50, 6832.075, 1708.631, 557.7967, NULL, 0, 0, 0, 100, 0),
(@PATH, 51, 6848.176, 1702.512, 552.8682, NULL, 0, 0, 0, 100, 0),
(@PATH, 52, 6864.976, 1700.863, 548.3915, NULL, 0, 0, 0, 100, 0),
(@PATH, 53, 6886.74, 1703.085, 543.012, NULL, 0, 0, 0, 100, 0),
(@PATH, 54, 6905.099, 1705.328, 538.6309, NULL, 0, 0, 0, 100, 0),
(@PATH, 55, 6922.215, 1702.405, 535.2693, NULL, 0, 0, 0, 100, 0),
(@PATH, 56, 6944.034, 1703.351, 531.3673, NULL, 0, 0, 0, 100, 0),
(@PATH, 57, 6959.343, 1709.8, 528.5284, NULL, 0, 0, 0, 100, 0),
(@PATH, 58, 6977.209, 1726.555, 523.2506, NULL, 0, 0, 0, 100, 0),
(@PATH, 59, 6997.615, 1747.272, 519.6525, NULL, 0, 0, 0, 100, 0),
(@PATH, 60, 7011.002, 1761.331, 518.4968, NULL, 0, 0, 0, 100, 0),
(@PATH, 61, 7029.345, 1773.791, 517.5663, NULL, 0, 0, 0, 100, 0),
(@PATH, 62, 7053.318, 1765.741, 513.947, NULL, 0, 0, 0, 100, 0),
(@PATH, 63, 7074.251, 1757.452, 510.6808, NULL, 0, 0, 0, 100, 0),
(@PATH, 64, 7093.092, 1746.867, 507.5394, NULL, 0, 0, 0, 100, 0),
(@PATH, 65, 7111.468, 1737.822, 502.8012, NULL, 0, 0, 0, 100, 0),
(@PATH, 66, 7136.289, 1737.988, 497.017, NULL, 0, 0, 0, 100, 0),
(@PATH, 67, 7154.228, 1756.151, 497.3007, NULL, 0, 0, 0, 100, 0),
(@PATH, 68, 7160.529, 1777.781, 502.085, NULL, 0, 0, 0, 100, 0),
(@PATH, 69, 7147.326, 1802.581, 511.2054, NULL, 0, 0, 0, 100, 0),
(@PATH, 70, 7140.116, 1829.073, 522.2319, NULL, 0, 0, 0, 100, 0),
(@PATH, 71, 7143.43, 1853.5, 534.7924, NULL, 0, 0, 0, 100, 0),
(@PATH, 72, 7146.625, 1871.005, 542.7414, NULL, 0, 0, 0, 100, 0),
(@PATH, 73, 7142.65, 1883.022, 546.8456, NULL, 0, 0, 0, 100, 0),
(@PATH, 74, 7158.939, 1897.289, 554.6441, NULL, 0, 0, 0, 100, 0),
(@PATH, 75, 7176.588, 1908.39, 561.8888, NULL, 0, 0, 0, 100, 0),
(@PATH, 76, 7189.471, 1920.425, 566.2871, NULL, 0, 0, 0, 100, 0),
(@PATH, 77, 7209.799, 1933.954, 573.6544, NULL, 0, 0, 0, 100, 0),
(@PATH, 78, 7215.49, 1953.749, 579.5094, NULL, 0, 0, 0, 100, 0),
(@PATH, 79, 7217.938, 1967.975, 582.8708, NULL, 0, 0, 0, 100, 0),
(@PATH, 80, 7239.754, 1992.342, 582.9315, NULL, 0, 0, 0, 100, 0),
(@PATH, 81, 7242.69, 2020.932, 586.3621, NULL, 0, 0, 0, 100, 0),
(@PATH, 82, 7222.452, 2049.397, 586.3735, NULL, 0, 0, 0, 100, 0),
(@PATH, 83, 7199.488, 2077.641, 588.7512, NULL, 0, 0, 0, 100, 0),
(@PATH, 84, 7180.812, 2103.658, 596.8508, NULL, 0, 0, 0, 100, 0),
(@PATH, 85, 7159.934, 2123.704, 608.3088, NULL, 0, 0, 0, 100, 0),
(@PATH, 86, 7137.276, 2137.024, 619.1228, NULL, 0, 0, 0, 100, 0),
(@PATH, 87, 7113.819, 2138.252, 627.6207, NULL, 0, 0, 0, 100, 0),
(@PATH, 88, 7099.208, 2130.521, 633.0135, NULL, 0, 0, 0, 100, 0),
(@PATH, 89, 7088.263, 2131.638, 637.222, NULL, 0, 0, 0, 100, 0),
(@PATH, 90, 7099.208, 2130.521, 633.0135, NULL, 0, 0, 0, 100, 0),
(@PATH, 91, 7113.819, 2138.252, 627.6207, NULL, 0, 0, 0, 100, 0);

0 comments on commit 3b15828

Please sign in to comment.