Merge 3.3.5 to 3.3.5-skip-dk

Author: Github Actions

sql/updates/world/3.3.5/2025_07_05_00_world.sql

@@ -0,0 +1,36 @@
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 27958;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 27958 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
+(27958,0,0,0,11,0,100,0,0,0,0,0,0,11,50186,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Parading Pink Elekk - On Spawn - Cast 'Parading Pink Elekk Life Aura'"),
+(27958,0,1,0,60,0,100,1,0,5000,0,0,0,11,36440,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Parading Pink Elekk - On Update - Cast 'Drunk Invisibility (Pink)' (No Repeat)"),
+(27958,0,2,0,11,0,100,0,0,0,0,0,0,29,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Parading Pink Elekk - On Spawn - Start Follow Owner");
+
+DELETE FROM `spell_script_names` WHERE `spell_id` = 50186 AND `ScriptName` = 'spell_gen_despawn_aura';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(50186,'spell_gen_despawn_aura');
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_brewfest_botm_pink_elekk';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(42264,'spell_brewfest_botm_pink_elekk');
+
+-- This one is based only on comments
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 27867;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 27867 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 2786700 AND 2786701 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
+(27867,0,0,0,11,0,100,0,0,0,0,0,0,87,2786700,2786701,0,0,0,0,1,0,0,0,0,0,0,0,0,"Woodland Squirrel - On Spawn - Run Random Script"),
+
+(2786700,9,0,0,0,0,100,0,0,0,0,0,0,11,49757,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Woodland Squirrel - On Script - Cast 'BOTM - Woodland Brew - Squirrel Love Aura'"),
+(2786700,9,1,0,0,0,100,0,0,0,0,0,0,29,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Woodland Squirrel - On Script - Start Follow Owner"),
+(2786700,9,2,0,0,0,100,0,10000,10000,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Woodland Squirrel - On Script - Despawn"),
+
+(2786701,9,0,0,0,0,100,0,2000,2000,0,0,0,11,49764,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Woodland Squirrel - On Script - Cast 'BOTM - Woodland Brew - Squirrel Hate'"),
+(2786701,9,1,0,0,0,100,0,0,0,0,0,0,114,0,0,0,0,0,0,1,0,0,0,0,30,30,0,0,"Woodland Squirrel - On Script - Move Offset"),
+(2786701,9,2,0,0,0,100,0,5000,5000,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Woodland Squirrel - On Script - Despawn");
+
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_brewfest_botm_nauseous';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(49869,'spell_brewfest_botm_nauseous');

src/server/authserver/Server/AuthSession.cpp

@@ -517,39 +517,39 @@ bool AuthSession::HandleLogonProof()
         stmt->setString(3, _os);
         stmt->setInt16(4, _timezoneOffset.count());
         stmt->setString(5, _accountInfo.Login);
-        LoginDatabase.DirectExecute(stmt);
-
-        // Finish SRP6 and send the final result to the client
-        Trinity::Crypto::SHA1::Digest M2 = Trinity::Crypto::SRP6::GetSessionVerifier(logonProof->A, logonProof->clientM, _sessionKey);
-
-        ByteBuffer packet;
-        if (_expversion & POST_BC_EXP_FLAG)                 // 2.x and 3.x clients
+        _queryProcessor.AddCallback(LoginDatabase.AsyncQuery(stmt)
+            .WithPreparedCallback([this, M2 = Trinity::Crypto::SRP6::GetSessionVerifier(logonProof->A, logonProof->clientM, _sessionKey)](PreparedQueryResult const&)
         {
-            sAuthLogonProof_S proof;
-            proof.M2 = M2;
-            proof.cmd = AUTH_LOGON_PROOF;
-            proof.error = 0;
-            proof.AccountFlags = 0x00800000;    // 0x01 = GM, 0x08 = Trial, 0x00800000 = Pro pass (arena tournament)
-            proof.SurveyId = 0;
-            proof.LoginFlags = 0;               // 0x1 = has account message
-
-            packet.resize(sizeof(proof));
-            std::memcpy(packet.contents(), &proof, sizeof(proof));
-        }
-        else
-        {
-            sAuthLogonProof_S_Old proof;
-            proof.M2 = M2;
-            proof.cmd = AUTH_LOGON_PROOF;
-            proof.error = 0;
-            proof.unk2 = 0x00;
-
-            packet.resize(sizeof(proof));
-            std::memcpy(packet.contents(), &proof, sizeof(proof));
-        }
+            // Finish SRP6 and send the final result to the client
+            ByteBuffer packet;
+            if (_expversion & POST_BC_EXP_FLAG)                 // 2.x and 3.x clients
+            {
+                sAuthLogonProof_S proof;
+                proof.M2 = M2;
+                proof.cmd = AUTH_LOGON_PROOF;
+                proof.error = 0;
+                proof.AccountFlags = 0x00800000;    // 0x01 = GM, 0x08 = Trial, 0x00800000 = Pro pass (arena tournament)
+                proof.SurveyId = 0;
+                proof.LoginFlags = 0;               // 0x1 = has account message
+
+                packet.resize(sizeof(proof));
+                std::memcpy(packet.contents(), &proof, sizeof(proof));
+            }
+            else
+            {
+                sAuthLogonProof_S_Old proof;
+                proof.M2 = M2;
+                proof.cmd = AUTH_LOGON_PROOF;
+                proof.error = 0;
+                proof.unk2 = 0x00;
+
+                packet.resize(sizeof(proof));
+                std::memcpy(packet.contents(), &proof, sizeof(proof));
+            }
 
-        SendPacket(packet);
-        _status = STATUS_AUTHED;
+            SendPacket(packet);
+            _status = STATUS_AUTHED;
+        }));
     }
     else
     {

src/server/database/Database/Implementation/LoginDatabase.cpp

@@ -36,7 +36,7 @@ void LoginDatabaseConnection::DoPrepareStatements()
     PrepareStatement(LOGIN_INS_ACCOUNT_AUTO_BANNED, "INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active) VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, 'Trinity Auth', 'Failed login autoban', 1)", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_DEL_ACCOUNT_BANNED, "DELETE FROM account_banned WHERE id = ?", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_UPD_LOGON, "UPDATE account SET salt = ?, verifier = ? WHERE id = ?", CONNECTION_ASYNC);
-    PrepareStatement(LOGIN_UPD_LOGONPROOF, "UPDATE account SET session_key_auth = ?, last_ip = ?, last_login = NOW(), locale = ?, failed_logins = 0, os = ?, timezone_offset = ? WHERE username = ?", CONNECTION_SYNCH);
+    PrepareStatement(LOGIN_UPD_LOGONPROOF, "UPDATE account SET session_key_auth = ?, last_ip = ?, last_login = NOW(), locale = ?, failed_logins = 0, os = ?, timezone_offset = ? WHERE username = ?", CONNECTION_ASYNC);
     PrepareStatement(LOGIN_SEL_LOGONCHALLENGE, "SELECT a.id, a.username, a.locked, a.lock_country, a.last_ip, a.failed_logins, ab.unbandate > UNIX_TIMESTAMP() OR ab.unbandate = ab.bandate, "
         "ab.unbandate = ab.bandate, aa.SecurityLevel, a.totp_secret, a.salt, a.verifier "
         "FROM account a LEFT JOIN account_access aa ON a.id = aa.AccountID LEFT JOIN account_banned ab ON ab.id = a.id AND ab.active = 1 WHERE a.username = ?", CONNECTION_ASYNC);

src/server/scripts/Events/brewfest.cpp

@@ -432,13 +432,14 @@ class spell_brewfest_mount_transformation : public SpellScript
  July      [Stranglethorn Brew]
     spell_brewfest_botm_jungle_madness
  August    [Draenic Pale Ale]
-    NYI
+    spell_brewfest_botm_pink_elekk
  September [Binary Brew]
     spell_brewfest_botm_teach_language
  October   [Autumnal Acorn Ale]
-    NYI
+    Nothing to script here
  November  [Bartlett's Bitter Brew]
-    NYI
+    spell_brewfest_botm_nauseous
+    Incomplete
  December  [Lord of Frost's Private Label]
     Nothing to script here
 */
@@ -573,6 +574,34 @@ class spell_brewfest_botm_jungle_madness : public SpellScript
     }
 };
 
+enum DraenicPaleAle
+{
+    SPELL_BOTM_PINK_ELEKK    = 49908
+};
+
+// 42264 - Weak Alcohol
+class spell_brewfest_botm_pink_elekk : public SpellScript
+{
+    PrepareSpellScript(spell_brewfest_botm_pink_elekk);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_BOTM_PINK_ELEKK });
+    }
+
+    void HandleAfterCast()
+    {
+        // TODO: Needs additional research, this spell is most likely used if drunk state is high enough.
+        if (roll_chance_i(50))
+            GetCaster()->CastSpell(GetCaster(), SPELL_BOTM_PINK_ELEKK);
+    }
+
+    void Register() override
+    {
+        AfterCast += SpellCastFn(spell_brewfest_botm_pink_elekk::HandleAfterCast);
+    }
+};
+
 enum BinaryBrew
 {
     SPELL_LEARN_GNOMISH_BINARY      = 50242,
@@ -601,6 +630,32 @@ class spell_brewfest_botm_teach_language : public SpellScript
     }
 };
 
+enum BartlettsBitterBrew
+{
+    SPELL_BOTM_VOMIT_BREW_VOMIT_VISUAL    = 49867
+};
+
+// 49869 - Nauseous
+class spell_brewfest_botm_nauseous : public AuraScript
+{
+    PrepareAuraScript(spell_brewfest_botm_nauseous);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_BOTM_VOMIT_BREW_VOMIT_VISUAL });
+    }
+
+    void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        GetTarget()->CastSpell(GetTarget(), SPELL_BOTM_VOMIT_BREW_VOMIT_VISUAL, true);
+    }
+
+    void Register() override
+    {
+        AfterEffectRemove += AuraEffectRemoveFn(spell_brewfest_botm_nauseous::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+    }
+};
+
 enum CreateEmptyBrewBottle
 {
     SPELL_BOTM_CREATE_EMPTY_BREW_BOTTLE    = 51655
@@ -706,7 +761,9 @@ void AddSC_event_brewfest()
     RegisterSpellScript(spell_brewfest_botm_bloated);
     RegisterSpellScript(spell_brewfest_botm_internal_combustion);
     RegisterSpellScript(spell_brewfest_botm_jungle_madness);
+    RegisterSpellScript(spell_brewfest_botm_pink_elekk);
     RegisterSpellScript(spell_brewfest_botm_teach_language);
+    RegisterSpellScript(spell_brewfest_botm_nauseous);
     RegisterSpellScript(spell_brewfest_botm_weak_alcohol);
     RegisterSpellScript(spell_brewfest_botm_empty_bottle_throw_resolve);
     RegisterSpellScript(spell_brewfest_mole_machine_portal_schedule);

src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp

@@ -19,45 +19,42 @@
 #include "halls_of_stone.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
+#include "SpellMgr.h"
 #include "SpellScript.h"
 
-enum Spells
+enum KrystallusTexts
 {
-    SPELL_BOULDER_TOSS                          = 50843,
-    SPELL_GROUND_SPIKE                          = 59750,
-    SPELL_GROUND_SLAM                           = 50827,
-    SPELL_SHATTER                               = 50810,
-    SPELL_SHATTER_EFFECT                        = 50811,
-    SPELL_STONED                                = 50812,
-    SPELL_STOMP                                 = 48131
+    SAY_AGGRO                = 0,
+    SAY_SLAY                 = 1,
+    SAY_DEATH                = 2,
+    SAY_SHATTER              = 3
 };
 
-enum Yells
+enum KrystallusSpells
 {
-    SAY_AGGRO                                   = 0,
-    SAY_KILL                                    = 1,
-    SAY_DEATH                                   = 2,
-    SAY_SHATTER                                 = 3
+    SPELL_BOULDER_TOSS       = 50843,
+    SPELL_GROUND_SPIKE       = 59750,
+    SPELL_GROUND_SLAM        = 50827,
+    SPELL_SHATTER            = 50810,
+    SPELL_SHATTER_EFFECT     = 50811,
+    SPELL_STONED             = 50812,
+    SPELL_STOMP              = 48131
 };
 
-enum Events
+enum KrystallusEvents
 {
-    EVENT_BOULDER_TOSS                          = 1,
+    EVENT_BOULDER_TOSS       = 1,
     EVENT_GROUND_SPIKE,
     EVENT_GROUND_SLAM,
     EVENT_STOMP,
     EVENT_SHATTER
 };
 
+// 27977 - Krystallus
 struct boss_krystallus : public BossAI
 {
     boss_krystallus(Creature* creature) : BossAI(creature, DATA_KRYSTALLUS) { }
 
-    void Reset() override
-    {
-        _Reset();
-    }
-
     void JustEngagedWith(Unit* who) override
     {
         Talk(SAY_AGGRO);
@@ -70,9 +67,26 @@ struct boss_krystallus : public BossAI
             events.ScheduleEvent(EVENT_GROUND_SPIKE, 9s, 14s);
     }
 
+    void OnSpellCast(SpellInfo const* spell) override
+    {
+        if (spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_SHATTER, me))
+            Talk(SAY_SHATTER);
+    }
+
+    void KilledUnit(Unit* victim) override
+    {
+        if (victim->GetTypeId() == TYPEID_PLAYER)
+            Talk(SAY_SLAY);
+    }
+
+    void JustDied(Unit* /*killer*/) override
+    {
+        Talk(SAY_DEATH);
+        _JustDied();
+    }
+
     void UpdateAI(uint32 diff) override
     {
-        // Return since we have no target
         if (!UpdateVictim())
             return;
 
@@ -88,24 +102,24 @@ struct boss_krystallus : public BossAI
                 case EVENT_BOULDER_TOSS:
                     if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true))
                         DoCast(target, SPELL_BOULDER_TOSS);
-                    events.ScheduleEvent(EVENT_BOULDER_TOSS, 9s, 15s);
+                    events.Repeat(9s, 15s);
                     break;
                 case EVENT_GROUND_SPIKE:
                     if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
                         DoCast(target, SPELL_GROUND_SPIKE);
-                    events.ScheduleEvent(EVENT_GROUND_SPIKE, 12s, 17s);
+                    events.Repeat(12s, 17s);
                     break;
                 case EVENT_GROUND_SLAM:
-                    DoCast(me, SPELL_GROUND_SLAM);
+                    DoCastSelf(SPELL_GROUND_SLAM);
                     events.ScheduleEvent(EVENT_SHATTER, 10s);
-                    events.ScheduleEvent(EVENT_GROUND_SLAM, 15s, 18s);
+                    events.Repeat(15s, 18s);
                     break;
                 case EVENT_STOMP:
-                    DoCast(me, SPELL_STOMP);
-                    events.ScheduleEvent(EVENT_STOMP, 20s, 29s);
+                    DoCastSelf(SPELL_STOMP);
+                    events.Repeat(20s, 29s);
                     break;
                 case EVENT_SHATTER:
-                    DoCast(me, SPELL_SHATTER);
+                    DoCastSelf(SPELL_SHATTER);
                     break;
                 default:
                     break;
@@ -117,18 +131,6 @@ struct boss_krystallus : public BossAI
 
         DoMeleeAttackIfReady();
     }
-
-    void JustDied(Unit* /*killer*/) override
-    {
-        Talk(SAY_DEATH);
-        _JustDied();
-    }
-
-    void KilledUnit(Unit* victim) override
-    {
-        if (victim->GetTypeId() == TYPEID_PLAYER)
-            Talk(SAY_KILL);
-    }
 };
 
 // 50810, 61546 - Shatter