Skip to content

Commit 21bc182

Browse files
author
Github Actions
committed
Merge 3.3.5-base_patch to 3.3.5-paymaster
2 parents ae4b9ad + 9042fe0 commit 21bc182

File tree

9 files changed

+278
-39
lines changed

9 files changed

+278
-39
lines changed

‎sql/updates/world/3.3.5/2025_07_28_00_world.sql‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
--
2+
DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_sunwell_plateau_cataclysm_breath', 'spell_arcatraz_chaos_breath', 'spell_arcatraz_death_count');
3+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
4+
(46292, 'spell_sunwell_plateau_cataclysm_breath'),
5+
(36677, 'spell_arcatraz_chaos_breath'),
6+
(36660, 'spell_arcatraz_death_count'),
7+
(38820, 'spell_arcatraz_death_count');
8+
9+
DELETE FROM `smart_scripts` WHERE `entryorguid` = 20867 AND `source_type` = 0 AND `id` IN (8,9);

‎sql/updates/world/3.3.5/2025_07_28_01_world.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-- Sen'jin Fetish
2+
SET @NPC=33810;
3+
UPDATE `creature_template` SET `unit_flags`=768, `AIName`='SmartAI' WHERE `entry`=@NPC;
4+
DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@NPC;
5+
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
6+
(@NPC, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 0, 3, 0, 28880, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sen'Jin Fetish - Just Summoned - Morph"),
7+
(@NPC, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 87, @NPC * 100, @NPC * 100 + 1, @NPC * 100 + 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sen'Jin Fetish - On Link - Call Random Script");
8+
9+
DELETE FROM `creature_template_addon` WHERE `entry`=@NPC;
10+
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `MountCreatureID`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvPFlags`, `emote`, `visibilityDistanceType`, `auras`) VALUES
11+
(@NPC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '52619'); -- Enchanted Tiki Warrior: Enchanted Tiki Warrior Glow Visual
12+
13+
DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@NPC * 100, @NPC * 100 +1, @NPC * 100 + 2);
14+
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
15+
(@NPC * 100, 9, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 11, 52614, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sen'Jin Fetish - Just Summoned - Cast Spell 'Enchanted Tiki Warrior: Enchanted Tiki Warrior Visual 01' on self"),
16+
(@NPC * 100 + 1, 9, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 11, 52617, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sen'Jin Fetish - Just Summoned - Cast Spell 'Enchanted Tiki Warrior: Enchanted Tiki Warrior Visual 02' on self"),
17+
(@NPC * 100 + 2, 9, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 11, 52618, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sen'Jin Fetish - Just Summoned - Cast Spell 'Enchanted Tiki Warrior: Enchanted Tiki Warrior Visual 03' on self");

‎sql/updates/world/3.3.5/2025_07_28_02_world.sql‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
--
2+
SET @NPC=14424;
3+
SET @GUID=91113;
4+
SET @PATH=@GUID * 10;
5+
UPDATE `creature` SET `orientation`=3.34791 WHERE `id`=@NPC AND `guid`=@GUID;
6+
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
7+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
8+
(@PATH,1,-2752.9434,-1311.9869,6.144358,NULL,0,0,0,100,0),
9+
(@PATH,2,-2779.3325,-1318.1886,6.212498,NULL,0,0,0,100,0),
10+
(@PATH,3,-2802.5144,-1327.2316,6.2124987,NULL,0,0,0,100,0),
11+
(@PATH,4,-2841.5269,-1356.3691,6.2124963,NULL,0,0,0,100,0),
12+
(@PATH,5,-2868.5942,-1383.6816,6.2125034,NULL,0,0,0,100,0),
13+
(@PATH,6,-2888.584,-1418.0055,6.2125034,NULL,0,0,0,100,0),
14+
(@PATH,7,-2915.9563,-1455.4119,6.2125106,NULL,0,0,0,100,0),
15+
(@PATH,8,-2948.1558,-1477.9122,6.2125034,NULL,0,0,0,100,0),
16+
(@PATH,9,-2979.6265,-1493.0153,6.2125106,NULL,0,0,0,100,0),
17+
(@PATH,10,-3007.2742,-1519.1643,6.1943064,NULL,0,0,0,100,0),
18+
(@PATH,11,-3030.377,-1531.1482,1.8713083,NULL,0,0,0,100,0),
19+
(@PATH,12,-3050.034,-1538.9908,2.2948234,NULL,0,0,0,100,0),
20+
(@PATH,13,-3068.111,-1529.2074,4.6410594,NULL,0,0,0,100,0),
21+
(@PATH,14,-3048.722,-1507.4395,2.3030105,NULL,0,0,0,100,0),
22+
(@PATH,15,-3045.1477,-1488.9481,6.1078167,NULL,0,0,0,100,0),
23+
(@PATH,16,-3037.5547,-1465.8003,6.2125444,NULL,0,0,0,100,0),
24+
(@PATH,17,-3013.2668,-1444.2893,6.2125444,NULL,0,0,0,100,0),
25+
(@PATH,18,-2992.2075,-1423.2106,6.2125444,NULL,0,0,0,100,0),
26+
(@PATH,19,-2982.6704,-1384.7448,6.2125444,NULL,0,0,0,100,0),
27+
(@PATH,20,-2976.297,-1355.0217,6.1414337,NULL,0,0,0,100,0),
28+
(@PATH,21,-2972.429,-1315.0929,6.212561,NULL,0,0,0,100,0),
29+
(@PATH,22,-2959.098,-1289.4697,6.212534,NULL,0,0,0,100,0),
30+
(@PATH,23,-2946.3533,-1262.2607,6.212534,NULL,0,0,0,100,0),
31+
(@PATH,24,-2940.9849,-1235.0204,6.212534,NULL,0,0,0,100,0),
32+
(@PATH,25,-2927.3582,-1214.3258,6.276264,NULL,0,0,0,100,0),
33+
(@PATH,26,-2913.8328,-1184.8007,6.2125435,NULL,0,0,0,100,0),
34+
(@PATH,27,-2913.718,-1156.6484,6.380024,NULL,0,0,0,100,0),
35+
(@PATH,28,-2906.6707,-1130.346,6.3375435,NULL,0,0,0,100,0),
36+
(@PATH,29,-2924.4268,-1129.007,6.262104,NULL,0,0,0,100,0),
37+
(@PATH,30,-2948.263,-1141.3658,6.581269,NULL,0,0,0,100,0),
38+
(@PATH,31,-2981.483,-1160.7555,6.2125306,NULL,0,0,0,100,0),
39+
(@PATH,32,-3008.991,-1189.4165,6.3375306,NULL,0,0,0,100,0),
40+
(@PATH,33,-3033.5713,-1223.1588,3.6263075,NULL,0,0,0,100,0),
41+
(@PATH,34,-3058.1658,-1243.8303,6.385656,NULL,0,0,0,100,0),
42+
(@PATH,35,-3084.6208,-1262.775,6.2125497,NULL,0,0,0,100,0),
43+
(@PATH,36,-3110.9539,-1251.6007,5.657193,NULL,0,0,0,100,0),
44+
(@PATH,37,-3127.4268,-1279.7166,6.2125597,NULL,0,0,0,100,0),
45+
(@PATH,38,-3140.0647,-1310.3094,6.2125597,NULL,0,0,0,100,0),
46+
(@PATH,39,-3129.7153,-1336.1788,6.2125444,NULL,0,0,0,100,0),
47+
(@PATH,40,-3135.3235,-1368.5166,6.2125444,NULL,0,0,0,100,0),
48+
(@PATH,41,-3156.5852,-1393.152,6.2125444,NULL,0,0,0,100,0),
49+
(@PATH,42,-3176.052,-1410.8157,6.2125344,NULL,0,0,0,100,0),
50+
(@PATH,43,-3184.6921,-1435.9547,6.2125344,NULL,0,0,0,100,0),
51+
(@PATH,44,-3201.1177,-1461.5942,6.2125344,NULL,0,0,0,100,0),
52+
(@PATH,45,-3184.6921,-1435.9547,6.2125344,NULL,0,0,0,100,0),
53+
(@PATH,46,-3176.052,-1410.8157,6.2125344,NULL,0,0,0,100,0),
54+
(@PATH,47,-3156.5852,-1393.152,6.2125444,NULL,0,0,0,100,0),
55+
(@PATH,48,-3135.3235,-1368.5166,6.2125444,NULL,0,0,0,100,0),
56+
(@PATH,49,-3129.7153,-1336.1788,6.2125444,NULL,0,0,0,100,0),
57+
(@PATH,50,-3140.0647,-1310.3094,6.2125597,NULL,0,0,0,100,0),
58+
(@PATH,51,-3127.4268,-1279.7166,6.2125597,NULL,0,0,0,100,0),
59+
(@PATH,52,-3110.9539,-1251.6007,5.657193,NULL,0,0,0,100,0),
60+
(@PATH,53,-3084.6208,-1262.775,6.2125497,NULL,0,0,0,100,0),
61+
(@PATH,54,-3058.1658,-1243.8303,6.385656,NULL,0,0,0,100,0),
62+
(@PATH,55,-3033.5713,-1223.1588,3.6263075,NULL,0,0,0,100,0),
63+
(@PATH,56,-3008.991,-1189.4165,6.3375306,NULL,0,0,0,100,0),
64+
(@PATH,57,-2981.483,-1160.7555,6.2125306,NULL,0,0,0,100,0),
65+
(@PATH,58,-2948.263,-1141.3658,6.581269,NULL,0,0,0,100,0),
66+
(@PATH,59,-2924.4268,-1129.007,6.262104,NULL,0,0,0,100,0),
67+
(@PATH,60,-2906.6707,-1130.346,6.3375435,NULL,0,0,0,100,0),
68+
(@PATH,61,-2913.718,-1156.6484,6.380024,NULL,0,0,0,100,0),
69+
(@PATH,62,-2913.8281,-1184.6484,6.2125435,NULL,0,0,0,100,0),
70+
(@PATH,63,-2927.3582,-1214.3258,6.276264,NULL,0,0,0,100,0),
71+
(@PATH,64,-2940.9849,-1235.0204,6.212534,NULL,0,0,0,100,0),
72+
(@PATH,65,-2946.3533,-1262.2607,6.212534,NULL,0,0,0,100,0),
73+
(@PATH,66,-2959.098,-1289.4697,6.212534,NULL,0,0,0,100,0),
74+
(@PATH,67,-2972.429,-1315.0929,6.212561,NULL,0,0,0,100,0),
75+
(@PATH,68,-2976.297,-1355.0217,6.1414337,NULL,0,0,0,100,0),
76+
(@PATH,69,-2982.6704,-1384.7448,6.2125444,NULL,0,0,0,100,0),
77+
(@PATH,70,-2992.2075,-1423.2106,6.2125444,NULL,0,0,0,100,0),
78+
(@PATH,71,-3013.2668,-1444.2893,6.2125444,NULL,0,0,0,100,0),
79+
(@PATH,72,-3037.5547,-1465.8003,6.2125444,NULL,0,0,0,100,0),
80+
(@PATH,73,-3045.1477,-1488.9481,6.1078167,NULL,0,0,0,100,0),
81+
(@PATH,74,-3048.722,-1507.4395,2.3030105,NULL,0,0,0,100,0),
82+
(@PATH,75,-3068.037,-1529.0762,4.6693797,NULL,0,0,0,100,0),
83+
(@PATH,76,-3050.034,-1538.9908,2.2948234,NULL,0,0,0,100,0),
84+
(@PATH,77,-3030.377,-1531.1482,1.8713083,NULL,0,0,0,100,0),
85+
(@PATH,78,-3007.2742,-1519.1643,6.1943064,NULL,0,0,0,100,0),
86+
(@PATH,79,-2979.6265,-1493.0153,6.2125106,NULL,0,0,0,100,0),
87+
(@PATH,80,-2948.1558,-1477.9122,6.2125034,NULL,0,0,0,100,0),
88+
(@PATH,81,-2915.9563,-1455.4119,6.2125106,NULL,0,0,0,100,0),
89+
(@PATH,82,-2888.584,-1418.0055,6.2125034,NULL,0,0,0,100,0),
90+
(@PATH,83,-2868.5942,-1383.6816,6.2125034,NULL,0,0,0,100,0),
91+
(@PATH,84,-2841.5269,-1356.3691,6.2124963,NULL,0,0,0,100,0),
92+
(@PATH,85,-2802.5144,-1327.2316,6.2124987,NULL,0,0,0,100,0),
93+
(@PATH,86,-2779.3325,-1318.1886,6.212498,NULL,0,0,0,100,0);

‎sql/updates/world/3.3.5/2025_07_28_03_world.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--
2+
DELETE FROM `graveyard_zone` WHERE `ID`=512 AND `GhostZone`=148 AND `Faction`=67;
3+
UPDATE `graveyard_zone` SET `Faction`=0 WHERE `ID` IN (35,469) AND `GhostZone`=148;

‎sql/updates/world/3.3.5/2025_07_28_04_world.sql‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
SET @OGUID := 23301; -- Need 19
2+
SET @EVENT := 1;
3+
4+
5+
DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+18;
6+
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
7+
(@OGUID+0, 181389, 429, 2557, 2557, 1, 1, 153.2537384033203125, 437.914764404296875, -38.8631858825683593, 1.500982880592346191, 0, 0, 0.681998252868652343, 0.731353819370269775, 7200, 255, 1, 60895), -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
8+
(@OGUID+1, 181390, 429, 2557, 2557, 1, 1, 177.3212432861328125, 434.51336669921875, -39.2401695251464843, 1.553341388702392578, 0, 0, 0.700908660888671875, 0.713251054286956787, 7200, 255, 1, 60895), -- Hanging, Square, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
9+
(@OGUID+2, 181389, 429, 2557, 2557, 1, 1, 113.9516372680664062, 502.603912353515625, -38.5219001770019531, 0.017452461645007133, 0, 0, 0.008726119995117187, 0.999961912631988525, 7200, 255, 1, 60895), -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
10+
(@OGUID+3, 181355, 429, 2557, 2557, 1, 1, 171.731719970703125, 440.714141845703125, -48.429656982421875, 1.029743075370788574, 0, 0, 0.492423057556152343, 0.870355963706970214, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
11+
(@OGUID+4, 181355, 429, 2557, 2557, 1, 1, 182.4173431396484375, 440.681884765625, -48.4246559143066406, 1.919861555099487304, 0, 0, 0.819151878356933593, 0.573576688766479492, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
12+
(@OGUID+5, 181355, 429, 2557, 2557, 1, 1, 143.5254974365234375, 493.138397216796875, -48.4668006896972656, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
13+
(@OGUID+6, 181388, 429, 2557, 2557, 1, 1, 187.87457275390625, 467.253692626953125, -46.889556884765625, 3.385940074920654296, 0, 0, -0.99254608154296875, 0.121869951486587524, 7200, 255, 1, 60895), -- Standing, Interior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
14+
(@OGUID+7, 181389, 429, 2557, 2557, 1, 1, 145.6558990478515625, 502.2628173828125, -38.3700714111328125, 3.089183330535888671, 0, 0, 0.99965667724609375, 0.026201646775007247, 7200, 255, 1, 60895), -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
15+
(@OGUID+8, 181389, 429, 2557, 2557, 1, 1, 153.587921142578125, 496.0826416015625, -38.3642539978027343, 4.677483558654785156, 0, 0, -0.71933937072753906, 0.694658815860748291, 7200, 255, 1, 60895), -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
16+
(@OGUID+9, 181355, 429, 2557, 2557, 1, 1, 162.6890869140625, 493.332672119140625, -48.4669570922851562, 5.340708732604980468, 0, 0, -0.45398998260498046, 0.891006767749786376, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
17+
(@OGUID+10, 181389, 429, 2557, 2557, 1, 1, 161.3648223876953125, 502.422576904296875, -38.4274177551269531, 6.09120035171508789, 0, 0, -0.09584522247314453, 0.995396256446838378, 7200, 255, 1, 60895), -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
18+
(@OGUID+11, 181389, 429, 2557, 2557, 1, 1, 194.02880859375, 501.5947265625, -38.41595458984375, 3.124123096466064453, 0, 0, 0.99996185302734375, 0.008734640665352344, 7200, 255, 1, 60895), -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
19+
(@OGUID+12, 181389, 429, 2557, 2557, 1, 1, 161.376556396484375, 575.98089599609375, -41.0386161804199218, 6.265733242034912109, 0, 0, -0.00872611999511718, 0.999961912631988525, 7200, 255, 1, 60895), -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
20+
(@OGUID+13, 181355, 429, 2557, 2557, 1, 1, 144.0177001953125, 584.85528564453125, -48.4669570922851562, 2.234017848968505859, 0, 0, 0.898793220520019531, 0.438372820615768432, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
21+
(@OGUID+14, 181355, 429, 2557, 2557, 1, 1, 114.0755233764648437, 618.73907470703125, -27.8204383850097656, 0.314158439636230468, 0, 0, 0.156434059143066406, 0.987688362598419189, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
22+
(@OGUID+15, 181390, 429, 2557, 2557, 1, 1, 107.8776931762695312, 623.35113525390625, -18.4618854522705078, 6.178466320037841796, 0, 0, -0.05233573913574218, 0.998629570007324218, 7200, 255, 1, 60895), -- Hanging, Square, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
23+
(@OGUID+16, 181355, 429, 2557, 2557, 1, 1, 162.9501495361328125, 584.43115234375, -48.4668388366699218, 0.890116631984710693, 0, 0, 0.430510520935058593, 0.902585566043853759, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
24+
(@OGUID+17, 181355, 429, 2557, 2557, 1, 1, 113.7101516723632812, 627.73406982421875, -27.8170928955078125, 6.03883981704711914, 0, 0, -0.12186908721923828, 0.9925462007522583, 7200, 255, 1, 60895), -- Standing, Exterior, Medium - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
25+
(@OGUID+18, 181389, 429, 2557, 2557, 1, 1, 193.965728759765625, 575.89276123046875, -39.0882492065429687, 3.211419343948364257, 0, 0, -0.9993906021118164, 0.034906134009361267, 7200, 255, 1, 60895); -- Hanging, Tall/Thin, Large - MFF (Area: Dire Maul - Difficulty: 1) CreateObject1
26+
27+
DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+18 AND `eventEntry`=@EVENT;
28+
INSERT INTO `game_event_gameobject` SELECT @EVENT, gameobject.guid FROM `gameobject` WHERE gameobject.guid BETWEEN @OGUID+0 AND @OGUID+18;

‎sql/updates/world/3.3.5/2025_08_03_00_world.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- Spirit Healer (Area: The Shadow Vault - Difficulty: 0)
2+
UPDATE `creature` SET `phaseMask`=3, `position_x`=8195.3984375, `position_y`=2862.450439453125, `position_z`=606.07470703125, `orientation`=3.50811171531677246, `spawntimesecs`=120 WHERE `guid`=99683 and `id`=6491;

‎src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ void EscortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false */,
303303

304304
if (_path.nodes.empty())
305305
{
306-
TC_LOG_ERROR("scripts.ai.escortai", "EscortAI::Start: (script: {}) is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn ({})", me->GetScriptName(), me->GetGUID().ToString());
306+
TC_LOG_ERROR("scripts.ai.escortai", "EscortAI::Start: (script: {}) starts with 0 waypoints (possible missing entry in script_waypoint. Quest: {}) ({})", me->GetScriptName(), quest ? quest->GetQuestId() : 0, me->GetGUID());
307307
return;
308308
}
309309

‎src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp‎

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,51 +15,54 @@
1515
* with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
/* ScriptData
19-
SDName: Sunwell_Plateau
20-
SD%Complete: 0
21-
SDComment: Placeholder, Epilogue after Kil'jaeden, Captain Selana Gossips
22-
EndScriptData */
23-
24-
/* ContentData
25-
npc_prophet_velen
26-
npc_captain_selana
27-
EndContentData */
28-
2918
#include "ScriptMgr.h"
30-
#include "ScriptedCreature.h"
19+
#include "Containers.h"
20+
#include "SpellScript.h"
21+
#include "Unit.h"
3122
#include "sunwell_plateau.h"
3223

33-
/*######
34-
## npc_prophet_velen
35-
######*/
36-
37-
enum ProphetSpeeches
24+
enum CataclysmBreath
3825
{
39-
PROPHET_SAY1 = -1580099,
40-
PROPHET_SAY2 = -1580100,
41-
PROPHET_SAY3 = -1580101,
42-
PROPHET_SAY4 = -1580102,
43-
PROPHET_SAY5 = -1580103,
44-
PROPHET_SAY6 = -1580104,
45-
PROPHET_SAY7 = -1580105,
46-
PROPHET_SAY8 = -1580106
26+
SPELL_CORROSIVE_POISON = 46293,
27+
SPELL_FEVERED_FATIGUE = 46294,
28+
SPELL_HEX = 46295,
29+
SPELL_NECROTIC_POISON = 46296,
30+
SPELL_PIERCING_SHADOW = 46297,
31+
SPELL_SHRINK = 46298,
32+
SPELL_WAVERING_WILL = 46299,
33+
SPELL_WITHERED_TOUCH = 46300
4734
};
4835

49-
enum LiadrinnSpeeches
36+
// 46292 - Cataclysm Breath
37+
class spell_sunwell_plateau_cataclysm_breath : public SpellScript
5038
{
51-
LIADRIN_SAY1 = -1580107,
52-
LIADRIN_SAY2 = -1580108,
53-
LIADRIN_SAY3 = -1580109
54-
};
39+
PrepareSpellScript(spell_sunwell_plateau_cataclysm_breath);
40+
41+
static constexpr std::array<uint32, 8> PossibleSpells = { SPELL_CORROSIVE_POISON, SPELL_FEVERED_FATIGUE, SPELL_HEX, SPELL_NECROTIC_POISON, SPELL_PIERCING_SHADOW, SPELL_SHRINK, SPELL_WAVERING_WILL, SPELL_WITHERED_TOUCH };
5542

56-
/*######
57-
## npc_captain_selana
58-
######*/
43+
bool Validate(SpellInfo const* /*spellInfo*/) override
44+
{
45+
return ValidateSpellInfo(PossibleSpells);
46+
}
5947

60-
#define CS_GOSSIP1 "Give me a situation report, Captain."
61-
#define CS_GOSSIP2 "What went wrong?"
62-
#define CS_GOSSIP3 "Why did they stop?"
63-
#define CS_GOSSIP4 "Your insight is appreciated."
48+
void HandleDummy(SpellEffIndex /*effIndex*/)
49+
{
50+
Unit* caster = GetCaster();
51+
std::array<uint32, 8> spellsToCast = PossibleSpells;
6452

65-
void AddSC_sunwell_plateau() { }
53+
Trinity::Containers::RandomShuffle(spellsToCast);
54+
55+
for (uint32 i = 0; i < 4; ++i)
56+
caster->CastSpell(caster, spellsToCast[i]);
57+
}
58+
59+
void Register() override
60+
{
61+
OnEffectHitTarget += SpellEffectFn(spell_sunwell_plateau_cataclysm_breath::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
62+
}
63+
};
64+
65+
void AddSC_sunwell_plateau()
66+
{
67+
RegisterSpellScript(spell_sunwell_plateau_cataclysm_breath);
68+
}

0 commit comments

Comments
 (0)