Skip to content

Commit

Permalink
Merge 3.3.5 to 3.3.5-skip-dk
Browse files Browse the repository at this point in the history
  • Loading branch information
Github Actions committed Feb 10, 2025
2 parents 5de73b9 + a5d4c46 commit 7c77b47
Show file tree
Hide file tree
Showing 79 changed files with 2,493 additions and 1,746 deletions.
1 change: 1 addition & 0 deletions sql/updates/world/3.3.5/2025_02_03_00_world_2012_08_20_00_world_quest_template_434.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE `quest_template` CHANGE `AllowableRaces` `AllowableRaces` int unsigned NOT NULL DEFAULT '0';
105 changes: 105 additions & 0 deletions sql/updates/world/3.3.5/2025_02_05_00_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@

-- Intro for quest "The Binding" (1795)
-- Game objects are spawned by the script
DELETE FROM `gameobject` WHERE `guid` IN (29205,50355);
DELETE FROM `gameobject_addon` WHERE `guid` IN (29205,50355);

-- Strahad Farsan Text
DELETE FROM `creature_text` WHERE `CreatureID`=6251;
INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
(6251,0,0,"I hope you're ready, $n. Follow me.",12,0,100,1,0,0,2370,0,"Strahad Farsan"),
(6251,1,0,"Come, my acolytes. Take the rods of channeling and create the greater summoning circle.",12,0,100,1,0,0,2374,0,"Strahad Farsan");

-- Script
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (6251,6252,6253,6254,6268);
DELETE FROM `smart_scripts` WHERE `entryorguid` IN( 6251,6252,6253,6254,6268) AND `source_type`=0;
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (625100,625101,625102,625103,625200,625300,625400,626800) AND `source_type`=9;
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`,`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

-- Strahad Farsan Script
(6251,0,0,0,19,0,100,0,1795,0,0,0,0,80,625100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Quest 'The Binding' Taken - Run Script"),
(6251,0,1,0,40,0,100,0,4,0,0,0,0,80,625101,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Waypoint 4 Reached - Run Script"),
(6251,0,2,0,40,0,100,0,6,0,0,0,0,80,625102,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Waypoint 7 Reached - Run Script"),
(6251,0,3,0,38,0,100,0,0,3,0,0,0,65,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Data Set 0 3 - Resume Waypoint"),
(6251,0,4,0,40,0,100,0,9,0,0,0,0,80,625103,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Waypoint 10 Reached - Run Script"),

-- Acolyte Magaz Script
(6252,0,0,0,38,0,100,0,0,1,0,0,0,80,625200,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Magaz - On Data Set 0 1 - Run Script"),
(6252,0,1,0,38,0,100,0,0,2,0,0,0,5,34,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Magaz - On Data Set 0 2 - Play Emote"),

-- Acolyte Fenrick Script
(6253,0,0,0,38,0,100,0,0,1,0,0,0,80,625200,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Fenrick - On Data Set 0 1 - Run Script"),
(6253,0,1,0,38,0,100,0,0,2,0,0,0,5,34,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Fenrick - On Data Set 0 2 - Play Emote"),

-- Acolyte Wytula Script
(6254,0,0,0,38,0,100,0,0,1,0,0,0,80,625200,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Wytula - On Data Set 0 1 - Run Script"),
(6254,0,1,0,38,0,100,0,0,2,0,0,0,5,34,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Wytula - On Data Set 0 2 - Play Emote"),

-- Summoned Felhunter Script
(6268,0,0,0,0,0,100,0,5000,11000,11000,17000,0,11,2691,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Summoned Felhunter - In Combat - Cast 'Mana Burn'"),
(6268,0,1,0,54,0,100,0,0,0,0,0,0,80,626800,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Summoned Felhunter - On Just Summoned - Run Script"),
(6268,0,2,0,6,0,100,0,2000,2000,0,0,0,45,0,3,0,0,0,0,19,6251,0,0,0,0,0,0,0,"Summoned Felhunter - On Death - Set Data 0 3 (Strahad Farsan)"),

-- Strahad Farsan Timed List 1
(625100,9,0,0,0,0,100,0,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Remove Npc Flag Questgiver+Gossip"),
(625100,9,1,0,0,0,100,0,1000,1000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Say Line 0"),
(625100,9,2,0,0,0,100,0,2000,2000,0,0,0,53,0,6251,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Start Waypoint"),

-- Strahad Farsan Timed List 2
(625101,9,0,0,0,0,100,0,0,0,0,0,0,54,13000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Pause Waypoint"),
(625101,9,1,0,0,0,100,0,1000,1000,0,0,0,11,8677,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Cast 'Summon Effect'"),
(625101,9,2,0,0,0,100,0,6000,6000,0,0,0,50,92252,188,0,0,0,0,8,0,0,0,0,-768.80353,-3721.770,42.0,4.4998,"Strahad Farsan - On Script - Summon Gameobject 'Strahad's Summoning Circle'"),
(625101,9,3,0,0,0,100,0,1000,1000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Say Line 1"),
(625101,9,4,0,0,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,6252,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Set Data 0 1 (Acolyte Magaz)"),
(625101,9,5,0,0,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,6253,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Set Data 0 1 (Acolyte Fenrick)"),
(625101,9,6,0,0,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,6254,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Set Data 0 1 (Acolyte Wytula)"),

-- Strahad Farsan Timed List 3
(625102,9,0,0,0,0,100,0,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Pause Waypoint"),
(625102,9,1,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Set Orientation Invoker"),

-- Strahad Farsan Timed List 4
(625103,9,0,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,2.05950,"Strahad Farsan - On Script - Set Orientation"),
(625103,9,1,0,0,0,100,0,1000,1000,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Strahad Farsan - On Script - Add Npc Flag Questgiver+Gossip"),

-- Acolyte Magaz Timed List 1
(625200,9,0,0,0,0,100,0,1000,1000,0,0,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Magaz - On Data Set - Play Emote"),
(625200,9,1,0,0,0,100,0,5000,5000,0,0,0,11,8675,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Magaz - On Script - Cast 'Warlock Channeling'"),
(625200,9,2,0,0,0,100,0,7500,7500,0,0,0,50,92388,173,0,0,0,0,8,0,0,0,0,-768.80353,-3721.770,44.10,2.5952,"Acolyte Magaz - On Script - Summon Gameobject 'Summoning Circle'"),

-- Acolyte Fenrick Timed List 1
(625300,9,0,0,0,0,100,0,1000,1000,0,0,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Fenrick - On Data Set - Play Emote"),
(625300,9,1,0,0,0,100,0,5000,5000,0,0,0,11,8675,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Fenrick - On Script - Cast 'Warlock Channeling'"),

-- Acolyte Wytula Timed List 1
(625400,9,0,0,0,0,100,0,1000,1000,0,0,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Wytula - On Data Set - Play Emote"),
(625400,9,1,0,0,0,100,0,5000,5000,0,0,0,11,8675,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acolyte Wytula - On Script - Cast 'Warlock Channeling'"),

-- Summoned Felhunter Timed List 1
(626800,9,0,0,0,0,100,0,0,0,0,0,0,11,52096,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Summoned Felhunter - On Script - Cast 'Teleport Visual Only'"),
(626800,9,1,0,0,0,100,0,1000,1000,0,0,0,45,0,2,0,0,0,0,19,6252,0,0,0,0,0,0,0,"Summoned Felhunter - On Script - Set Data 0 2 (Acolyte Magaz)"),
(626800,9,2,0,0,0,100,0,0,0,0,0,0,45,0,2,0,0,0,0,19,6253,0,0,0,0,0,0,0,"Summoned Felhunter - On Script - Set Data 0 2 (Acolyte Fenrick)"),
(626800,9,3,0,0,0,100,0,0,0,0,0,0,45,0,2,0,0,0,0,19,6254,0,0,0,0,0,0,0,"Summoned Felhunter - On Script - Set Data 0 2 (Acolyte Wytula)"),
(626800,9,4,0,0,0,100,0,0,0,0,0,0,41,2000,0,0,0,0,0,13,92252,0,100,0,0,0,0,0,"Summoned Felhunter - On Script - Despawn Gameobject 'Strahad's Summoning Circle'"),
(626800,9,5,0,0,0,100,0,0,0,0,0,0,41,2000,0,0,0,0,0,13,92388,0,100,0,0,0,0,0,"Summoned Felhunter - On Script - Despawn Gameobject 'Summoning Circle'"),
(626800,9,6,0,0,0,100,0,500,500,0,0,0,49,0,0,0,0,0,0,21,20,0,0,0,0,0,0,0,"Summoned Felhunter - On Script - Start Attacking Closest Player");

-- Conditions
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=6251;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES

-- Condition to prevent script from running when there already is a Felhunter spawned
(22,1,6251,0,0,29,0,6268,100,0,1,0,0,"","Smart Event 0 for creature Strahad Farsan only executes if creature 'Summoned Felhunter' not near");

-- Strahad Farsan Waypoints
DELETE FROM `waypoints` WHERE `entry`=6251;
INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
(6251,1,-786.65186,-3722.0166,40.380207,"Strahad Farsan"),
(6251,2,-784.910,-3717.9514,41.09593,"Strahad Farsan"),
(6251,3,-778.20404,-3718.2446,42.591854,"Strahad Farsan"),
(6251,4,-769.45544,-3721.2717,42.424034,"Strahad Farsan"), -- Summon
(6251,5,-767.81177,-3721.42969,42.37064,"Strahad Farsan"),
(6251,6,-762.8201,-3720.283,42.24128,"Strahad Farsan"), -- Waiting
(6251,7,-768.04926,-3720.5073,42.379726,"Strahad Farsan"),
(6251,8,-781.8862,-3716.743,41.55511,"Strahad Farsan"),
(6251,9,-785.9119,-3723.260,40.515202,"Strahad Farsan"); -- Home
2 changes: 2 additions & 0 deletions sql/updates/world/3.3.5/2025_02_07_00_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Add correct equipment to Witherheart the Stalker
UPDATE `creature_equip_template` SET `ItemID1`=10617, `ItemID2`=5285, `VerifiedBuild`=58797 WHERE `CreatureID`=8218 AND `ID`=1;
58 changes: 58 additions & 0 deletions sql/updates/world/3.3.5/2025_02_07_01_world.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
-- Pathing for Mirelow Entry: 14424
SET @NPC=14424;
SET @GUID=91113;
SET @PATH=@GUID * 10;
DELETE FROM `creature` WHERE `id` = @NPC AND `guid` != (@GUID);
DELETE FROM `pool_template` WHERE `entry`=@NPC;
DELETE FROM `pool_members` WHERE `Type`=0 AND `poolSpawnId`=1072;
UPDATE `creature` SET `position_x`=-2752.9434,`position_y`=-1311.9869,`position_z`=6.144358,`wander_distance`=0,`MovementType`=2 WHERE `id`=@NPC AND `guid`=@GUID;
UPDATE `creature_template` SET `MovementType`=2,`speed_walk`=1 WHERE `entry`=@NPC;
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, 0, 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, 1, -2752.9434, -1311.9869, 6.144358, NULL, 0, 0, 0, 100, 0),
(@PATH, 2, -2779.3325, -1318.1886, 6.212498, NULL, 0, 0, 0, 100, 0),
(@PATH, 3, -2802.5144, -1327.2316, 6.2124987, NULL, 0, 0, 0, 100, 0),
(@PATH, 4, -2841.5269, -1356.3691, 6.2124963, NULL, 0, 0, 0, 100, 0),
(@PATH, 5, -2868.5942, -1383.6816, 6.2125034, NULL, 0, 0, 0, 100, 0),
(@PATH, 6, -2888.584, -1418.0055, 6.2125034, NULL, 0, 0, 0, 100, 0),
(@PATH, 7, -2915.9563, -1455.4119, 6.2125106, NULL, 0, 0, 0, 100, 0),
(@PATH, 8, -2948.1558, -1477.9122, 6.2125034, NULL, 0, 0, 0, 100, 0),
(@PATH, 9, -2979.6265, -1493.0153, 6.2125106, NULL, 0, 0, 0, 100, 0),
(@PATH, 10, -3007.2742, -1519.1643, 6.1943064, NULL, 0, 0, 0, 100, 0),
(@PATH, 11, -3030.377, -1531.1482, 1.8713083, NULL, 0, 0, 0, 100, 0),
(@PATH, 12, -3050.034, -1538.9908, 2.2948234, NULL, 0, 0, 0, 100, 0),
(@PATH, 13, -3068.111, -1529.2074, 4.6410594, NULL, 0, 0, 0, 100, 0),
(@PATH, 14, -3048.722, -1507.4395, 2.3030105, NULL, 0, 0, 0, 100, 0),
(@PATH, 15, -3045.1477, -1488.9481, 6.1078167, NULL, 0, 0, 0, 100, 0),
(@PATH, 16, -3037.5547, -1465.8003, 6.2125444, NULL, 0, 0, 0, 100, 0),
(@PATH, 17, -3013.2668, -1444.2893, 6.2125444, NULL, 0, 0, 0, 100, 0),
(@PATH, 18, -2992.2075, -1423.2106, 6.2125444, NULL, 0, 0, 0, 100, 0),
(@PATH, 19, -2982.6704, -1384.7448, 6.2125444, NULL, 0, 0, 0, 100, 0),
(@PATH, 20, -2976.297, -1355.0217, 6.1414337, NULL, 0, 0, 0, 100, 0),
(@PATH, 21, -2972.429, -1315.0929, 6.212561, NULL, 0, 0, 0, 100, 0),
(@PATH, 22, -2959.098, -1289.4697, 6.212534, NULL, 0, 0, 0, 100, 0),
(@PATH, 23, -2946.3533, -1262.2607, 6.212534, NULL, 0, 0, 0, 100, 0),
(@PATH, 24, -2940.9849, -1235.0204, 6.212534, NULL, 0, 0, 0, 100, 0),
(@PATH, 25, -2927.3582, -1214.3258, 6.276264, NULL, 0, 0, 0, 100, 0),
(@PATH, 26, -2913.8328, -1184.8007, 6.2125435, NULL, 0, 0, 0, 100, 0),
(@PATH, 27, -2913.718, -1156.6484, 6.380024, NULL, 0, 0, 0, 100, 0),
(@PATH, 28, -2906.6707, -1130.346, 6.3375435, NULL, 0, 0, 0, 100, 0),
(@PATH, 29, -2924.4268, -1129.007, 6.262104, NULL, 0, 0, 0, 100, 0),
(@PATH, 30, -2948.263, -1141.3658, 6.581269, NULL, 0, 0, 0, 100, 0),
(@PATH, 31, -2981.483, -1160.7555, 6.2125306, NULL, 0, 0, 0, 100, 0),
(@PATH, 32, -3008.991, -1189.4165, 6.3375306, NULL, 0, 0, 0, 100, 0),
(@PATH, 33, -3033.5713, -1223.1588, 3.6263075, NULL, 0, 0, 0, 100, 0),
(@PATH, 34, -3058.1658, -1243.8303, 6.385656, NULL, 0, 0, 0, 100, 0),
(@PATH, 35, -3084.6208, -1262.775, 6.2125497, NULL, 0, 0, 0, 100, 0),
(@PATH, 36, -3110.9539, -1251.6007, 5.657193, NULL, 0, 0, 0, 100, 0),
(@PATH, 37, -3127.4268, -1279.7166, 6.2125597, NULL, 0, 0, 0, 100, 0),
(@PATH, 38, -3140.0647, -1310.3094, 6.2125597, NULL, 0, 0, 0, 100, 0),
(@PATH, 39, -3129.7153, -1336.1788, 6.2125444, NULL, 0, 0, 0, 100, 0),
(@PATH, 40, -3135.3235, -1368.5166, 6.2125444, NULL, 0, 0, 0, 100, 0),
(@PATH, 41, -3156.5852, -1393.152, 6.2125444, NULL, 0, 0, 0, 100, 0),
(@PATH, 42, -3176.052, -1410.8157, 6.2125344, NULL, 0, 0, 0, 100, 0),
(@PATH, 43, -3184.6921, -1435.9547, 6.2125344, NULL, 0, 0, 0, 100, 0),
(@PATH, 44, -3201.1177, -1461.5942, 6.2125344, NULL, 0, 0, 0, 100, 0);
Loading

0 comments on commit 7c77b47

Please sign in to comment.