diff options
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp | 105 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp | 69 |
2 files changed, 76 insertions, 98 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 88f7d6460a8..acd9cd00b69 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -39,72 +39,61 @@ enum Events { }; -class boss_venoxis : public CreatureScript +struct boss_venoxis : public BossAI { - public: - boss_venoxis() : CreatureScript("boss_venoxis") { } - - struct boss_venoxisAI : public BossAI + boss_venoxis(Creature* creature) : BossAI(creature, DATA_VENOXIS) { } + + void Reset() override + { + _Reset(); + } + + void JustDied(Unit* /*killer*/) override + { + _JustDied(); + Talk(SAY_DEATH); + } + + void JustEngagedWith(Unit* who) override + { + BossAI::JustEngagedWith(who); + Talk(SAY_AGGRO); + } + + void KilledUnit(Unit* victim) override + { + if (victim->GetTypeId() == TYPEID_PLAYER) + Talk(SAY_PLAYER_KILL); + } + + void UpdateAI(uint32 diff) override + { + if (!UpdateVictim()) + return; + + events.Update(diff); + + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + /* + while (uint32 eventId = events.ExecuteEvent()) { - boss_venoxisAI(Creature* creature) : BossAI(creature, DATA_VENOXIS) { } - - void Reset() override - { - _Reset(); - } - - void JustDied(Unit* /*killer*/) override - { - _JustDied(); - Talk(SAY_DEATH); - } - - void JustEngagedWith(Unit* who) override - { - BossAI::JustEngagedWith(who); - Talk(SAY_AGGRO); - } - - void KilledUnit(Unit* victim) override + switch (eventId) { - if (victim->GetTypeId() == TYPEID_PLAYER) - Talk(SAY_PLAYER_KILL); - } - - void UpdateAI(uint32 diff) override - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; - /* - while (uint32 eventId = events.ExecuteEvent()) - { - switch (eventId) - { - default: - break; - } - - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; - } - */ - - DoMeleeAttackIfReady(); + default: + break; } - }; - CreatureAI* GetAI(Creature* creature) const override - { - return GetZulGurubAI<boss_venoxisAI>(creature); + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; } + */ + + DoMeleeAttackIfReady(); + } }; void AddSC_boss_venoxis() { - new boss_venoxis(); + RegisterZulGurubCreatureAI(boss_venoxis); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 7294d4e5f49..634c2539c77 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -31,56 +31,45 @@ enum Events { }; -class boss_wushoolay : public CreatureScript +struct boss_wushoolay : public BossAI { - public: - boss_wushoolay() : CreatureScript("boss_wushoolay") { } + boss_wushoolay(Creature* creature) : BossAI(creature, DATA_HAZZARAH) + { + } - struct boss_wushoolayAI : public BossAI - { - boss_wushoolayAI(Creature* creature) : BossAI(creature, DATA_HAZZARAH) - { - } + void JustEngagedWith(Unit* who) override + { + BossAI::JustEngagedWith(who); + } - void JustEngagedWith(Unit* who) override - { - BossAI::JustEngagedWith(who); - } - - 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; - /* - while (uint32 eventId = events.ExecuteEvent()) - { - switch (eventId) - { - default: - break; - } - - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; - } - */ - - DoMeleeAttackIfReady(); + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; + /* + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + default: + break; } - }; - CreatureAI* GetAI(Creature* creature) const override - { - return GetZulGurubAI<boss_wushoolayAI>(creature); + if (me->HasUnitState(UNIT_STATE_CASTING)) + return; } + */ + + DoMeleeAttackIfReady(); + } }; void AddSC_boss_wushoolay() { - new boss_wushoolay(); + RegisterZulGurubCreatureAI(boss_wushoolay); } |