Merge 3.3.5-base_patch to 3.3.5-racial-trait

Author: Github Actions

sql/updates/world/3.3.5/2025_09_22_00_world.sql

@@ -0,0 +1,44 @@
+-- Intro
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4853;
+INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES
+(4853, 'at_the_dead_scar');
+
+DELETE FROM `spawn_group` WHERE `spawnType` = 0 AND `spawnId` IN (SELECT `guid` FROM `creature` WHERE `id` = 24895);
+DELETE FROM `creature` WHERE `id` = 24895;
+
+UPDATE `creature_template_movement` SET `Flight` = 1 WHERE `CreatureId` = 24895;
+
+UPDATE `creature_template` SET `ScriptName` = 'npc_madrigosa' WHERE `entry` = 24895;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` IN (46609,46610,44872,44844,44883,44884,46637,46638);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,46609,0,0,31,0,3,19871,0,0,0,0,"","Group 0: Spell 'Freeze' (Effect 0) targets creature 'World Trigger (Not Immune NPC)'"),
+(13,1,46610,0,0,31,0,5,188119,0,0,0,0,"","Group 0: Spell 'Freeze' (Effect 0) targets object 'Doodad_Sunwell_Ice_Barrier01'"),
+(13,1,44872,0,0,31,0,3,24882,0,0,0,0,"","Group 0: Spell 'Frost Blast' (Effect 0) targets creature 'Brutallus'"),
+(13,3,44844,0,0,31,0,3,24895,0,0,0,0,"","Group 0: Spell 'Fel Fireball' (Effect 0, 1) targets creature 'Madrigosa'"),
+(13,1,44883,0,0,31,0,3,24882,0,0,0,0,"","Group 0: Spell 'Encapsulate' (Effect 0) targets creature 'Brutallus'"),
+(13,1,44884,0,0,31,0,3,24895,0,0,0,0,"","Group 0: Spell 'Charge' (Effect 0) targets creature 'Madrigosa'"),
+(13,1,46637,0,0,31,0,3,19871,0,0,0,0,"","Group 0: Spell 'Break Ice' (Effect 0) targets creature 'World Trigger (Not Immune NPC)'"),
+(13,1,46638,0,0,31,0,5,188119,0,0,0,0,"","Group 0: Spell 'Break Ice' (Effect 0) targets object 'Doodad_Sunwell_Ice_Barrier01'");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_brutallus_freeze',
+'spell_brutallus_break_ice',
+'spell_brutallus_burn_primer',
+'spell_brutallus_burn_ally');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(46609, 'spell_brutallus_freeze'),
+(46637, 'spell_brutallus_break_ice'),
+(45141, 'spell_brutallus_burn_primer'),
+(45151, 'spell_brutallus_burn_ally');
+
+UPDATE `creature_text` SET `Emote` = 1 WHERE `CreatureID` = 24882 AND `GroupID` = 0;
+UPDATE `creature_text` SET `BroadcastTextId` = 25224 WHERE `CreatureID` = 24882 AND `GroupID` = 2;
+UPDATE `creature_text` SET `Text` = "That was fun, but I still await a true challenge!", `Language` = 0, `BroadcastTextId` = 25225 WHERE `CreatureID` = 24882 AND `GroupID` = 3;
+
+-- Outro
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `flags_extra` = `flags_extra` |128 WHERE `entry` = 25703;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 25703 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
+(25703,0,0,0,60,0,100,1,7000,7000,0,0,0,11,45212,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Brutallus Death Cloud - On Update - Cast 'Brutallus Death Cloud' (No Repeat)");

sql/updates/world/3.3.5/2025_09_25_00_world.sql

@@ -0,0 +1,5 @@
+-- Add Utgarde GY for Howling Fjord Area for both factions
+DELETE FROM `graveyard_zone` WHERE `ID` IN (1337,1376) AND `GhostZone`=495;
+INSERT INTO `graveyard_zone` (`ID`, `GhostZone`, `Faction`, `Comment`) VALUES
+(1337, 495, 0, "Howling Fjord, Utgarde GY - Howling Fjord"),
+(1376, 495, 0, "Howling Fjord, Utgarde 2 GY - Howling Fjord");

sql/updates/world/3.3.5/2025_09_25_01_world.sql

@@ -0,0 +1,4 @@
+-- Update Lady Hoteshem Equipment, SheathState and level.
+UPDATE `creature_equip_template` SET `ItemID1`=19981, `VerifiedBuild`=0 WHERE `CreatureID`=15008 AND `ID`=1;
+UPDATE `creature_template_addon` SET `SheathState`=0 WHERE `entry`=15008;
+UPDATE `creature_template` SET `minlevel`=61, `maxlevel`=61 WHERE `entry`=15008;

sql/updates/world/3.3.5/2025_09_27_00_world.sql

@@ -0,0 +1,5 @@
+--
+DELETE FROM `pool_members` WHERE `type`=1 AND `spawnId` IN (163412,163812,164212);
+DELETE FROM `pool_members` WHERE `type`=2 AND `spawnId`=11612;
+DELETE FROM `spawn_group` WHERE `spawnType`=1 AND `spawnId` IN (163412,163812,164212);
+DELETE FROM `gameobject` WHERE `guid` IN (163412,163812,164212);

sql/updates/world/3.3.5/2025_09_27_01_world.sql

@@ -0,0 +1,2 @@
+-- Spirit Healer (Area: Howling Fjord - Difficulty: 0)
+UPDATE `creature` SET `position_x`=1347.5555419921875, `position_y`=-4786.142578125, `position_z`=188.2603302001953125, `orientation`=3.054326057434082031 WHERE `guid`=125652 and `id`=6491;

sql/updates/world/3.3.5/2025_09_27_02_world.sql

@@ -0,0 +1,10 @@
+-- Add proper conditions for Jesse Masters <Butcher>
+UPDATE `gossip_menu` SET `VerifiedBuild`=63305 WHERE `MenuID`=9798 AND `TextID`=13503;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15,23) AND `SourceGroup` IN (9798,29244) AND `SourceEntry` IN (0,13502,13503,33454,40202);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14, 9798, 13502, 0, 0, 47, 0, 12212, 64, 0, 1, 0, 0, '', "Show gossip menu if player does not have quest 'Replenishing the Storehouse' rewarded"),
+(14, 9798, 13503, 0, 0, 47, 0, 12212, 64, 0, 0, 0, 0, '', "Show gossip menu if player has quest 'Replenishing the Storehouse' rewarded"),
+(15, 9798, 0, 0, 0, 47, 0, 12212, 64, 0, 0, 0, 0, '', "Show gossip menu if player has quest 'Replenishing the Storehouse' rewarded"),
+(23, 29244, 33454, 0, 0, 47, 0, 12212, 64, 0, 0, 0, 0, '', "Sell Salted Venison if player has quest 'Replenishing the Storehouse' rewarded"),
+(23, 29244, 40202, 0, 0, 47, 0, 12216, 64, 0, 0, 0, 0, '', "Sell Sizzling Grizzly Flank if player has quest 'Take Their Rear!' rewarded");

sql/updates/world/3.3.5/2025_09_27_03_world.sql

@@ -0,0 +1,2 @@
+-- Spirit Healer (Area: Grizzly Hills - Difficulty: 0)
+UPDATE `creature` SET `position_x`=3529.45068359375, `position_y`=-2892.474853515625, `position_z`=204.703369140625, `orientation`=1.256637096405029296 WHERE `guid`=125676 and `id`=6491;

src/common/Cryptography/Authentication/AuthCrypt.cpp renamed to src/common/Cryptography/Authentication/WorldPacketCrypt.cpp

@@ -15,18 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AuthCrypt.h"
-#include "BigNumber.h"
+#include "WorldPacketCrypt.h"
 #include "Errors.h"
 #include "HMAC.h"
 
-#include <cstring>
-
-AuthCrypt::AuthCrypt() :
-    _initialized(false)
-{ }
+WorldPacketCrypt::WorldPacketCrypt() : _initialized(false)
+{
+}
 
-void AuthCrypt::Init(SessionKey const& K)
+void WorldPacketCrypt::Init(SessionKey const& K)
 {
     uint8 ServerEncryptionKey[] = { 0xCC, 0x98, 0xAE, 0x04, 0xE8, 0x97, 0xEA, 0xCA, 0x12, 0xDD, 0xC0, 0x93, 0x42, 0x91, 0x53, 0x57 };
     _serverEncrypt.Init(Trinity::Crypto::HMAC_SHA1::GetDigestOf(ServerEncryptionKey, K));
@@ -41,13 +38,13 @@ void AuthCrypt::Init(SessionKey const& K)
     _initialized = true;
 }
 
-void AuthCrypt::DecryptRecv(uint8 *data, size_t len)
+void WorldPacketCrypt::DecryptRecv(uint8 *data, size_t len)
 {
     ASSERT(_initialized);
     _clientDecrypt.UpdateData(data, len);
 }
 
-void AuthCrypt::EncryptSend(uint8 *data, size_t len)
+void WorldPacketCrypt::EncryptSend(uint8 *data, size_t len)
 {
     ASSERT(_initialized);
     _serverEncrypt.UpdateData(data, len);

src/common/Cryptography/Authentication/AuthCrypt.h renamed to src/common/Cryptography/Authentication/WorldPacketCrypt.h

@@ -15,27 +15,27 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _AUTHCRYPT_H
-#define _AUTHCRYPT_H
+#ifndef _WORLDPACKETCRYPT_H
+#define _WORLDPACKETCRYPT_H
 
 #include "ARC4.h"
 #include "AuthDefines.h"
-#include <array>
 
-class TC_COMMON_API AuthCrypt
+class TC_COMMON_API WorldPacketCrypt
 {
-    public:
-        AuthCrypt();
+public:
+    WorldPacketCrypt();
 
-        void Init(SessionKey const& K);
-        void DecryptRecv(uint8* data, size_t len);
-        void EncryptSend(uint8* data, size_t len);
+    void Init(SessionKey const& K);
+    void DecryptRecv(uint8* data, size_t len);
+    void EncryptSend(uint8* data, size_t len);
 
-        bool IsInitialized() const { return _initialized; }
+    bool IsInitialized() const { return _initialized; }
 
-    private:
-        Trinity::Crypto::ARC4 _clientDecrypt;
-        Trinity::Crypto::ARC4 _serverEncrypt;
-        bool _initialized;
+private:
+    Trinity::Crypto::ARC4 _clientDecrypt;
+    Trinity::Crypto::ARC4 _serverEncrypt;
+    bool _initialized;
 };
-#endif
+
+#endif // _WORLDPACKETCRYPT_H

src/common/DataStores/DBCFileLoader.cpp

@@ -88,7 +88,7 @@ bool DBCFileLoader::Load(char const* filename, char const* fmt)
     for (uint32 i = 1; i < fieldCount; ++i)
     {
         fieldsOffset[i] = fieldsOffset[i - 1];
-        if (fmt[i - 1] == 'b' || fmt[i - 1] == 'X')         // byte fields
+        if (fmt[i - 1] == FT_BYTE || fmt[i - 1] == FT_NA_BYTE)  // byte fields
             fieldsOffset[i] += sizeof(uint8);
         else                                                // 4 byte fields (int32/float/strings)
             fieldsOffset[i] += sizeof(uint32);