refactor(Scripts/ZA): Update Zul'jin (#20456)

data/sql/updates/pending_db_world/rev_1730866003318081300.sql

@@ -0,0 +1,10 @@
+--
+DELETE FROM `spell_script_names` WHERE `spell_id` = 43149;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(43149, 'spell_claw_rage_aura');
+
+UPDATE `creature_template` SET `unit_flags` = `unit_flags` |2 WHERE `entry` IN (23878, 23880, 23877, 23879);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 42542;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 42542, 0, 0, 31, 0, 3, 23863, 0, 0, 0, 0, '', 'Cosmetic - Zul\'Aman Spirit Drain can only target Zul\'jin');

src/server/game/Spells/SpellInfoCorrections.cpp

@@ -4856,6 +4856,12 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->AttributesEx3 |= SPELL_ATTR3_SUPPRESS_CASTER_PROCS;
     });
 
+    // Claw Rage
+    ApplySpellFix({ 43149 }, [](SpellInfo* spellInfo)
+    {
+        spellInfo->Effects[EFFECT_0].TriggerSpell = 0;
+    });
+
     // Black Qiraji Battle Tank
     ApplySpellFix({ 26655, 26656 }, [](SpellInfo* spellInfo)
     {

src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp

@@ -22,22 +22,25 @@ SDComment:
 EndScriptData */
 
 #include "CreatureScript.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
+#include "SpellScript.h"
+#include "SpellScriptLoader.h"
 #include "zulaman.h"
 
 enum Says
 {
-    YELL_INTRO                    = 0,
+    SAY_INTRO                    = 0,
-    YELL_AGGRO                    = 1,
+    SAY_AGGRO                    = 1,
-    YELL_TRANSFORM_TO_BEAR        = 2,
+    SAY_TRANSFORM_TO_BEAR        = 2,
-    YELL_TRANSFORM_TO_EAGLE       = 3,
+    SAY_TRANSFORM_TO_EAGLE       = 3,
-    YELL_TRANSFORM_TO_LYNX        = 4,
+    SAY_TRANSFORM_TO_LYNX        = 4,
-    YELL_TRANSFORM_TO_DRAGONHAWK  = 5,
+    SAY_TRANSFORM_TO_DRAGONHAWK  = 5,
-    YELL_FIRE_BREATH              = 6,
+    SAY_FIRE_BREATH              = 6,
-    YELL_BERSERK                  = 7,
+    SAY_BERSERK                  = 7,
-    YELL_KILL                     = 8,
+    SAY_KILL                     = 8,
-    YELL_DEATH                    = 9
+    SAY_DEATH                    = 9
 };
 
 enum Spells
@@ -57,8 +60,8 @@ enum Spells
     SPELL_CYCLONE_VISUAL          = 43119, // trigger 43147 visual
     SPELL_CYCLONE_PASSIVE         = 43120, // trigger 43121 (4y aoe) every second
     // Lynx Form
-    SPELL_CLAW_RAGE_HASTE         = 42583,
+    SPELL_CLAW_RAGE_CHARGE        = 42583,
-    SPELL_CLAW_RAGE_TRIGGER       = 43149,
+    SPELL_CLAW_RAGE_AURA          = 43149,
     SPELL_CLAW_RAGE_DAMAGE        = 43150,
     SPELL_LYNX_RUSH_HASTE         = 43152,
     SPELL_LYNX_RUSH_DAMAGE        = 43153,
@@ -70,7 +73,7 @@ enum Spells
     SPELL_PILLAR_TRIGGER          = 43218, // trigger 43217
     // Cosmetic
     SPELL_SPIRIT_AURA             = 42466,
-    SPELL_SIPHON_SOUL             = 43501,
+    SPELL_SPIRIT_DRAIN            = 42542,
     // Transforms:
     SPELL_SHAPE_OF_THE_BEAR       = 42594, // 15% dmg
     SPELL_SHAPE_OF_THE_EAGLE      = 42606,
@@ -89,517 +92,325 @@ enum Phase
     PHASE_TROLL                   = 4
 };
 
-//coords for going for changing form
+enum Misc
-#define CENTER_X 120.148811f
+{
-#define CENTER_Y 703.713684f
+    GUID_CHARGE_TARGET            = 0,
-#define CENTER_Z 45.111477f
+    GROUP_LYNX                    = 1,
+    POINT_CENTER                  = 0
+};
+
+enum CreatureEntries
+{
+    NPC_SPIRIT_BEAR       = 23878,
+    NPC_SPIRIT_EAGLE      = 23880,
+    NPC_SPIRIT_LYNX_ZJ    = 23877,
+    NPC_SPIRIT_DRAGONHAWK = 23879
+};
+
+const Position CenterPosition = { 120.148811f, 703.713684f, 45.111477f };
 
 struct SpiritInfoStruct
 {
     uint32 entry;
-    float x, y, z, orient;
+    Position pos;
 };
 
 static SpiritInfoStruct SpiritInfo[4] =
 {
-    {23878, 147.87f, 706.51f, 45.11f, 3.04f},
+    { NPC_SPIRIT_LYNX_ZJ,    { 147.87f, 706.51f, 45.11f, 3.04f } },
-    {23880, 88.95f, 705.49f, 45.11f, 6.11f},
+    { NPC_SPIRIT_DRAGONHAWK, { 88.95f,  705.49f, 45.11f, 6.11f } },
-    {23877, 137.23f, 725.98f, 45.11f, 3.71f},
+    { NPC_SPIRIT_BEAR,       { 137.23f, 725.98f, 45.11f, 3.71f } },
-    {23879, 104.29f, 726.43f, 45.11f, 5.43f}
+    { NPC_SPIRIT_EAGLE,      { 104.29f, 726.43f, 45.11f, 5.43f } }
 };
 
 struct TransformStruct
 {
     uint8  text;
-    uint32 spell, unaura;
+    uint32 spell;
+    uint32 unaura;
+    uint32 spiritEntry;
 };
 
 static TransformStruct Transform[4] =
 {
-    {YELL_TRANSFORM_TO_BEAR, SPELL_SHAPE_OF_THE_BEAR, SPELL_WHIRLWIND},
+    { SAY_TRANSFORM_TO_BEAR,       SPELL_SHAPE_OF_THE_BEAR,       SPELL_WHIRLWIND,          NPC_SPIRIT_BEAR       },
-    {YELL_TRANSFORM_TO_EAGLE, SPELL_SHAPE_OF_THE_EAGLE, SPELL_SHAPE_OF_THE_BEAR},
+    { SAY_TRANSFORM_TO_EAGLE,      SPELL_SHAPE_OF_THE_EAGLE,      SPELL_SHAPE_OF_THE_BEAR,  NPC_SPIRIT_EAGLE      },
-    {YELL_TRANSFORM_TO_LYNX, SPELL_SHAPE_OF_THE_LYNX, SPELL_SHAPE_OF_THE_EAGLE},
+    { SAY_TRANSFORM_TO_LYNX,       SPELL_SHAPE_OF_THE_LYNX,       SPELL_SHAPE_OF_THE_EAGLE, NPC_SPIRIT_LYNX_ZJ    },
-    {YELL_TRANSFORM_TO_DRAGONHAWK, SPELL_SHAPE_OF_THE_DRAGONHAWK, SPELL_SHAPE_OF_THE_LYNX}
+    { SAY_TRANSFORM_TO_DRAGONHAWK, SPELL_SHAPE_OF_THE_DRAGONHAWK, SPELL_SHAPE_OF_THE_LYNX,  NPC_SPIRIT_DRAGONHAWK }
 };
 
-class boss_zuljin : public CreatureScript
+struct boss_zuljin : public BossAI
 {
-public:
+    boss_zuljin(Creature* creature) : BossAI(creature, DATA_ZULJIN) { }
-    boss_zuljin()
+
-        : CreatureScript("boss_zuljin")
+    void Reset() override
     {
+        _Reset();
+        me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 33975);
+        me->SetCombatMovement(true);
+        me->m_Events.KillAllEvents(false);
+        _nextPhase = 0;
     }
 
-    struct boss_zuljinAI : public ScriptedAI
+    void JustEngagedWith(Unit* /*who*/) override
     {
-        boss_zuljinAI(Creature* creature) : ScriptedAI(creature), Summons(me)
+        _JustEngagedWith();
+        DoZoneInCombat();
+
+        Talk(SAY_INTRO);
+        SpawnAdds();
+
+        Talk(SAY_AGGRO, 37s);
+
+        // Phase 1: Default (troll)
+        ScheduleTimedEvent(7s, [&] {
+            DoCastAOE(SPELL_WHIRLWIND);
+        }, 15s, 20s);
+
+        ScheduleTimedEvent(8s, [&] {
+            DoCastRandomTarget(SPELL_GRIEVOUS_THROW, 0, 100.0f);
+        }, 10s);
+
+        me->m_Events.AddEventAtOffset([&]() {
+            DoCastSelf(SPELL_BERSERK, true);
+            Talk(SAY_BERSERK);
+        }, 10min);
+
+        // Phase 2: Bear Form.
+        ScheduleHealthCheckEvent({ 80 }, [&] {
+            EnterPhase(PHASE_BEAR);
+            ScheduleTimedEvent(7s, [&] {
+                DoCastAOE(SPELL_CREEPING_PARALYSIS);
+            }, 20s);
+
+            ScheduleTimedEvent(1s, [&] {
+                if (!me->HasSpellCooldown(SPELL_OVERPOWER))
+                {
+                    if (me->GetVictim() && me->GetComboPoints())
+                        DoCastVictim(SPELL_OVERPOWER);
+                }
+            }, 1s);
+        });
+
+        // Phase 3: Eagle Form.
+        ScheduleHealthCheckEvent({ 60 }, [&] {
+            EnterPhase(PHASE_EAGLE);
+        });
+
+        // Phase 4: Lynx Form.
+        ScheduleHealthCheckEvent({ 40 }, [&] {
+            EnterPhase(PHASE_LYNX);
+            me->RemoveAurasDueToSpell(SPELL_ENERGY_STORM);
+            instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_ENERGY_STORM);
+            summons.DespawnEntry(CREATURE_FEATHER_VORTEX);
+            me->ResumeChasingVictim();
+
+            ScheduleTimedEvent(5s, [&] {
+                DoCastRandomTarget(SPELL_CLAW_RAGE_CHARGE);
+            }, 15s, 20s);
+
+            ScheduleTimedEvent(14s, [&] {
+                DoCastSelf(SPELL_LYNX_RUSH_HASTE);
+
+                for (int8 count = 0; count <= 8; ++count)
+                {
+                    me->m_Events.AddEventAtOffset([&] {
+                        DoCastRandomTarget(SPELL_LYNX_RUSH_DAMAGE);
+                    }, Seconds(1 * count), Seconds(1 * count), GROUP_LYNX);
+                }
+
+            }, 15s, 20s);
+        });
+
+        // Phase 5: Dragonhawk Form.
+        ScheduleHealthCheckEvent({ 20 }, [&] {
+            me->m_Events.CancelEventGroup(GROUP_LYNX);
+            EnterPhase(PHASE_DRAGONHAWK);
+
+            ScheduleTimedEvent(5s, [&] {
+                DoCastSelf(SPELL_FLAME_WHIRL);
+            }, 12s);
+
+            ScheduleTimedEvent(6s, [&] {
+                DoCastRandomTarget(SPELL_SUMMON_PILLAR);
+            }, 10s);
+
+            ScheduleTimedEvent(7s, [&] {
+                DoCastAOE(SPELL_FLAME_BREATH);
+            }, 10s);
+        });
+    }
+
+    void SpellHitTarget(Unit* target, SpellInfo const* spellInfo) override
+    {
+        if (spellInfo->Id == SPELL_CLAW_RAGE_CHARGE && target != me)
         {
-            instance = creature->GetInstanceScript();
+            DoCastSelf(SPELL_CLAW_RAGE_AURA);
+            _chargeTargetGUID = target->GetGUID();
         }
-        InstanceScript* instance;
+    }
 
-        ObjectGuid SpiritGUID[4];
+    void KilledUnit(Unit* /*victim*/) override
-        ObjectGuid ClawTargetGUID;
+    {
-        ObjectGuid TankGUID;
+        Talk(SAY_KILL);
+    }
 
-        uint32 Phase;
+    ObjectGuid GetGUID(int32 index) const override
-        uint32 health_20;
+    {
+        if (index == GUID_CHARGE_TARGET)
+            return _chargeTargetGUID;
 
-        uint32 Intro_Timer;
+        return ObjectGuid::Empty;
-        uint32 Berserk_Timer;
+    }
 
-        uint32 Whirlwind_Timer;
+    void JustDied(Unit* /*killer*/) override
-        uint32 Grievous_Throw_Timer;
+    {
+        instance->SetBossState(DATA_ZULJIN, DONE);
+        Talk(SAY_DEATH);
+        summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE);
+    }
 
-        uint32 Creeping_Paralysis_Timer;
+    void SpawnAdds()
-        uint32 Overpower_Timer;
+    {
-
+        for (auto const& spiritInfo : SpiritInfo)
-        uint32 Claw_Rage_Timer;
-        uint32 Lynx_Rush_Timer;
-        uint32 Claw_Counter;
-        uint32 Claw_Loop_Timer;
-
-        uint32 Flame_Whirl_Timer;
-        uint32 Flame_Breath_Timer;
-        uint32 Pillar_Of_Fire_Timer;
-
-        SummonList Summons;
-
-        void Reset() override
         {
-            Phase = 0;
+            if (Creature* creature = me->SummonCreature(spiritInfo.entry, spiritInfo.pos, TEMPSUMMON_DEAD_DESPAWN, 0))
-
+            {
-            health_20 = me->CountPctFromMaxHealth(20);
+                creature->m_Events.AddEventAtOffset([creature] {
-
+                    creature->CastSpell(creature, SPELL_SPIRIT_AURA);
-            Intro_Timer = 37000;
+                }, 1s);
-            Berserk_Timer = 600000;
+            }
-
-            Whirlwind_Timer = 7000;
-            Grievous_Throw_Timer = 8000;
-
-            Creeping_Paralysis_Timer = 7000;
-            Overpower_Timer = 0;
-
-            Claw_Rage_Timer = 5000;
-            Lynx_Rush_Timer = 14000;
-            Claw_Loop_Timer = 0;
-            Claw_Counter = 0;
-
-            Flame_Whirl_Timer = 5000;
-            Flame_Breath_Timer = 6000;
-            Pillar_Of_Fire_Timer = 7000;
-
-            ClawTargetGUID.Clear();
-            TankGUID.Clear();
-
-            Summons.DespawnAll();
-
-            me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 33975);
-            //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO, 218172674);
-            //me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
         }
+    }
 
-        void JustEngagedWith(Unit* /*who*/) override
+    void MovementInform(uint32 type, uint32 id) override
+    {
+        if (type == POINT_MOTION_TYPE && id == POINT_CENTER)
         {
-            DoZoneInCombat();
+            if (Creature* spirit = summons.GetCreatureWithEntry(Transform[_nextPhase].spiritEntry))
+            {
+                spirit->CastSpell(me, SPELL_SPIRIT_DRAIN, false);
+                me->SetFacingToObject(spirit);
+            }
 
-            Talk(YELL_INTRO);
+            if (_nextPhase)
-            SpawnAdds();
+                if (Creature* spirit = summons.GetCreatureWithEntry(Transform[_nextPhase - 1].spiritEntry))
-            EnterPhase(0);
+                {
+                    spirit->CastStop();
+                    spirit->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD);
+                }
+
+            Talk(Transform[_nextPhase].text);
+
+            me->m_Events.AddEventAtOffset([&] {
+                me->SetReactState(REACT_AGGRESSIVE);
+                DoCastSelf(Transform[_nextPhase].spell);
+
+                if (_nextPhase == PHASE_EAGLE)
+                {
+                    me->SetCombatMovement(false);
+                    DoCastSelf(SPELL_ENERGY_STORM, true); // enemy aura
+                    for (uint8 i = 0; i < 4; ++i)
+                    {
+                        if (Creature* vortex = DoSpawnCreature(CREATURE_FEATHER_VORTEX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0))
+                        {
+                            vortex->CastSpell(vortex, SPELL_CYCLONE_PASSIVE, true);
+                            vortex->CastSpell(vortex, SPELL_CYCLONE_VISUAL, true);
+                            vortex->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+                            vortex->SetSpeed(MOVE_RUN, 1.0f);
+                            DoZoneInCombat(vortex);
+                        }
+                    }
+                }
+                else
+                {
+                    me->SetCombatMovement(true);
+                    me->ResumeChasingVictim();
+                }
+            }, 2s);
         }
+    }
 
-        void KilledUnit(Unit* /*victim*/) override
+    void EnterPhase(uint32 NextPhase)
+    {
+        scheduler.CancelAll();
+        me->SetReactState(REACT_PASSIVE);
+        DoStopAttack();
+        me->GetMotionMaster()->Clear();
+        DoResetThreatList();
+
+        me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0);
+        me->RemoveAurasDueToSpell(Transform[NextPhase].unaura);
+
+        me->m_Events.AddEventAtOffset([&] {
+            me->GetMotionMaster()->MovePoint(POINT_CENTER, CenterPosition);
+        }, 1s);
+
+        _nextPhase = NextPhase;
+    }
+
+    private:
+        ObjectGuid _chargeTargetGUID;
+        uint8 _nextPhase;
+};
+
+struct npc_zuljin_vortex : public ScriptedAI
+{
+    npc_zuljin_vortex(Creature* creature) : ScriptedAI(creature) { }
+
+    void Reset() override { }
+
+    void JustEngagedWith(Unit* /*target*/) override { }
+
+    void SpellHit(Unit* caster, SpellInfo const* spell) override
+    {
+        if (spell->Id == SPELL_ZAP_INFORM)
+            DoCast(caster, SPELL_ZAP_DAMAGE, true);
+    }
+
+    void UpdateAI(uint32 /*diff*/) override
+    {
+        //if the vortex reach the target, it change his target to another player
+        if (me->IsWithinMeleeRange(me->GetVictim()))
+            AttackStart(SelectTarget(SelectTargetMethod::Random, 0));
+    }
+};
+
+// 43149 - Claw Rage
+class spell_claw_rage_aura : public AuraScript
+{
+    PrepareAuraScript(spell_claw_rage_aura);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_CLAW_RAGE_DAMAGE });
+    }
+
+    void OnPeriodic(AuraEffect const* /*aurEff*/)
+    {
+        if (Creature* caster = GetCaster()->ToCreature())
         {
-            if (Intro_Timer)
+            if (Player* target = ObjectAccessor::GetPlayer(*caster, caster->AI()->GetGUID(GUID_CHARGE_TARGET)))
-                return;
+            {
-
+                if (target->isTargetableForAttack(true, caster))
-            Talk(YELL_KILL);
+                    GetCaster()->CastSpell(target, SPELL_CLAW_RAGE_DAMAGE);
-        }
+                else
-
+                    GetCaster()->RemoveAurasDueToSpell(SPELL_CLAW_RAGE_AURA);
-        void JustDied(Unit* /*killer*/) override
+            }
-        {
-            instance->SetData(DATA_ZULJIN, DONE);
-
-            Talk(YELL_DEATH);
-            Summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE);
-
-            if (Unit* Temp = ObjectAccessor::GetUnit(*me, SpiritGUID[3]))
-                Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD);
-        }
-
-        void AttackStart(Unit* who) override
-        {
-            if (Phase == 2)
-                AttackStartNoMove(who);
             else
-                ScriptedAI::AttackStart(who);
+                GetCaster()->RemoveAurasDueToSpell(SPELL_CLAW_RAGE_AURA);
         }
-
-        void DoMeleeAttackIfReady()
-        {
-            if (!me->IsNonMeleeSpellCast(false))
-            {
-                if (me->isAttackReady() && me->IsWithinMeleeRange(me->GetVictim()))
-                {
-                    if (Phase == 1 && !Overpower_Timer)
-                    {
-                        uint32 health = me->GetVictim()->GetHealth();
-                        me->AttackerStateUpdate(me->GetVictim());
-                        if (me->GetVictim() && health == me->GetVictim()->GetHealth())
-                        {
-                            DoCastVictim(SPELL_OVERPOWER, false);
-                            Overpower_Timer = 5000;
-                        }
-                    }
-                    else me->AttackerStateUpdate(me->GetVictim());
-                    me->resetAttackTimer();
-                }
-            }
-        }
-
-        void SpawnAdds()
-        {
-            for (uint8 i = 0; i < 4; ++i)
-            {
-                Creature* creature = me->SummonCreature(SpiritInfo[i].entry, SpiritInfo[i].x, SpiritInfo[i].y, SpiritInfo[i].z, SpiritInfo[i].orient, TEMPSUMMON_DEAD_DESPAWN, 0);
-                if (creature)
-                {
-                    creature->CastSpell(creature, SPELL_SPIRIT_AURA, true);
-                    creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
-                    creature->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-                    SpiritGUID[i] = creature->GetGUID();
-                }
-            }
-        }
-
-        void DespawnAdds()
-        {
-            for (uint8 i = 0; i < 4; ++i)
-            {
-                if (SpiritGUID[i])
-                {
-                    if (Unit* temp = ObjectAccessor::GetUnit(*me, SpiritGUID[i]))
-                    {
-                        temp->SetVisible(false);
-                        temp->setDeathState(DeathState::Dead);
-                    }
-                }
-                SpiritGUID[i].Clear();
-            }
-        }
-
-        void JustSummoned(Creature* summon) override
-        {
-            Summons.Summon(summon);
-        }
-
-        void SummonedCreatureDespawn(Creature* summon) override
-        {
-            Summons.Despawn(summon);
-        }
-
-        void EnterPhase(uint32 NextPhase)
-        {
-            switch (NextPhase)
-            {
-                case 0:
-                    break;
-                case 1:
-                case 2:
-                case 3:
-                case 4:
-                    me->NearTeleportTo(CENTER_X, CENTER_Y, CENTER_Z, me->GetOrientation());
-                    DoResetThreatList();
-                    me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0);
-                    me->RemoveAurasDueToSpell(Transform[Phase].unaura);
-                    DoCast(me, Transform[Phase].spell);
-                    Talk(Transform[Phase].text);
-                    if (Phase > 0)
-                    {
-                        if (Unit* Temp = ObjectAccessor::GetUnit(*me, SpiritGUID[Phase - 1]))
-                            Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD);
-                    }
-                    if (Unit* Temp = ObjectAccessor::GetUnit(*me, SpiritGUID[NextPhase - 1]))
-                        Temp->CastSpell(me, SPELL_SIPHON_SOUL, false); // should m cast on temp
-                    if (NextPhase == 2)
-                    {
-                        me->GetMotionMaster()->Clear();
-                        DoCast(me, SPELL_ENERGY_STORM, true); // enemy aura
-                        for (uint8 i = 0; i < 4; ++i)
-                        {
-                            Creature* Vortex = DoSpawnCreature(CREATURE_FEATHER_VORTEX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                            if (Vortex)
-                            {
-                                Vortex->CastSpell(Vortex, SPELL_CYCLONE_PASSIVE, true);
-                                Vortex->CastSpell(Vortex, SPELL_CYCLONE_VISUAL, true);
-                                Vortex->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-                                Vortex->SetSpeed(MOVE_RUN, 1.0f);
-                                Vortex->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0));
-                                DoZoneInCombat(Vortex);
-                            }
-                        }
-                    }
-                    else
-                        AttackStart(me->GetVictim());
-                    if (NextPhase == 3)
-                    {
-                        me->RemoveAurasDueToSpell(SPELL_ENERGY_STORM);
-                        Summons.DespawnEntry(CREATURE_FEATHER_VORTEX);
-                        me->GetMotionMaster()->MoveChase(me->GetVictim());
-                    }
-                    break;
-                default:
-                    break;
-            }
-            Phase = NextPhase;
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            if (!TankGUID)
-            {
-                if (!UpdateVictim())
-                    return;
-
-                if (me->GetHealth() < health_20 * (4 - Phase))
-                    EnterPhase(Phase + 1);
-            }
-
-            if (Berserk_Timer <= diff)
-            {
-                DoCast(me, SPELL_BERSERK, true);
-                Talk(YELL_BERSERK);
-                Berserk_Timer = 60000;
-            }
-            else Berserk_Timer -= diff;
-
-            switch (Phase)
-            {
-                case 0:
-                    if (Intro_Timer)
-                    {
-                        if (Intro_Timer <= diff)
-                        {
-                            Talk(YELL_AGGRO);
-                            Intro_Timer = 0;
-                        }
-                        else Intro_Timer -= diff;
-                    }
-
-                    if (Whirlwind_Timer <= diff)
-                    {
-                        DoCast(me, SPELL_WHIRLWIND);
-                        Whirlwind_Timer = urand(15000, 20000);
-                    }
-                    else Whirlwind_Timer -= diff;
-
-                    if (Grievous_Throw_Timer <= diff)
-                    {
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true))
-                            DoCast(target, SPELL_GRIEVOUS_THROW, false);
-                        Grievous_Throw_Timer = 10000;
-                    }
-                    else Grievous_Throw_Timer -= diff;
-                    break;
-
-                case 1:
-                    if (Creeping_Paralysis_Timer <= diff)
-                    {
-                        DoCast(me, SPELL_CREEPING_PARALYSIS);
-                        Creeping_Paralysis_Timer = 20000;
-                    }
-                    else Creeping_Paralysis_Timer -= diff;
-
-                    if (Overpower_Timer <= diff)
-                    {
-                        // implemented in DoMeleeAttackIfReady()
-                        Overpower_Timer = 0;
-                    }
-                    else Overpower_Timer -= diff;
-                    break;
-
-                case 2:
-                    return;
-
-                case 3:
-                    if (Claw_Rage_Timer <= diff)
-                    {
-                        if (!TankGUID)
-                        {
-                            if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
-                            {
-                                TankGUID = me->GetVictim()->GetGUID();
-                                me->SetSpeed(MOVE_RUN, 5.0f);
-                                AttackStart(target); // change victim
-                                Claw_Rage_Timer = 0;
-                                Claw_Loop_Timer = 500;
-                                Claw_Counter = 0;
-                            }
-                        }
-                        else if (!Claw_Rage_Timer) // do not do this when Lynx_Rush
-                        {
-                            if (Claw_Loop_Timer <= diff)
-                            {
-                                Unit* target = me->GetVictim();
-                                if (!target || !target->isTargetableForAttack()) target = ObjectAccessor::GetUnit(*me, TankGUID);
-                                if (!target || !target->isTargetableForAttack()) target = SelectTarget(SelectTargetMethod::Random, 0);
-                                if (target)
-                                {
-                                    AttackStart(target);
-                                    if (me->IsWithinMeleeRange(target))
-                                    {
-                                        DoCast(target, SPELL_CLAW_RAGE_DAMAGE, true);
-                                        ++Claw_Counter;
-                                        if (Claw_Counter == 12)
-                                        {
-                                            Claw_Rage_Timer = urand(15000, 20000);
-                                            me->SetSpeed(MOVE_RUN, 1.2f);
-                                            AttackStart(ObjectAccessor::GetUnit(*me, TankGUID));
-                                            TankGUID.Clear();
-                                            return;
-                                        }
-                                        else
-                                            Claw_Loop_Timer = 500;
-                                    }
-                                }
-                                else
-                                {
-                                    EnterEvadeMode(); // if (target)
-                                    return;
-                                }
-                            }
-                            else Claw_Loop_Timer -= diff;
-                        } //if (TankGUID)
-                    }
-                    else Claw_Rage_Timer -= diff;
-
-                    if (Lynx_Rush_Timer <= diff)
-                    {
-                        if (!TankGUID)
-                        {
-                            if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
-                            {
-                                TankGUID = me->GetVictim()->GetGUID();
-                                me->SetSpeed(MOVE_RUN, 5.0f);
-                                AttackStart(target); // change victim
-                                Lynx_Rush_Timer = 0;
-                                Claw_Counter = 0;
-                            }
-                        }
-                        else if (!Lynx_Rush_Timer)
-                        {
-                            Unit* target = me->GetVictim();
-                            if (!target || !target->isTargetableForAttack())
-                            {
-                                target = SelectTarget(SelectTargetMethod::Random, 0);
-                                AttackStart(target);
-                            }
-                            if (target)
-                            {
-                                if (me->IsWithinMeleeRange(target))
-                                {
-                                    DoCast(target, SPELL_LYNX_RUSH_DAMAGE, true);
-                                    ++Claw_Counter;
-                                    if (Claw_Counter == 9)
-                                    {
-                                        Lynx_Rush_Timer = urand(15000, 20000);
-                                        me->SetSpeed(MOVE_RUN, 1.2f);
-                                        AttackStart(ObjectAccessor::GetUnit(*me, TankGUID));
-                                        TankGUID.Clear();
-                                    }
-                                    else
-                                        AttackStart(SelectTarget(SelectTargetMethod::Random, 0));
-                                }
-                            }
-                            else
-                            {
-                                EnterEvadeMode(); // if (target)
-                                return;
-                            }
-                        } //if (TankGUID)
-                    }
-                    else Lynx_Rush_Timer -= diff;
-
-                    break;
-                case 4:
-                    if (Flame_Whirl_Timer <= diff)
-                    {
-                        DoCast(me, SPELL_FLAME_WHIRL);
-                        Flame_Whirl_Timer = 12000;
-                    }
-                    Flame_Whirl_Timer -= diff;
-
-                    if (Pillar_Of_Fire_Timer <= diff)
-                    {
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
-                            DoCast(target, SPELL_SUMMON_PILLAR);
-                        Pillar_Of_Fire_Timer = 10000;
-                    }
-                    else Pillar_Of_Fire_Timer -= diff;
-
-                    if (Flame_Breath_Timer <= diff)
-                    {
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
-                            me->SetInFront(target);
-                        DoCast(me, SPELL_FLAME_BREATH);
-                        Flame_Breath_Timer = 10000;
-                    }
-                    else Flame_Breath_Timer -= diff;
-                    break;
-
-                default:
-                    break;
-            }
-
-            if (!TankGUID)
-                DoMeleeAttackIfReady();
-        }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetZulAmanAI<boss_zuljinAI>(creature);
-    }
-};
-
-class npc_zuljin_vortex : public CreatureScript
-{
-public:
-    npc_zuljin_vortex()
-        : CreatureScript("npc_zuljin_vortex")
-    {
     }
 
-    struct npc_zuljin_vortexAI : public ScriptedAI
+    void Register() override
     {
-        npc_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) { }
+        OnEffectPeriodic += AuraEffectPeriodicFn(spell_claw_rage_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
-
-        void Reset() override { }
-
-        void JustEngagedWith(Unit* /*target*/) override { }
-
-        void SpellHit(Unit* caster, SpellInfo const* spell) override
-        {
-            if (spell->Id == SPELL_ZAP_INFORM)
-                DoCast(caster, SPELL_ZAP_DAMAGE, true);
-        }
-
-        void UpdateAI(uint32 /*diff*/) override
-        {
-            //if the vortex reach the target, it change his target to another player
-            if (me->IsWithinMeleeRange(me->GetVictim()))
-                AttackStart(SelectTarget(SelectTargetMethod::Random, 0));
-        }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetZulAmanAI<npc_zuljin_vortexAI>(creature);
     }
 };
 
 void AddSC_boss_zuljin()
 {
-    new boss_zuljin();
+    RegisterZulAmanCreatureAI(boss_zuljin);
-    new npc_zuljin_vortex();
+    RegisterZulAmanCreatureAI(npc_zuljin_vortex);
+    RegisterSpellScript(spell_claw_rage_aura);
 }

src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp

@@ -54,6 +54,12 @@ static SHostageInfo HostageInfo[] =
 
 Position const HarrisonJonesLoc = {120.687f, 1674.0f, 42.0217f, 1.59044f};
 
+DoorData const doorData[] =
+{
+    { GO_ZULJIN_FIREWALL, DATA_ZULJIN, DOOR_TYPE_ROOM  },
+    { 0,                  0,           DOOR_TYPE_ROOM  } // END
+};
+
 ObjectData const creatureData[] =
 {
     { NPC_SPIRIT_LYNX, DATA_SPIRIT_LYNX   },
@@ -93,7 +99,6 @@ public:
         ObjectGuid ZulJinGateGUID;
         ObjectGuid MassiveGateGUID;
         ObjectGuid AkilzonDoorGUID;
-        ObjectGuid ZulJinDoorGUID;
         ObjectGuid HalazziDoorGUID;
 
         uint32 QuestTimer;
@@ -111,6 +116,7 @@ public:
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
             SetBossNumber(MAX_ENCOUNTER);
             LoadBossBoundaries(boundaries);
+            LoadDoorData(doorData);
 
             QuestTimer = 0;
             QuestMinute = 0;
@@ -123,15 +129,6 @@ public:
             m_auiEncounter[DATA_GONGEVENT] = NOT_STARTED;
         }
 
-        bool IsEncounterInProgress() const override
-        {
-            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
-                if (m_auiEncounter[i] == IN_PROGRESS)
-                    return true;
-
-            return false;
-        }
-
         void OnPlayerEnter(Player* /*player*/) override
         {
             if (!HarrisonJonesGUID)
@@ -145,11 +142,6 @@ public:
                 case NPC_HARRISON_JONES:
                     HarrisonJonesGUID = creature->GetGUID();
                     break;
-                case NPC_JANALAI:
-                case NPC_ZULJIN:
-                case NPC_HEXLORD:
-                case NPC_HALAZZI:
-                case NPC_NALORAKK:
                 default:
                     break;
             }
@@ -175,9 +167,6 @@ public:
                 case GO_DOOR_AKILZON:
                     AkilzonDoorGUID = go->GetGUID();
                     break;
-                case GO_DOOR_ZULJIN:
-                    ZulJinDoorGUID = go->GetGUID();
-                    break;
 
                 case GO_HARKORS_SATCHEL:
                     HarkorsSatchelGUID = go->GetGUID();
@@ -198,6 +187,8 @@ public:
                     break;
             }
             CheckInstanceStatus();
+
+            InstanceScript::OnGameObjectCreate(go);
         }
 
         void SummonHostage(uint8 num)
@@ -320,11 +311,6 @@ public:
                         CheckInstanceStatus();
                     SaveToDB();
                     break;
-                case DATA_ZULJIN:
-                    m_auiEncounter[DATA_ZULJIN] = data;
-                    HandleGameObject(ZulJinDoorGUID, data != IN_PROGRESS);
-                    SaveToDB();
-                    break;
                 case DATA_CHESTLOOTED:
                     ++ChestLooted;
                     SaveToDB();

src/server/scripts/EasternKingdoms/ZulAman/zulaman.h

@@ -61,7 +61,7 @@ enum GameobjectIds
     GO_GATE_HEXLORD                     = 186305,
     GO_MASSIVE_GATE                     = 186728,
     GO_DOOR_AKILZON                     = 186858,
-    GO_DOOR_ZULJIN                      = 186859,
+    GO_ZULJIN_FIREWALL                  = 186859,
     GO_HARKORS_SATCHEL                  = 187021,
     GO_TANZARS_TRUNK                    = 186648,
     GO_ASHLIS_BAG                       = 186672,