diff options
Diffstat (limited to 'src')
8 files changed, 66 insertions, 56 deletions
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 8b83c9bf3bf..e15fa76b15b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -49,7 +49,7 @@ enum ErekemEvents EVENT_LIGHTNING_BOLT, EVENT_EARTH_SHOCK, EVENT_WINDFURY, - EVENT_STORMSTRIKE, + EVENT_STORMSTRIKE }; class boss_erekem : public CreatureScript @@ -109,7 +109,6 @@ public: if (Creature* pGuard2 = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_EREKEM_GUARD_2))) pGuard2->Respawn(); - } void AttackStart(Unit* who) override @@ -285,6 +284,8 @@ public: DoCastVictim(SPELL_STORMSTRIKE); events.ScheduleEvent(EVENT_STORMSTRIKE, urand(1500, 2000)); break; + default: + break; } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 2de6d1b576f..53a5e0a55a8 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -52,18 +52,18 @@ enum Yells enum Actions { - ACTION_WATER_ELEMENT_HIT = 1, + ACTION_WATER_ELEMENT_HIT = 1 }; enum IchoronEvents { EVENT_WATER_BLAST = 1, - EVENT_WATER_BOLT_VOLLEY, + EVENT_WATER_BOLT_VOLLEY }; enum GlobuleEvents { - EVENT_GLOBULE_MOVE = 1, + EVENT_GLOBULE_MOVE = 1 }; enum Misc @@ -72,7 +72,7 @@ enum Misc DATA_DEHYDRATION = 1 }; -Position globulePaths[10] = +Position const globulePaths[10] = { // first target { 1861.357f, 804.039f, 44.008f, 6.268f }, @@ -399,15 +399,15 @@ public: switch (uint32 eventId = events.ExecuteEvent()) { - case EVENT_WATER_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_WATER_BLAST); - events.ScheduleEvent(EVENT_WATER_BLAST, urand(6000, 9000)); - break; - case EVENT_WATER_BOLT_VOLLEY: - DoCast(SPELL_WATER_BOLT_VOLLEY); - events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(10000, 15000)); - break; + case EVENT_WATER_BLAST: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_WATER_BLAST); + events.ScheduleEvent(EVENT_WATER_BLAST, urand(6000, 9000)); + break; + case EVENT_WATER_BOLT_VOLLEY: + DoCast(SPELL_WATER_BOLT_VOLLEY); + events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(10000, 15000)); + break; } DoMeleeAttackIfReady(); @@ -500,7 +500,6 @@ public: if (events.ExecuteEvent() == EVENT_GLOBULE_MOVE) me->GetMotionMaster()->MovePoint(1, globulePaths[pathId + 1]); - } private: diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 62ea86c04a4..81464eb7d01 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -24,7 +24,7 @@ enum Spells SPELL_CAUTERIZING_FLAMES = 59466, // Only in heroic SPELL_FIREBOLT = 54235, SPELL_FLAME_BREATH = 54282, - SPELL_LAVA_BURN = 54249, + SPELL_LAVA_BURN = 54249 }; enum LavanthorEvents @@ -32,7 +32,7 @@ enum LavanthorEvents EVENT_CAUTERIZING_FLAMES = 1, EVENT_FIREBOLT, EVENT_FLAME_BREATH, - EVENT_LAVA_BURN, + EVENT_LAVA_BURN }; class boss_lavanthor : public CreatureScript @@ -103,24 +103,26 @@ public: switch (uint32 eventId = events.ExecuteEvent()) { - case EVENT_FIREBOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_FIREBOLT); - events.ScheduleEvent(EVENT_FIREBOLT, urand(5000, 13000)); - break; - case EVENT_FLAME_BREATH: - DoCast(SPELL_FLAME_BREATH); - events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 15000)); - break; - case EVENT_LAVA_BURN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(target, SPELL_LAVA_BURN); - events.ScheduleEvent(EVENT_LAVA_BURN, urand(15000, 23000)); - break; - case EVENT_CAUTERIZING_FLAMES: - DoCast(SPELL_CAUTERIZING_FLAMES); - events.ScheduleEvent(EVENT_CAUTERIZING_FLAMES, urand(10000, 16000)); - break; + case EVENT_FIREBOLT: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_FIREBOLT); + events.ScheduleEvent(EVENT_FIREBOLT, urand(5000, 13000)); + break; + case EVENT_FLAME_BREATH: + DoCast(SPELL_FLAME_BREATH); + events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 15000)); + break; + case EVENT_LAVA_BURN: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(target, SPELL_LAVA_BURN); + events.ScheduleEvent(EVENT_LAVA_BURN, urand(15000, 23000)); + break; + case EVENT_CAUTERIZING_FLAMES: + DoCast(SPELL_CAUTERIZING_FLAMES); + events.ScheduleEvent(EVENT_CAUTERIZING_FLAMES, urand(10000, 16000)); + break; + default: + break; } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index df01b0d4a17..5980a9a464b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -17,6 +17,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SpellScript.h" +#include "SpellAuraEffects.h" #include "violet_hold.h" enum Spells @@ -29,13 +31,13 @@ enum Spells // Visual SPELL_OPTIC_LINK_LEVEL_1 = 54393, SPELL_OPTIC_LINK_LEVEL_2 = 54394, - SPELL_OPTIC_LINK_LEVEL_3 = 54395, + SPELL_OPTIC_LINK_LEVEL_3 = 54395 }; enum MoraggEvents { EVENT_CORROSIVE_SALIVA = 1, - EVENT_OPTIC_LINK, + EVENT_OPTIC_LINK }; class boss_moragg : public CreatureScript @@ -117,6 +119,8 @@ public: DoCastVictim(SPELL_CORROSIVE_SALIVA); events.ScheduleEvent(EVENT_CORROSIVE_SALIVA, 10000); break; + default: + break; } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 9deac82ca3a..5fad77595a6 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -17,8 +17,10 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "violet_hold.h" +#include "SpellInfo.h" +#include "SpellScript.h" #include "Player.h" +#include "violet_hold.h" enum Spells { @@ -179,12 +181,12 @@ public: Talk(SAY_SUMMON_ENERGY); } - void UpdateAI(uint32 uiDiff) override + void UpdateAI(uint32 diff) override { if (!UpdateVictim()) return; - events.Update(uiDiff); + events.Update(diff); if (me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -218,6 +220,8 @@ public: else if (Creature* sphere = me->FindNearestCreature(NPC_ETHEREAL_SPHERE2, 150.0f)) sphere->GetAI()->DoAction(1); break; + default: + break; } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 32dc18d2cf3..f161936ab23 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -185,19 +185,21 @@ public: switch (uint32 eventId = events.ExecuteEvent()) { - case EVENT_SUMMON_VOID: - DoCast(SPELL_SUMMON_VOID_SENTRY); - events.ScheduleEvent(EVENT_SUMMON_VOID, urand(7000, 10000)); - break; - case EVENT_VOID_SHIFT: - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(unit, SPELL_VOID_SHIFT); - events.ScheduleEvent(EVENT_VOID_SHIFT, 15000); - break; - case EVENT_SHROUD_OF_DARKNESS: - DoCast(SPELL_SHROUD_OF_DARKNESS); - events.ScheduleEvent(EVENT_SHROUD_OF_DARKNESS, urand(18000, 20000)); - break; + case EVENT_SUMMON_VOID: + DoCast(SPELL_SUMMON_VOID_SENTRY); + events.ScheduleEvent(EVENT_SUMMON_VOID, urand(7000, 10000)); + break; + case EVENT_VOID_SHIFT: + if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(unit, SPELL_VOID_SHIFT); + events.ScheduleEvent(EVENT_VOID_SHIFT, 15000); + break; + case EVENT_SHROUD_OF_DARKNESS: + DoCast(SPELL_SHROUD_OF_DARKNESS); + events.ScheduleEvent(EVENT_SHROUD_OF_DARKNESS, urand(18000, 20000)); + break; + default: + break; } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index e8ea47e09f3..652b4815be0 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -215,7 +215,6 @@ public: creature->AllLootRemovedFromCorpse(); creature->RemoveLootMode(1); } - } void OnGameObjectCreate(GameObject* go) override diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 1a5ec7ea0d7..d860180fb0c 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -1442,7 +1442,6 @@ public: } }; - class npc_violet_hold_arcane_sphere : public CreatureScript { public: |