Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

Author: Rochet2

sql/updates/world/3.3.5/2025_06_10_00_world.sql

@@ -0,0 +1,17 @@
+-- Kalec
+UPDATE `creature_template` SET `unit_flags` = 0 WHERE `entry` = 24844;
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 24848;
+UPDATE `waypoint_data` SET `orientation` = NULL WHERE `id` = 248440 AND `point` = 8;
+UPDATE `waypoint_data` SET `move_type` = 1 WHERE `id` = 248440;
+
+-- Vexallus
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_vexallus_clear_energy_feedback',
+'spell_vexallus_energy_feedback');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(47108, 'spell_vexallus_clear_energy_feedback'),
+(44328, 'spell_vexallus_energy_feedback');
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 24744 AND `GroupID` = 5;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(24744,5,0,"Vexallus overloads!",41,0,100,0,0,0,23781,0,"vexallus EMOTE_OVERLOAD");

sql/updates/world/3.3.5/2025_06_10_01_world.sql

@@ -0,0 +1,3 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 185522 AND `source_type` = 1 AND `id` = 1;
+UPDATE `smart_scripts` SET `link` = 0 WHERE `entryorguid` = 185522 AND `source_type` = 1 AND `id` = 0;

sql/updates/world/3.3.5/2025_06_10_02_world.sql

@@ -0,0 +1,48 @@
+-- Stratholme: Move Timmy the Cruel to database
+SET @TIMMY=10808;
+SET @CGUID=39690;
+SET @SGROUP=327;
+
+DELETE FROM `creature` WHERE `guid`=@CGUID AND `id`=@TIMMY;
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `StringId`, `VerifiedBuild`) VALUES
+(@CGUID, @TIMMY, 329, 2017, 0, 1, 1, 0, 0, 3625.3583984375, -3188.1083984375, 130.3984832763671875, 4.834561824798583984, 604800, 0, 0, 22968, 0, 2, 0, 0, 0, '', NULL, 11159); -- Timmy the Cruel (Area: 0 - Difficulty: 0) CreateObject2 (possible waypoints or random movement)
+
+DELETE FROM `spawn_group_template` WHERE `groupId`=@SGROUP;
+INSERT INTO `spawn_group_template` (`groupId`, `groupName`, `groupFlags`) VALUES
+(@SGROUP, 'Stratholme - Timmy the Cruel', 4);
+
+DELETE FROM `spawn_group` WHERE `groupId`=@SGROUP;
+INSERT INTO `spawn_group` (`groupId`, `spawnType`, `spawnId`) VALUES
+(@SGROUP, 0, @CGUID);
+
+-- Thanks @Rushor for wp
+SET @PATH=@TIMMY * 10;
+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, 3625.36, -3188.11, 130.398, NULL, 0, 0, 0, 100, 0),
+(@PATH, 2, 3637.91, -3196.12, 128.729, NULL, 0, 0, 0, 100, 0),
+(@PATH, 3, 3653.79, -3202.95, 127.506, NULL, 0, 0, 0, 100, 0),
+(@PATH, 4, 3674.53, -3204.6, 126.548, NULL, 0, 0, 0, 100, 0),
+(@PATH, 5, 3689.46, -3191.14, 127.1, NULL, 0, 0, 0, 100, 0),
+(@PATH, 6, 3657.53, -3188.62, 126.672, NULL, 0, 0, 0, 100, 0),
+(@PATH, 7, 3655.75, -3177.17, 126.752, NULL, 0, 0, 0, 100, 0),
+(@PATH, 8, 3672.97, -3171.48, 126.442, NULL, 0, 0, 0, 100, 0),
+(@PATH, 9, 3680.46, -3162.15, 126.653, NULL, 0, 0, 0, 100, 0),
+(@PATH, 10, 3689.46, -3191.14, 127.1, NULL, 0, 0, 0, 100, 0),
+(@PATH, 11, 3674.53, -3204.6, 126.548, NULL, 0, 0, 0, 100, 0),
+(@PATH, 12, 3673.84, -3194.01, 126.247, NULL, 0, 0, 0, 100, 0),
+(@PATH, 13, 3668.11, -3185.75, 126.224, NULL, 0, 0, 0, 100, 0),
+(@PATH, 14, 3651.18, -3196.81, 127.28, NULL, 0, 0, 0, 100, 0),
+(@PATH, 15, 3658.59, -3188.92, 126.64, NULL, 0, 0, 0, 100, 0),
+(@PATH, 16, 3668.11, -3185.75, 126.224, NULL, 0, 0, 0, 100, 0),
+(@PATH, 17, 3678.24, -3171.01, 126.461, NULL, 0, 0, 0, 100, 0),
+(@PATH, 18, 3653.57, -3174.7, 127.125, NULL, 0, 0, 0, 100, 0),
+(@PATH, 19, 3645.68, -3185.68, 127.561, NULL, 0, 0, 0, 100, 0),
+(@PATH, 20, 3634.09, -3178.54, 128.862, NULL, 0, 0, 0, 100, 0),
+(@PATH, 21, 3623.95, -3180.23, 130.456, NULL, 0, 0, 0, 100, 0);
+
+UPDATE `creature_template_addon` SET `SheathState`=1 WHERE `entry`=@TIMMY; -- 10808 (Timmy the Cruel)
+
+DELETE FROM `creature_addon` WHERE `guid`=@CGUID;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `MountCreatureID`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvPFlags`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(@CGUID, @PATH, 0, 0, 0, 0, 0, 1, 0, 0, 3, NULL);

sql/updates/world/3.3.5/2025_06_10_03_world.sql

@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 17306 AND `GroupID` = 5;

sql/updates/world/3.3.5/2025_06_10_04_world.sql

@@ -0,0 +1,12 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` IN (17377,17653);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17377,0,0,"Who dares interrupt--What is this; what have you done? You'll ruin everything!",14,0,100,0,0,10164,15130,0,"kelidan SAY_WAKE"),
+(17377,1,0,"Closer! Come closer... and burn!",14,0,100,0,0,10165,15132,0,"kelidan SAY_NOVA"),
+(17377,2,0,"Just as you deserve!",14,0,100,0,0,10169,17670,0,"kelidan SAY_SLAY_1"),
+(17377,2,1,"Your friends will soon be joining you!",14,0,100,0,0,10170,17671,0,"kelidan SAY_SLAY_2"),
+(17377,3,0,"Good...luck. You'll need it.",14,0,100,0,0,10171,17672,0,"kelidan SAY_DEATH"),
+
+(17653,0,0,"You mustn't let him loose!",14,0,100,0,0,10166,17673,0,"Shadowmoon Channeler SAY_AGGRO_1"),
+(17653,0,1,"Ignorant whelps!",14,0,100,0,0,10167,17674,0,"Shadowmoon Channeler SAY_AGGRO_2"),
+(17653,0,2,"You fools! He'll kill us all!",14,0,100,0,0,10168,17675,0,"Shadowmoon Channeler SAY_AGGRO_3");

sql/updates/world/3.3.5/2025_06_10_05_world.sql

@@ -0,0 +1,33 @@
+--
+DELETE FROM `spell_scripts` WHERE `id` IN (55770,36153);
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_gen_cast_caster_to_target';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(55770, 'spell_gen_cast_caster_to_target'),
+(36153, 'spell_gen_cast_caster_to_target');
+
+DELETE FROM `spell_scripts` WHERE `id` IN (44876,48724,48726,48728,48730,54640);
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_gen_cast_target_to_target';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(44876, 'spell_gen_cast_target_to_target'),
+(48724, 'spell_gen_cast_target_to_target'),
+(48726, 'spell_gen_cast_target_to_target'),
+(48728, 'spell_gen_cast_target_to_target'),
+(48730, 'spell_gen_cast_target_to_target'),
+(54640, 'spell_gen_cast_target_to_target');
+UPDATE `smart_scripts` SET `action_type` = 11, `action_param2` = 2 WHERE `entryorguid` IN (27234,27235,27236,27237) AND `id` = 1;
+UPDATE `conditions` SET `ConditionTypeOrReference`=32,`ConditionValue1`=144,`ConditionValue2`=0 WHERE `SourceEntry` IN (48724,48726,48728,48730) AND `SourceTypeOrReferenceId` = 13;
+
+DELETE FROM `spell_scripts` WHERE `id` IN (28698);
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_gen_dreaming_glory';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(28698, 'spell_gen_dreaming_glory');
+
+DELETE FROM `spell_scripts` WHERE `id` = 55048;
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_storm_peaks_free_brunnhildar_prisoner';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(55048, 'spell_storm_peaks_free_brunnhildar_prisoner');
+
+DELETE FROM `spell_scripts` WHERE `id` = 32580;
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_bem_wicked_strong_fetish';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(32580, 'spell_bem_wicked_strong_fetish');

sql/updates/world/3.3.5/2025_06_10_06_world.sql

@@ -0,0 +1,19 @@
+--
+DELETE FROM `spell_script_names` WHERE
+(`spell_id` = 33525 AND `ScriptName` = "spell_gruul_ground_slam") OR
+(`spell_id` = 33965 AND `ScriptName` = "spell_gruul_look_around") OR
+(`spell_id` = 33812 AND `ScriptName` = "spell_gruul_hurtful_strike_primer");
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(33525,"spell_gruul_ground_slam"),
+(33965,"spell_gruul_look_around"),
+(33812,"spell_gruul_hurtful_strike_primer");
+
+UPDATE `creature_text` SET `Text` = "%s roars!", `Type` = 16, `Sound` = 0, `BroadcastTextId` = 14029, `comment` = "gruul EMOTE_ROAR" WHERE `CreatureID` = 19044 AND `GroupID` = 4 AND `ID` = 0;
+UPDATE `creature_text` SET `TextRange` = 3 WHERE `CreatureID` = 19044;
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 19198;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 19198 AND `source_type` = 0;
+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
+(19198,0,0,0,60,0,100,1,0,0,0,0,0,11,33496,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Invisible Tractor Beam Source - On Update - Cast 'Tractor Beam Creator' (No Repeat)"),
+(19198,0,1,0,60,0,100,1,500,500,0,0,0,11,33497,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Invisible Tractor Beam Source - On Update - Cast 'Tractor Beam' (No Repeat)"),
+(19198,0,2,0,60,0,100,1,1000,1000,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Invisible Tractor Beam Source - On Update - Despawn Instant (No Repeat)");

src/server/game/World/World.cpp

@@ -1431,6 +1431,18 @@ void World::LoadConfigSettings(bool reload)
     TC_LOG_INFO("server.loading", "VMap data directory is: {}vmaps", m_dataPath);
 
     m_int_configs[CONFIG_MAX_WHO] = sConfigMgr->GetIntDefault("MaxWhoListReturns", 49);
+    m_int_configs[CONFIG_WHO_LIST_UPDATE_INTERVAL] = sConfigMgr->GetIntDefault("WhoList.Update.Interval", 5);
+    if (int32(m_int_configs[CONFIG_WHO_LIST_UPDATE_INTERVAL]) <= 0)
+    {
+        TC_LOG_ERROR("server.loading", "WhoList.Update.Interval ({}) must be > 0, set to default 5 seconds.", m_int_configs[CONFIG_WHO_LIST_UPDATE_INTERVAL]);
+        m_int_configs[CONFIG_WHO_LIST_UPDATE_INTERVAL] = 5;
+    }
+    if (reload)
+    {
+        m_timers[WUPDATE_WHO_LIST].SetInterval(m_int_configs[CONFIG_WHO_LIST_UPDATE_INTERVAL] * IN_MILLISECONDS);
+        m_timers[WUPDATE_WHO_LIST].Reset();
+    }
+
     m_bool_configs[CONFIG_START_ALL_SPELLS] = sConfigMgr->GetBoolDefault("PlayerStart.AllSpells", false);
     m_int_configs[CONFIG_HONOR_AFTER_DUEL] = sConfigMgr->GetIntDefault("HonorPointsAfterDuel", 0);
     m_bool_configs[CONFIG_RESET_DUEL_COOLDOWNS] = sConfigMgr->GetBoolDefault("ResetDuelCooldowns", false);
@@ -2176,7 +2188,7 @@ void World::SetInitialWorldSettings()
 
     m_timers[WUPDATE_CHECK_FILECHANGES].SetInterval(500);
 
-    m_timers[WUPDATE_WHO_LIST].SetInterval(5 * IN_MILLISECONDS); // update who list cache every 5 seconds
+    m_timers[WUPDATE_WHO_LIST].SetInterval(getIntConfig(CONFIG_WHO_LIST_UPDATE_INTERVAL) * IN_MILLISECONDS); // update who list cache every 5 seconds
 
     m_timers[WUPDATE_CHANNEL_SAVE].SetInterval(getIntConfig(CONFIG_PRESERVE_CUSTOM_CHANNEL_INTERVAL) * MINUTE * IN_MILLISECONDS);
 

src/server/game/World/World.h

@@ -327,6 +327,7 @@ enum WorldIntConfigs : uint32
     CONFIG_ARENA_START_PERSONAL_RATING,
     CONFIG_ARENA_START_MATCHMAKER_RATING,
     CONFIG_MAX_WHO,
+    CONFIG_WHO_LIST_UPDATE_INTERVAL,
     CONFIG_HONOR_AFTER_DUEL,
     CONFIG_PVP_TOKEN_MAP_TYPE,
     CONFIG_PVP_TOKEN_ID,

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -27,7 +27,7 @@
 #include "SpellInfo.h"
 #include "TemporarySummon.h"
 
-enum Says
+enum KaelthasTexts
 {
     // Kael'thas Sunstrider
     SAY_INTRO_1                 = 0,
@@ -41,7 +41,7 @@ enum Says
     SAY_DEATH                   = 8
 };
 
-enum Spells
+enum KaelthasSpells
 {
     // Kael'thas Sunstrider
     SPELL_FIREBALL                              = 44189,
@@ -89,7 +89,7 @@ uint32 gravityLapseTeleportSpells[] =
 
 #define SPELL_GRAVITY_LAPSE_DAMAGE  RAID_MODE<uint32>(49887, 44226)
 
-enum Events
+enum KaelthasEvents
 {
     // Kael'thas Sunstrider
     EVENT_TALK_INTRO_1 = 1,
@@ -120,14 +120,15 @@ enum Events
     EVENT_PREPARE_REENGAGE
 };
 
-enum Phases
+enum KaelthasPhases
 {
     PHASE_INTRO = 0,
     PHASE_ONE   = 1,
     PHASE_TWO   = 2,
     PHASE_OUTRO = 3
 };
 
+// 24664 - Kael'thas Sunstrider
 struct boss_felblood_kaelthas : public BossAI
 {
     boss_felblood_kaelthas(Creature* creature) : BossAI(creature, DATA_KAELTHAS_SUNSTRIDER)
@@ -380,6 +381,7 @@ struct boss_felblood_kaelthas : public BossAI
     bool _firstGravityLapse;
 };
 
+// 24674 - Phoenix
 struct npc_felblood_kaelthas_phoenix : public ScriptedAI
 {
     npc_felblood_kaelthas_phoenix(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript())