Scripts/Blood Furnace: Update scripts (TrinityCore#31012)

Author: offl

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");

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h

@@ -91,5 +91,6 @@ inline AI* GetBloodFurnaceAI(T* obj)
 }
 
 #define RegisterBloodFurnaceCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetBloodFurnaceAI)
+#define RegisterBloodFurnaceGameObjectAI(ai_name) RegisterGameObjectAIWithFactory(ai_name, GetBloodFurnaceAI)
 
 #endif // BLOOD_FURNACE_H_

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp

@@ -26,12 +26,12 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
-enum Yells
+enum BroggokTexts
 {
-    SAY_AGGRO                   = 0
+    SAY_AGGRO                     = 0
 };
 
-enum Spells
+enum BroggokSpells
 {
     SPELL_SLIME_SPRAY             = 30913,
     SPELL_POISON_CLOUD            = 30916,
@@ -46,107 +46,98 @@ enum Spells
     SPELL_CHARGE                  = 22120
 };
 
-enum Events
+enum BroggokEvents
 {
-    EVENT_SLIME_SPRAY = 1,
+    EVENT_SLIME_SPRAY             = 1,
     EVENT_POISON_BOLT,
     EVENT_POISON_CLOUD,
 };
 
-class boss_broggok : public CreatureScript
+// 17380 - Broggok
+struct boss_broggok : public BossAI
 {
-    public:
-        boss_broggok() : CreatureScript("boss_broggok") { }
+    boss_broggok(Creature* creature) : BossAI(creature, DATA_BROGGOK) { }
 
-        struct boss_broggokAI : public BossAI
-        {
-            boss_broggokAI(Creature* creature) : BossAI(creature, DATA_BROGGOK) { }
-
-            void Reset() override
-            {
-                _Reset();
-                DoAction(ACTION_RESET_BROGGOK);
-            }
-
-            void JustEngagedWith(Unit* who) override
-            {
-                BossAI::JustEngagedWith(who);
-                Talk(SAY_AGGRO);
-            }
-
-            void JustSummoned(Creature* summoned) override
-            {
-                if (summoned->GetEntry() == NPC_BROGGOK_POISON_CLOUD)
-                {
-                    summoned->SetReactState(REACT_PASSIVE);
-                    summoned->CastSpell(summoned, SPELL_POISON_CLOUD_PASSIVE, true);
-                    summons.Summon(summoned);
-                }
-                else if (summoned->GetEntry() == NPC_INCOMBAT_TRIGGER)
-                {
-                    summoned->SetReactState(REACT_PASSIVE);
-                    DoZoneInCombat(summoned);
-                    summons.Summon(summoned);
-                }
-            }
+    void Reset() override
+    {
+        _Reset();
+        DoAction(ACTION_RESET_BROGGOK);
+    }
 
-            void ExecuteEvent(uint32 eventId) override
-            {
-                switch (eventId)
-                {
-                    case EVENT_SLIME_SPRAY:
-                        DoCastVictim(SPELL_SLIME_SPRAY);
-                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 4s, 12s);
-                        break;
-                    case EVENT_POISON_BOLT:
-                        DoCastVictim(SPELL_POISON_BOLT);
-                        events.ScheduleEvent(EVENT_POISON_BOLT, 4s, 12s);
-                        break;
-                    case EVENT_POISON_CLOUD:
-                        DoCast(me, SPELL_POISON_CLOUD);
-                        events.ScheduleEvent(EVENT_POISON_CLOUD, 20s);
-                        break;
-                    default:
-                        break;
-                }
-            }
+    void JustEngagedWith(Unit* who) override
+    {
+        BossAI::JustEngagedWith(who);
+        Talk(SAY_AGGRO);
+
+        events.ScheduleEvent(EVENT_SLIME_SPRAY, 10s);
+        events.ScheduleEvent(EVENT_POISON_BOLT, 7s);
+        events.ScheduleEvent(EVENT_POISON_CLOUD, 5s);
+    }
 
-            void DoAction(int32 action) override
-            {
-                switch (action)
+    void JustSummoned(Creature* summoned) override
+    {
+        if (summoned->GetEntry() == NPC_BROGGOK_POISON_CLOUD)
+        {
+            summoned->SetReactState(REACT_PASSIVE);
+            summoned->CastSpell(summoned, SPELL_POISON_CLOUD_PASSIVE, true);
+            summons.Summon(summoned);
+        }
+        else if (summoned->GetEntry() == NPC_INCOMBAT_TRIGGER)
+        {
+            summoned->SetReactState(REACT_PASSIVE);
+            DoZoneInCombat(summoned);
+            summons.Summon(summoned);
+        }
+    }
+
+    void DoAction(int32 action) override
+    {
+        switch (action)
+        {
+            case ACTION_PREPARE_BROGGOK:
+                DoCastSelf(SPELL_SUMMON_INCOMBAT_TRIGGER);
+                break;
+            case ACTION_ACTIVATE_BROGGOK:
+                me->SetReactState(REACT_AGGRESSIVE);
+                me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+                DoZoneInCombat();
+                break;
+            case ACTION_RESET_BROGGOK:
+                me->SetReactState(REACT_PASSIVE);
+                me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
+                summons.DespawnAll();
+                instance->SetBossState(DATA_BROGGOK, NOT_STARTED);
+                if (GameObject * lever = instance->GetGameObject(DATA_BROGGOK_LEVER))
                 {
-                    case ACTION_PREPARE_BROGGOK:
-                        DoCastSelf(SPELL_SUMMON_INCOMBAT_TRIGGER);
-                        break;
-                    case ACTION_ACTIVATE_BROGGOK:
-                        me->SetReactState(REACT_AGGRESSIVE);
-                        me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
-                        DoZoneInCombat();
-                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 10s);
-                        events.ScheduleEvent(EVENT_POISON_BOLT, 7s);
-                        events.ScheduleEvent(EVENT_POISON_CLOUD, 5s);
-                        break;
-                    case ACTION_RESET_BROGGOK:
-                        me->SetReactState(REACT_PASSIVE);
-                        me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE);
-                        summons.DespawnAll();
-                        instance->SetBossState(DATA_BROGGOK, NOT_STARTED);
-                        if (GameObject * lever = instance->GetGameObject(DATA_BROGGOK_LEVER))
-                        {
-                            lever->RemoveFlag(GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE);
-                            lever->SetGoState(GO_STATE_READY);
-                        }
-                        break;
-                    default:
-                        break;
+                    lever->RemoveFlag(GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE);
+                    lever->SetGoState(GO_STATE_READY);
                 }
-            }
-        };
+                break;
+            default:
+                break;
+        }
+    }
 
-        CreatureAI* GetAI(Creature* creature) const override
+    void ExecuteEvent(uint32 eventId) override
+    {
+        switch (eventId)
         {
-            return GetBloodFurnaceAI<boss_broggokAI>(creature);
+            case EVENT_SLIME_SPRAY:
+                DoCastVictim(SPELL_SLIME_SPRAY);
+                events.Repeat(4s, 12s);
+                break;
+            case EVENT_POISON_BOLT:
+                DoCastVictim(SPELL_POISON_BOLT);
+                events.Repeat(4s, 12s);
+                break;
+            case EVENT_POISON_CLOUD:
+                DoCastSelf(SPELL_POISON_CLOUD);
+                events.Repeat(20s);
+                break;
+            default:
+                break;
         }
+    }
 };
 
 static Emote const PrisionersEmotes[] =
@@ -204,6 +195,7 @@ struct BroggokPrisionersAI : public ScriptedAI
     TaskScheduler scheduler;
 };
 
+// 17398 - Nascent Fel Orc
 struct npc_nascent_fel_orc : public BroggokPrisionersAI
 {
     npc_nascent_fel_orc(Creature* creature) : BroggokPrisionersAI(creature) { }
@@ -223,6 +215,7 @@ struct npc_nascent_fel_orc : public BroggokPrisionersAI
 
 };
 
+// 17429 - Fel Orc Neophyte
 struct npc_fel_orc_neophyte : public BroggokPrisionersAI
 {
     npc_fel_orc_neophyte(Creature* creature) : BroggokPrisionersAI(creature) { }
@@ -242,82 +235,61 @@ struct npc_fel_orc_neophyte : public BroggokPrisionersAI
 
 };
 
-class go_broggok_lever : public GameObjectScript
+// 181982 - Cell Door Lever
+struct go_broggok_lever : public GameObjectAI
 {
-    public:
-        go_broggok_lever() : GameObjectScript("go_broggok_lever") { }
+    go_broggok_lever(GameObject* go) : GameObjectAI(go), instance(go->GetInstanceScript()) { }
 
-        struct go_broggok_leverAI : public GameObjectAI
-        {
-            go_broggok_leverAI(GameObject* go) : GameObjectAI(go), instance(go->GetInstanceScript()) { }
-
-            InstanceScript* instance;
-
-            bool OnGossipHello(Player* /*player*/) override
-            {
-                if (instance->GetBossState(DATA_BROGGOK) != DONE && instance->GetBossState(DATA_BROGGOK) != IN_PROGRESS)
-                {
-                    instance->SetBossState(DATA_BROGGOK, IN_PROGRESS);
-                    if (Creature* broggok = instance->GetCreature(DATA_BROGGOK))
-                        broggok->AI()->DoAction(ACTION_PREPARE_BROGGOK);
-                }
-
-                me->SetFlag(GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE);
-                me->SetGoState(GO_STATE_ACTIVE);
-
-                return true;
-            }
-        };
+    InstanceScript* instance;
 
-        GameObjectAI* GetAI(GameObject* go) const override
+    bool OnGossipHello(Player* /*player*/) override
+    {
+        if (instance->GetBossState(DATA_BROGGOK) != DONE && instance->GetBossState(DATA_BROGGOK) != IN_PROGRESS)
         {
-            return GetBloodFurnaceAI<go_broggok_leverAI>(go);
+            instance->SetBossState(DATA_BROGGOK, IN_PROGRESS);
+            if (Creature* broggok = instance->GetCreature(DATA_BROGGOK))
+                broggok->AI()->DoAction(ACTION_PREPARE_BROGGOK);
         }
+
+        me->SetFlag(GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE);
+        me->SetGoState(GO_STATE_ACTIVE);
+
+        return true;
+    }
 };
 
 // 30914, 38462 - Poison
-class spell_broggok_poison_cloud : public SpellScriptLoader
+class spell_broggok_poison_cloud : public AuraScript
 {
-    public:
-        spell_broggok_poison_cloud() : SpellScriptLoader("spell_broggok_poison_cloud") { }
+    PrepareAuraScript(spell_broggok_poison_cloud);
 
-        class spell_broggok_poison_cloud_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_broggok_poison_cloud_AuraScript);
-
-            bool Validate(SpellInfo const* spellInfo) override
-            {
-                return ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
-            }
-
-            void PeriodicTick(AuraEffect const* aurEff)
-            {
-                PreventDefaultAction();
-                if (!aurEff->GetTotalTicks())
-                    return;
-
-                uint32 triggerSpell = aurEff->GetSpellEffectInfo().TriggerSpell;
-                int32 mod = int32(((float(aurEff->GetTickNumber()) / aurEff->GetTotalTicks()) * 0.9f + 0.1f) * 10000 * 2 / 3);
-                GetTarget()->CastSpell(nullptr, triggerSpell, CastSpellExtraArgs(aurEff).AddSpellMod(SPELLVALUE_RADIUS_MOD, mod));
-            }
-
-            void Register() override
-            {
-                OnEffectPeriodic += AuraEffectPeriodicFn(spell_broggok_poison_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
-            }
-        };
-
-        AuraScript* GetAuraScript() const override
-        {
-            return new spell_broggok_poison_cloud_AuraScript();
-        }
+    bool Validate(SpellInfo const* spellInfo) override
+    {
+        return ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
+    }
+
+    void PeriodicTick(AuraEffect const* aurEff)
+    {
+        PreventDefaultAction();
+        if (!aurEff->GetTotalTicks())
+            return;
+
+        uint32 triggerSpell = aurEff->GetSpellEffectInfo().TriggerSpell;
+        int32 mod = int32(((float(aurEff->GetTickNumber()) / aurEff->GetTotalTicks()) * 0.9f + 0.1f) * 10000 * 2 / 3);
+        GetTarget()->CastSpell(nullptr, triggerSpell, CastSpellExtraArgs(aurEff).AddSpellMod(SPELLVALUE_RADIUS_MOD, mod));
+    }
+
+    void Register() override
+    {
+        OnEffectPeriodic += AuraEffectPeriodicFn(spell_broggok_poison_cloud::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
+    }
 };
 
 void AddSC_boss_broggok()
 {
-    new boss_broggok();
+    RegisterBloodFurnaceCreatureAI(boss_broggok);
     RegisterBloodFurnaceCreatureAI(npc_nascent_fel_orc);
     RegisterBloodFurnaceCreatureAI(npc_fel_orc_neophyte);
-    new go_broggok_lever();
-    new spell_broggok_poison_cloud();
+    RegisterBloodFurnaceGameObjectAI(go_broggok_lever);
+    RegisterSpellScript(spell_broggok_poison_cloud);
 }