Merge 3.3.5 to 3.3.5-lfgsolo

Author: Github Actions

sql/updates/world/3.3.5/2025_08_05_00_world.sql

@@ -0,0 +1,11 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_ruins_of_ahnqiraj_itch', 'spell_temple_of_ahnqiraj_itch');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(25185, 'spell_ruins_of_ahnqiraj_itch'),
+(26077, 'spell_temple_of_ahnqiraj_itch');
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 15325;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (15325,15236) 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
+(15325,0,0,0,0,0,100,0,5000,10000,10000,15000,0,11,25185,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Hive'Zara Wasp - In Combat - Cast 'Itch'"),
+(15236,0,0,0,0,0,100,0,5000,10000,10000,15000,0,11,26077,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Vekniss Wasp - In Combat - Cast 'Itch'");

sql/updates/world/3.3.5/2025_08_05_01_world.sql

@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature` SET `spawntimesecs`=300 WHERE `id`=6491 AND `spawntimesecs`=120;

sql/updates/world/3.3.5/2025_08_10_00_world.sql

@@ -0,0 +1,9 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_sartura_whirlwind';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(26084, 'spell_sartura_whirlwind'),
+(26686, 'spell_sartura_whirlwind');
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 15516 AND `GroupID` = 3;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(15516,3,0,"%s goes into a frenzy!",16,0,100,0,0,0,2384,0,"sartura EMOTE_FRENZY");

sql/updates/world/3.3.5/2025_08_10_01_world.sql

@@ -0,0 +1,7 @@
+--
+UPDATE `creature_text` SET `Text` = '%s becomes enraged!', `BroadcastTextId` = 7798, `comment` = 'huhuran EMOTE_ENRAGE' WHERE `CreatureID` = 15509 AND `GroupID` = 0;
+UPDATE `creature_text` SET `BroadcastTextId` = 4428 WHERE `CreatureID` = 15509 AND `GroupID` = 1;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_huhuran_wyvern_sting';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(26180, 'spell_huhuran_wyvern_sting');

src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp

@@ -15,119 +15,119 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "karazhan.h"
 #include "ScriptedCreature.h"
+#include "SpellInfo.h"
 
-enum Spells
-{
-    SPELL_REPENTANCE    = 29511,
-    SPELL_HOLYFIRE      = 29522,
-    SPELL_HOLYWRATH     = 32445,
-    SPELL_HOLYGROUND    = 29523,
-    SPELL_BERSERK       = 26662
-};
-
-enum Yells
+enum MaidenOfVirtueTexts
 {
     SAY_AGGRO           = 0,
     SAY_SLAY            = 1,
     SAY_REPENTANCE      = 2,
     SAY_DEATH           = 3
 };
 
-enum Events
+enum MaidenOfVirtueSpells
+{
+    SPELL_HOLYGROUND    = 29523,
+    SPELL_REPENTANCE    = 29511,
+    SPELL_HOLYFIRE      = 29522,
+    SPELL_HOLYWRATH     = 32445,
+    SPELL_BERSERK       = 26662
+};
+
+enum MaidenOfVirtueEvents
 {
     EVENT_REPENTANCE    = 1,
-    EVENT_HOLYFIRE      = 2,
-    EVENT_HOLYWRATH     = 3,
-    EVENT_ENRAGE        = 4
+    EVENT_HOLYFIRE,
+    EVENT_HOLYWRATH,
+    EVENT_BERSERK
 };
 
-class boss_maiden_of_virtue : public CreatureScript
+// 16457 - Maiden of Virtue
+struct boss_maiden_of_virtue : public BossAI
 {
-public:
-    boss_maiden_of_virtue() : CreatureScript("boss_maiden_of_virtue") { }
+    boss_maiden_of_virtue(Creature* creature) : BossAI(creature, DATA_MAIDEN_OF_VIRTUE) { }
 
-    struct boss_maiden_of_virtueAI : public BossAI
+    void JustEngagedWith(Unit* who) override
     {
-        boss_maiden_of_virtueAI(Creature* creature) : BossAI(creature, DATA_MAIDEN_OF_VIRTUE) { }
+        BossAI::JustEngagedWith(who);
+        Talk(SAY_AGGRO);
+
+        DoCastSelf(SPELL_HOLYGROUND, true);
+        events.ScheduleEvent(EVENT_REPENTANCE, 33s, 45s);
+        events.ScheduleEvent(EVENT_HOLYFIRE, 8s);
+        events.ScheduleEvent(EVENT_HOLYWRATH, 15s, 25s);
+        events.ScheduleEvent(EVENT_BERSERK, 10min);
+    }
 
-        void KilledUnit(Unit* /*Victim*/) override
-        {
-            if (roll_chance_i(50))
-                Talk(SAY_SLAY);
-        }
+    void OnSpellCast(SpellInfo const* spell) override
+    {
+        if (spell->Id == SPELL_REPENTANCE)
+            Talk(SAY_REPENTANCE);
+    }
 
-        void JustDied(Unit* /*killer*/) override
-        {
-            Talk(SAY_DEATH);
-            _JustDied();
-        }
+    void KilledUnit(Unit* /*victim*/) override
+    {
+        if (roll_chance_i(50))
+            Talk(SAY_SLAY);
+    }
 
-        void JustEngagedWith(Unit* who) override
-        {
-            BossAI::JustEngagedWith(who);
-            Talk(SAY_AGGRO);
-
-            DoCastSelf(SPELL_HOLYGROUND, true);
-            events.ScheduleEvent(EVENT_REPENTANCE, 33s, 45s);
-            events.ScheduleEvent(EVENT_HOLYFIRE, 8s);
-            events.ScheduleEvent(EVENT_HOLYWRATH, 15s, 25s);
-            events.ScheduleEvent(EVENT_ENRAGE, 10min);
-        }
+    void JustDied(Unit* /*killer*/) override
+    {
+        Talk(SAY_DEATH);
+        _JustDied();
+    }
 
-        void UpdateAI(uint32 diff) override
-        {
-            if (!UpdateVictim())
-                return;
+    void UpdateAI(uint32 diff) override
+    {
+        if (!UpdateVictim())
+            return;
 
-            events.Update(diff);
+        events.Update(diff);
 
-            if (me->HasUnitState(UNIT_STATE_CASTING))
-                return;
+        if (me->HasUnitState(UNIT_STATE_CASTING))
+            return;
 
-            while (uint32 eventId = events.ExecuteEvent())
+        while (uint32 eventId = events.ExecuteEvent())
+        {
+            switch (eventId)
             {
-                switch (eventId)
-                {
-                    case EVENT_REPENTANCE:
-                        DoCastVictim(SPELL_REPENTANCE);
-                        Talk(SAY_REPENTANCE);
-                        events.Repeat(Seconds(35));
-                        break;
-                    case EVENT_HOLYFIRE:
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50, true))
-                            DoCast(target, SPELL_HOLYFIRE);
-                        events.Repeat(Seconds(8), Seconds(19));
-                        break;
-                    case EVENT_HOLYWRATH:
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 80, true))
-                            DoCast(target, SPELL_HOLYWRATH);
-                        events.Repeat(Seconds(15), Seconds(25));
-                        break;
-                    case EVENT_ENRAGE:
-                        DoCastSelf(SPELL_BERSERK, true);
-                        break;
-                    default:
-                        break;
-                }
-
-                if (me->HasUnitState(UNIT_STATE_CASTING))
-                    return;
+                case EVENT_REPENTANCE:
+                    DoCastVictim(SPELL_REPENTANCE);
+                    events.Repeat(35s);
+                    break;
+                case EVENT_HOLYFIRE:
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50, true))
+                        DoCast(target, SPELL_HOLYFIRE);
+                    events.Repeat(8s, 19s);
+                    break;
+                case EVENT_HOLYWRATH:
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 80, true))
+                        DoCast(target, SPELL_HOLYWRATH);
+                    events.Repeat(15s, 25s);
+                    break;
+                case EVENT_BERSERK:
+                    DoCastSelf(SPELL_BERSERK);
+                    break;
+                default:
+                    break;
             }
 
-            DoMeleeAttackIfReady();
+            if (me->HasUnitState(UNIT_STATE_CASTING))
+                return;
         }
-    };
 
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetKarazhanAI<boss_maiden_of_virtueAI>(creature);
+        DoMeleeAttackIfReady();
     }
 };
 
 void AddSC_boss_maiden_of_virtue()
 {
-    new boss_maiden_of_virtue();
+    RegisterKarazhanCreatureAI(boss_maiden_of_virtue);
 }

src/server/scripts/EasternKingdoms/Karazhan/karazhan.h

@@ -118,4 +118,6 @@ inline AI* GetKarazhanAI(T* obj)
     return GetInstanceAI<AI>(obj, KZScriptName);
 }
 
+#define RegisterKarazhanCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetKarazhanAI)
+
 #endif

src/server/scripts/Events/winter_veil.cpp

@@ -47,11 +47,7 @@ class spell_winter_veil_mistletoe : public SpellScript
 
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
-        if (Player* target = GetHitPlayer())
-        {
-            uint32 spellId = RAND(SPELL_CREATE_HOLLY, SPELL_CREATE_MISTLETOE, SPELL_CREATE_SNOWFLAKES);
-            GetCaster()->CastSpell(target, spellId, true);
-        }
+        GetCaster()->CastSpell(GetHitUnit(), RAND(SPELL_CREATE_HOLLY, SPELL_CREATE_MISTLETOE, SPELL_CREATE_SNOWFLAKES), true);
     }
 
     void Register() override
@@ -86,18 +82,15 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScript
         return ValidateSpellInfo(WonderboltTransformSpells);
     }
 
-    void HandleScript(SpellEffIndex effIndex)
+    void HandleScript(SpellEffIndex /*effIndex*/)
     {
-        PreventHitDefaultEffect(effIndex);
+        Unit* target = GetHitUnit();
 
-        if (Unit* target = GetHitUnit())
-        {
-            for (uint32 spell : WonderboltTransformSpells)
-                if (target->HasAura(spell))
-                    return;
+        for (uint32 spell : WonderboltTransformSpells)
+            if (target->HasAura(spell))
+                return;
 
-            target->CastSpell(target, Trinity::Containers::SelectRandomContainerElement(WonderboltTransformSpells), true);
-        }
+        target->CastSpell(target, Trinity::Containers::SelectRandomContainerElement(WonderboltTransformSpells), true);
     }
 
     void Register() override

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp

@@ -0,0 +1,56 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptMgr.h"
+#include "SpellAuras.h"
+#include "SpellScript.h"
+#include "Unit.h"
+
+enum AQ20Itch
+{
+    SPELL_HIVEZARA_CATALYST        = 25187
+};
+
+// 25185 - Itch
+class spell_ruins_of_ahnqiraj_itch : public AuraScript
+{
+    PrepareAuraScript(spell_ruins_of_ahnqiraj_itch);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_HIVEZARA_CATALYST });
+    }
+
+    void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE)
+            return;
+
+        if (Unit* caster = GetCaster())
+            caster->CastSpell(GetTarget(), SPELL_HIVEZARA_CATALYST, true);
+    }
+
+    void Register() override
+    {
+        AfterEffectRemove += AuraEffectRemoveFn(spell_ruins_of_ahnqiraj_itch::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+    }
+};
+
+void AddSC_ruins_of_ahnqiraj()
+{
+    RegisterSpellScript(spell_ruins_of_ahnqiraj_itch);
+}