diff options
Diffstat (limited to 'src')
3 files changed, 3 insertions, 207 deletions
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index c29ba834e96..eaefeabf71c 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -37,12 +37,7 @@ enum Spells SPELL_CRUSHING_LEAP = 58960, SPELL_STOMP = 58663, SPELL_IMPALE = 58666, - SPELL_BERSERK = 47008, - - // Archavon Warders - SPELL_ROCK_SHOWER = 60919, - SPELL_SHIELD_CRUSH = 60897, - SPELL_WHIRL = 60902 + SPELL_BERSERK = 47008 }; enum Creatures @@ -58,11 +53,6 @@ enum Events EVENT_STOMP = 3, // 45s cd EVENT_IMPALE = 4, EVENT_BERSERK = 5, // 300s cd - - //mob - EVENT_ROCK_SHOWER = 6, // set = 20s cd, unkown cd - EVENT_SHIELD_CRUSH = 7, // set = 30s cd - EVENT_WHIRL = 8, // set= 10s cd }; class boss_archavon : public CreatureScript @@ -144,80 +134,6 @@ class boss_archavon : public CreatureScript } }; -/*###### -## Mob Archavon Warder -######*/ -class npc_archavon_warder : public CreatureScript -{ - public: - npc_archavon_warder() : CreatureScript("npc_archavon_warder") { } - - struct npc_archavon_warderAI : public ScriptedAI //npc 32353 - { - npc_archavon_warderAI(Creature* creature) : ScriptedAI(creature) - { - } - - EventMap events; - - void Reset() override - { - events.Reset(); - events.ScheduleEvent(EVENT_ROCK_SHOWER, 2s); - events.ScheduleEvent(EVENT_SHIELD_CRUSH, 20s); - events.ScheduleEvent(EVENT_WHIRL, 7s); - } - - void JustEngagedWith(Unit* /*who*/) override - { - DoZoneInCombat(); - } - - 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) - { - case EVENT_ROCK_SHOWER: - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) - DoCast(target, SPELL_ROCK_SHOWER); - events.ScheduleEvent(EVENT_ROCK_SHARDS, 6s); - break; - case EVENT_SHIELD_CRUSH: - DoCastVictim(SPELL_SHIELD_CRUSH); - events.ScheduleEvent(EVENT_SHIELD_CRUSH, 20s); - break; - case EVENT_WHIRL: - DoCastVictim(SPELL_WHIRL); - events.ScheduleEvent(EVENT_WHIRL, 8s); - break; - default: - break; - } - - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; - } - - DoMeleeAttackIfReady(); - } - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return GetVaultOfArchavonAI<npc_archavon_warderAI>(creature); - } -}; - // 58941 - Rock Shards class spell_archavon_rock_shards : public SpellScriptLoader { @@ -268,6 +184,5 @@ class spell_archavon_rock_shards : public SpellScriptLoader void AddSC_boss_archavon() { new boss_archavon(); - new npc_archavon_warder(); new spell_archavon_rock_shards(); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 497f39eec07..fc20b287973 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -26,11 +26,7 @@ enum Events EVENT_BURNING_BREATH = 1, EVENT_BURNING_FURY = 2, EVENT_FLAME_CINDER = 3, - EVENT_METEOR_FISTS = 4, - - // Flame Warder - EVENT_FW_LAVA_BIRST = 5, - EVENT_FW_METEOR_FISTS = 6 + EVENT_METEOR_FISTS = 4 }; enum Spells @@ -44,8 +40,6 @@ enum Spells SPELL_METEOR_FISTS_DAMAGE = 66765, // Spells Flame Warder - SPELL_FW_LAVA_BIRST = 66813, - SPELL_FW_METEOR_FISTS = 66808, SPELL_FW_METEOR_FISTS_DAMAGE = 66809 }; @@ -120,70 +114,6 @@ class boss_koralon : public CreatureScript } }; -/*###### -## Npc Flame Warder -######*/ -class npc_flame_warder : public CreatureScript -{ - public: - npc_flame_warder() : CreatureScript("npc_flame_warder") { } - - struct npc_flame_warderAI : public ScriptedAI - { - npc_flame_warderAI(Creature* creature) : ScriptedAI(creature) - { - } - - void Reset() override - { - events.Reset(); - } - - void JustEngagedWith(Unit* /*who*/) override - { - DoZoneInCombat(); - - events.ScheduleEvent(EVENT_FW_LAVA_BIRST, 5s); - events.ScheduleEvent(EVENT_FW_METEOR_FISTS, 10s); - } - - void UpdateAI(uint32 diff) override - { - if (!UpdateVictim()) - return; - - events.Update(diff); - - while (uint32 eventId = events.ExecuteEvent()) - { - switch (eventId) - { - case EVENT_FW_LAVA_BIRST: - DoCastVictim(SPELL_FW_LAVA_BIRST); - events.ScheduleEvent(EVENT_FW_LAVA_BIRST, 15s); - break; - case EVENT_FW_METEOR_FISTS: - DoCast(me, SPELL_FW_METEOR_FISTS); - events.ScheduleEvent(EVENT_FW_METEOR_FISTS, 20s); - break; - default: - break; - } - } - - DoMeleeAttackIfReady(); - } - - private: - EventMap events; - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return GetVaultOfArchavonAI<npc_flame_warderAI>(creature); - } -}; - class spell_koralon_meteor_fists : public SpellScriptLoader { public: @@ -294,7 +224,6 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader void AddSC_boss_koralon() { new boss_koralon(); - new npc_flame_warder(); new spell_koralon_meteor_fists(); new spell_koralon_meteor_fists_damage(); new spell_flame_warder_meteor_fists(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 9670a21799b..967a0782435 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -34,10 +34,6 @@ enum Spells SPELL_FROZEN_ORB_AURA = 72067, SPELL_RANDOM_AGGRO = 72084, - // Frost Warder - SPELL_FROST_BLAST = 72123, // don't know cd... using 20 secs. - SPELL_FROZEN_MALLET_2 = 72122, - // Frozen Orb Stalker FROZEN_ORB_STALKER_AURA = 72094 }; @@ -46,9 +42,7 @@ enum Events { EVENT_FREEZING_GROUND = 1, EVENT_FROZEN_ORB = 2, - EVENT_WHITEOUT = 3, - - EVENT_FROST_BLAST = 4 + EVENT_WHITEOUT = 3 }; struct boss_toravon : public BossAI @@ -117,47 +111,6 @@ struct npc_frozen_orb_stalker : public ScriptedAI } }; -struct npc_frost_warder : public ScriptedAI -{ - npc_frost_warder(Creature* creature) : ScriptedAI(creature) { } - - void Reset() override - { - _events.Reset(); - } - - void JustEngagedWith(Unit* /*who*/) override - { - DoZoneInCombat(); - - DoCastSelf(SPELL_FROZEN_MALLET_2); - - _events.ScheduleEvent(EVENT_FROST_BLAST, 5s); - } - - void UpdateAI(uint32 diff) override - { - if (!UpdateVictim()) - return; - - _events.Update(diff); - - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; - - if (_events.ExecuteEvent() == EVENT_FROST_BLAST) - { - DoCastVictim(SPELL_FROST_BLAST); - _events.ScheduleEvent(EVENT_FROST_BLAST, 20s); - } - - DoMeleeAttackIfReady(); - } - -private: - EventMap _events; -}; - struct npc_frozen_orb : public ScriptedAI { npc_frozen_orb(Creature* creature) : ScriptedAI(creature) { } @@ -211,7 +164,6 @@ class spell_toravon_random_aggro : public SpellScript void AddSC_boss_toravon() { RegisterVaultOfArchavonCreatureAI(boss_toravon); - RegisterVaultOfArchavonCreatureAI(npc_frost_warder); RegisterVaultOfArchavonCreatureAI(npc_frozen_orb_stalker); RegisterVaultOfArchavonCreatureAI(npc_frozen_orb); RegisterSpellScript(spell_toravon_random_aggro); |