Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

Author: Rochet2

sql/updates/world/3.3.5/2025_09_18_00_world.sql

@@ -0,0 +1,31 @@
+-- Magmadar
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_magmadar_lava_bomb';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(19411, 'spell_magmadar_lava_bomb'),
+(20474, 'spell_magmadar_lava_bomb');
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 11982 AND `GroupID` = 1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(11982,1,0,"%s becomes exhausted!",16,0,100,0,0,0,8252,0,"magmadar EMOTE_EXHAUSTED");
+
+UPDATE `creature_text` SET `BroadcastTextId` = 7797 WHERE `CreatureID` = 11982 AND `GroupID` = 0;
+
+-- Golemagg
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 20553;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,7,20553,0,0,31,0,3,11672,0,0,0,0,"","Group 0: Spell 'Golemagg's Trust' (Effect 0, 1, 2) targets creature 'Core Rager'");
+
+-- Garr
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` IN (20482,19515,23487);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,3,20482,0,0,31,0,3,12099,0,0,0,0,"","Group 0: Spell 'Firesworn Eruption Trigger' (Effect 0, 1) targets creature 'Firesworn'"),
+(13,1,19515,0,0,31,0,3,12057,0,0,0,0,"","Group 0: Spell 'Frenzy' (Effect 0) targets creature 'Garr'"),
+(13,1,23487,0,0,31,0,3,12099,0,0,0,0,"","Group 0: Spell 'Separation Anxiety' (Effect 0) targets creature 'Firesworn'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 12057;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(12057,0,0,"%s forces one of his Firesworn minions to erupt!",16,0,100,0,0,0,8254,0,"Garr EMOTE_MASSIVE_ERUPTION");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_garr_separation_anxiety';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(23487, 'spell_garr_separation_anxiety');

src/server/game/Battlegrounds/BattlegroundQueue.cpp

@@ -730,7 +730,7 @@ bool BattlegroundQueue::CheckSkirmishForSameFaction(uint32 minPlayersPerTeam)
         //set correct team
         (*itr)->Team = otherTeamId;
         //add team to other queue
-        m_QueuedGroups[uint8(BG_QUEUE_NORMAL_ALLIANCE) + uint8(teamIndex)].push_front(*itr);
+        m_QueuedGroups[uint8(BG_QUEUE_NORMAL_ALLIANCE) + uint8(otherTeam)].push_front(*itr);
         //remove team from old queue
         GroupsQueueType::iterator itr2 = itr_team;
         ++itr2;

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp

@@ -15,53 +15,69 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* ScriptData
-SDName: Boss_Baron_Geddon
-SD%Complete: 100
-SDComment:
-SDCategory: Molten Core
-EndScriptData */
-
 #include "ScriptMgr.h"
 #include "molten_core.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
+#include "SpellInfo.h"
 #include "SpellScript.h"
-#include "ObjectMgr.h"
 
-enum Emotes
+enum GeddonTexts
 {
     EMOTE_SERVICE       = 0
 };
 
-enum Spells
+enum GeddonSpells
 {
     SPELL_INFERNO       = 19695,
-    SPELL_INFERNO_DMG   = 19698,
     SPELL_IGNITE_MANA   = 19659,
     SPELL_LIVING_BOMB   = 20475,
     SPELL_ARMAGEDDON    = 20478,
+
+    SPELL_INFERNO_DMG   = 19698
 };
 
-enum Events
+enum GeddonEvents
 {
     EVENT_INFERNO       = 1,
-    EVENT_IGNITE_MANA   = 2,
-    EVENT_LIVING_BOMB   = 3,
+    EVENT_IGNITE_MANA,
+    EVENT_LIVING_BOMB,
+    EVENT_ARMAGEDDON
 };
 
+// 12056 - Baron Geddon
 struct boss_baron_geddon : public BossAI
 {
-    boss_baron_geddon(Creature* creature) : BossAI(creature, BOSS_BARON_GEDDON)
+    boss_baron_geddon(Creature* creature) : BossAI(creature, BOSS_BARON_GEDDON), _performedArmageddon(false) { }
+
+    void Reset() override
+    {
+        _Reset();
+        _performedArmageddon = false;
+    }
+
+    void JustEngagedWith(Unit* who) override
     {
+        BossAI::JustEngagedWith(who);
+
+        events.ScheduleEvent(EVENT_INFERNO, 15s, 20s);
+        events.ScheduleEvent(EVENT_IGNITE_MANA, 5s, 20s);
+        events.ScheduleEvent(EVENT_LIVING_BOMB, 15s, 35s);
     }
 
-    void JustEngagedWith(Unit* victim) override
+    void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
     {
-        BossAI::JustEngagedWith(victim);
-        events.ScheduleEvent(EVENT_INFERNO, 45s);
-        events.ScheduleEvent(EVENT_IGNITE_MANA, 30s);
-        events.ScheduleEvent(EVENT_LIVING_BOMB, 35s);
+        if (!_performedArmageddon && me->HealthBelowPctDamaged(2, damage))
+        {
+            _performedArmageddon = true;
+            events.ScheduleEvent(EVENT_ARMAGEDDON, 0s);
+        }
+    }
+
+    void OnSpellCast(SpellInfo const* spell) override
+    {
+        if (spell->Id == SPELL_ARMAGEDDON)
+            Talk(EMOTE_SERVICE);
     }
 
     void UpdateAI(uint32 diff) override
@@ -71,15 +87,6 @@ struct boss_baron_geddon : public BossAI
 
         events.Update(diff);
 
-        // If we are <2% hp cast Armageddon
-        if (!HealthAbovePct(2))
-        {
-            me->InterruptNonMeleeSpells(true);
-            DoCast(me, SPELL_ARMAGEDDON);
-            Talk(EMOTE_SERVICE);
-            return;
-        }
-
         if (me->HasUnitState(UNIT_STATE_CASTING))
             return;
 
@@ -88,18 +95,20 @@ struct boss_baron_geddon : public BossAI
             switch (eventId)
             {
                 case EVENT_INFERNO:
-                    DoCast(me, SPELL_INFERNO);
-                    events.ScheduleEvent(EVENT_INFERNO, 45s);
+                    DoCastSelf(SPELL_INFERNO);
+                    events.Repeat(20s, 35s);
                     break;
                 case EVENT_IGNITE_MANA:
-                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_IGNITE_MANA))
-                        DoCast(target, SPELL_IGNITE_MANA);
-                    events.ScheduleEvent(EVENT_IGNITE_MANA, 30s);
+                    DoCastSelf(SPELL_IGNITE_MANA);
+                    events.Repeat(25s, 40s);
                     break;
                 case EVENT_LIVING_BOMB:
                     if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
                         DoCast(target, SPELL_LIVING_BOMB);
-                    events.ScheduleEvent(EVENT_LIVING_BOMB, 35s);
+                    events.Repeat(10s, 20s);
+                    break;
+                case EVENT_ARMAGEDDON:
+                    DoCastSelf(SPELL_ARMAGEDDON);
                     break;
                 default:
                     break;
@@ -111,13 +120,21 @@ struct boss_baron_geddon : public BossAI
 
         DoMeleeAttackIfReady();
     }
+
+private:
+    bool _performedArmageddon;
 };
 
 // 19695 - Inferno
 class spell_baron_geddon_inferno : public AuraScript
 {
     PrepareAuraScript(spell_baron_geddon_inferno);
 
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_INFERNO_DMG });
+    }
+
     void OnPeriodic(AuraEffect const* aurEff)
     {
         PreventDefaultAction();