diff options
Diffstat (limited to 'src/server/scripts/Northrend')
173 files changed, 4278 insertions, 4071 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h index 3a97117f520..8473ee1d39d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef DEF_AHNKAHET_H -#define DEF_AHNKAHET_H +#ifndef AHNKAHET_H_ +#define AHNKAHET_H_ enum Data64 { @@ -47,4 +47,4 @@ enum Data DATA_ALL_INITIAND_DEAD }; -#endif +#endif // AHNKAHET_H_ diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 725dd88f137..7a20d1f581c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -40,7 +40,7 @@ enum Creatures NPC_TRIGGER = 19656 }; -enum event +enum Events { EVENT_SPAWN = 1, EVENT_MINI, @@ -59,7 +59,7 @@ public: { boss_amanitarAI(Creature* creature) : BossAI(creature, DATA_AMANITAR) { } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -74,7 +74,7 @@ public: } } - void JustDied(Unit* /*Killer*/) + void JustDied(Unit* /*Killer*/) OVERRIDE { if (instance) { @@ -85,7 +85,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -129,7 +129,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -171,7 +171,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_amanitarAI(creature); } @@ -188,7 +188,7 @@ public: EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_AURA, 1 * IN_MILLISECONDS); @@ -202,16 +202,16 @@ public: DoCast(SPELL_POWER_MUSHROOM_VISUAL_AURA); } - void DamageTaken(Unit* /*attacker*/, uint32 &damage) + void DamageTaken(Unit* /*attacker*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && me->GetEntry() == NPC_HEALTHY_MUSHROOM) DoCast(me, SPELL_HEALTHY_MUSHROOM_POTENT_FUNGUS, true); } - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*victim*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*victim*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -240,7 +240,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_amanitar_mushroomsAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index 552009cc3e0..482617cbfd5 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -75,7 +75,7 @@ class boss_elder_nadox : public CreatureScript SummonList summons; EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -87,7 +87,7 @@ class boss_elder_nadox : public CreatureScript instance->SetData(DATA_ELDER_NADOX_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -104,19 +104,19 @@ class boss_elder_nadox : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); summon->AI()->DoZoneInCombat(); } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE { if (summon->GetEntry() == NPC_AHNKAHAR_GUARDIAN) GuardianDied = true; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_RESPECT_YOUR_ELDERS) return !GuardianDied ? 1 : 0; @@ -124,12 +124,12 @@ class boss_elder_nadox : public CreatureScript return 0; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -139,7 +139,7 @@ class boss_elder_nadox : public CreatureScript instance->SetData(DATA_ELDER_NADOX_EVENT, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -187,7 +187,7 @@ class boss_elder_nadox : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_elder_nadoxAI(creature); } @@ -204,7 +204,7 @@ class npc_ahnkahar_nerubian : public CreatureScript EventMap events; - void Reset() + void Reset() OVERRIDE { if (me->GetEntry() == NPC_AHNKAHAR_GUARDIAN) DoCast(me, SPELL_GUARDIAN_AURA, true); @@ -212,13 +212,13 @@ class npc_ahnkahar_nerubian : public CreatureScript events.ScheduleEvent(EVENT_SPRINT, 13 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (me->GetEntry() == NPC_AHNKAHAR_GUARDIAN) me->RemoveAurasDueToSpell(SPELL_GUARDIAN_AURA); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -242,7 +242,7 @@ class npc_ahnkahar_nerubian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ahnkahar_nerubianAI(creature); } @@ -262,14 +262,15 @@ public: creature->UpdateAllStats(); } - void Reset() {} - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*victim*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*victim*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nadox_eggsAI(creature); } @@ -301,14 +302,14 @@ public: targets.remove_if (GuardianCheck()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elder_nadox_guardian_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elder_nadox_guardian_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_elder_nadox_guardian_SpellScript(); } @@ -319,7 +320,7 @@ class achievement_respect_your_elders : public AchievementCriteriaScript public: achievement_respect_your_elders() : AchievementCriteriaScript("achievement_respect_your_elders") {} - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 21a019dc17d..9a96e787f87 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -88,7 +88,7 @@ public: return 100*(me->GetHealth()-damage)/me->GetMaxHealth(); } - void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) + void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) damage = 0; @@ -101,7 +101,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_INSANITY) { @@ -149,7 +149,7 @@ public: } } - void Reset() + void Reset() OVERRIDE { uiMindFlayTimer = 8*IN_MILLISECONDS; uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS; @@ -174,7 +174,7 @@ public: me->SetControlled(false, UNIT_STATE_STUNNED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -185,7 +185,7 @@ public: } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { Summons.Summon(summon); } @@ -214,7 +214,7 @@ public: return spell; } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { uint32 phase= summon->GetPhaseMask(); uint32 nextPhase = 0; @@ -258,7 +258,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -297,7 +297,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -308,13 +308,13 @@ public: ResetPlayersPhaseMask(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_volazjAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index d6d079eac17..5095f590fdb 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -57,8 +57,11 @@ const Position JedogaPosition[2] = {372.330994f, -705.278015f, -16.179716f, 5.427970f} }; -#define ACTION_INITIAND_KILLED 1 -#define DATA_VOLUNTEER_WORK 2 +enum Misc +{ + ACTION_INITIAND_KILLED = 1, + DATA_VOLUNTEER_WORK = 2 +}; class boss_jedoga_shadowseeker : public CreatureScript { @@ -89,7 +92,7 @@ public: bool volunteerWork; bool bFirstTime; - void Reset() + void Reset() OVERRIDE { uiOpFerTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); @@ -117,7 +120,7 @@ public: bFirstTime = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!instance || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; @@ -127,7 +130,7 @@ public: instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; @@ -135,7 +138,7 @@ public: ScriptedAI::AttackStart(who); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) OVERRIDE { if (!Victim || Victim->GetTypeId() != TYPEID_PLAYER) return; @@ -143,20 +146,20 @@ public: Talk(TEXT_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(TEXT_DEATH); if (instance) instance->SetData(DATA_JEDOGA_SHADOWSEEKER_EVENT, DONE); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_INITIAND_KILLED) volunteerWork = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_VOLUNTEER_WORK) return volunteerWork ? 1 : 0; @@ -164,7 +167,8 @@ public: return 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!instance || !who || (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_JEDOGA_CONTROLLER)) return; @@ -280,7 +284,7 @@ public: bCanDown = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -336,7 +340,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_jedoga_shadowseekerAI(creature); } @@ -360,7 +364,7 @@ public: bool bWalking; - void Reset() + void Reset() OVERRIDE { if (!instance) return; @@ -384,7 +388,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!killer || !instance) return; @@ -408,13 +412,13 @@ public: instance->SetData64(DATA_PL_JEDOGA_TARGET, killer->GetGUID()); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who) return; } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !victim) return; @@ -422,7 +426,8 @@ public: ScriptedAI::AttackStart(victim); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if ((instance && instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) || !who) return; @@ -430,7 +435,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE { if (uiType != POINT_MOTION_TYPE || !instance) return; @@ -451,7 +456,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance && bCheckTimer <= diff) { @@ -503,7 +508,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jedoga_initiandAI(creature); } @@ -543,12 +548,13 @@ public: bool bCasted; bool bCasted2; - void Reset() {} - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*victim*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*victim*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!instance) return; @@ -588,7 +594,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jedogas_aufseher_triggerAI(creature); } @@ -601,7 +607,7 @@ class achievement_volunteer_work : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 72bae8c17d4..2cfc714c1f7 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -21,7 +21,7 @@ enum Spells { - SPELL_BLOODTHIRST = 55968, //Trigger Spell + add aura + SPELL_BLOODTHIRST = 55968, // Trigger Spell + add aura SPELL_CONJURE_FLAME_SPHERE = 55931, SPELL_FLAME_SPHERE_SUMMON_1 = 55895, // 1x 30106 H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511, // 1x 31686 @@ -40,14 +40,16 @@ enum Spells H_CREATURE_FLAME_SPHERE_2 = 31687, SPELL_HOVER_FALL = 60425 }; + enum Misc { DATA_EMBRACE_DMG = 20000, H_DATA_EMBRACE_DMG = 40000, - DATA_SPHERE_DISTANCE = 15 + DATA_SPHERE_DISTANCE = 15 }; -#define DATA_SPHERE_ANGLE_OFFSET 0.7f -#define DATA_GROUND_POSITION_Z 11.30809f + +#define DATA_SPHERE_ANGLE_OFFSET 0.7f +#define DATA_GROUND_POSITION_Z 11.30809f enum Yells { @@ -100,7 +102,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiBloodthirstTimer = 10*IN_MILLISECONDS; uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); @@ -114,14 +116,14 @@ public: instance->SetData(DATA_PRINCE_TALDARAM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_PRINCE_TALDARAM_EVENT, IN_PROGRESS); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -243,7 +245,7 @@ public: } else uiPhaseTimer -= diff; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { Unit* pEmbraceTarget = GetEmbraceTarget(); @@ -260,7 +262,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -268,7 +270,7 @@ public: instance->SetData(DATA_PRINCE_TALDARAM_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -328,7 +330,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_taldaramAI(creature); } @@ -349,7 +351,7 @@ public: uint32 uiDespawnTimer; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); //! HACK: Creature's can't have MOVEMENTFLAG_FLYING @@ -362,15 +364,16 @@ public: uiDespawnTimer = 10*IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_FLAME_SPHERE_DEATH_EFFECT); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiDespawnTimer <= diff) me->DisappearAndDie(); @@ -379,7 +382,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_taldaram_flamesphereAI(creature); } @@ -390,7 +393,7 @@ class prince_taldaram_sphere : public GameObjectScript public: prince_taldaram_sphere() : GameObjectScript("prince_taldaram_sphere") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 13c0a6a3b59..655a1d94e59 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -146,7 +146,7 @@ public: } } - void SetData64(uint32 idx, uint64 guid) + void SetData64(uint32 idx, uint64 guid) OVERRIDE { switch (idx) { @@ -160,7 +160,7 @@ public: } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -193,7 +193,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -252,7 +252,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -328,7 +328,7 @@ public: } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_ahnkahet_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 344b0dfe03a..5970a85cc38 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -27,6 +27,7 @@ enum Data64 DATA_WATCHER_SILTHIK, DATA_WATCHER_NARJIL }; + enum Data { DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index dd196866032..7771451894e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -113,7 +113,7 @@ public: SummonList Summons; - void Reset() + void Reset() OVERRIDE { CarrionBeetlesTimer = 8*IN_MILLISECONDS; LeechingSwarmTimer = 20*IN_MILLISECONDS; @@ -154,7 +154,7 @@ public: return NULL; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DelayTimer = 0; @@ -168,7 +168,7 @@ public: instance->SetData(DATA_ANUBARAK_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -331,7 +331,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); Summons.DespawnAll(); @@ -339,7 +339,7 @@ public: instance->SetData(DATA_ANUBARAK_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -347,13 +347,13 @@ public: Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { Summons.Summon(summon); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_anub_arakAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 23705da6571..6b556f4fe4d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -72,7 +72,7 @@ public: float fMaxDistance; - void Reset() + void Reset() OVERRIDE { me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f); @@ -91,7 +91,7 @@ public: } //when Hadronox kills any enemy (that includes a party member) she will regain 10% of her HP if the target had Leech Poison on - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) OVERRIDE { // not sure if this aura check is correct, I think it is though if (!Victim || !Victim->HasAura(DUNGEON_MODE(SPELL_LEECH_POISON, H_SPELL_LEECH_POISON)) || !me->IsAlive()) @@ -100,13 +100,13 @@ public: me->ModifyHealth(int32(me->CountPctFromMaxHealth(10))); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_HADRONOX_EVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_HADRONOX_EVENT, IN_PROGRESS); @@ -134,7 +134,7 @@ public: EnterEvadeMode(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -190,7 +190,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hadronoxAI(creature); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index d5072eee741..2222d16f68b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -99,7 +99,7 @@ public: uint32 uiCurseFatigueTimer; uint32 uiSummonTimer; - void Reset() + void Reset() OVERRIDE { uiMindFlayTimer = 15*IN_MILLISECONDS; uiCurseFatigueTimer = 12*IN_MILLISECONDS; @@ -108,7 +108,7 @@ public: instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); Summon(); @@ -138,7 +138,7 @@ public: me->SummonCreature(NPC_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -171,7 +171,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -179,7 +179,7 @@ public: instance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -187,13 +187,13 @@ public: Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_krik_thirAI(creature); } @@ -208,14 +208,14 @@ public: { npc_skittering_infectorAI(Creature* creature) : ScriptedAI(creature) {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { //The spell is not working propperly DoCastVictim(SPELL_ACID_SPLASH, true); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_skittering_infectorAI(creature); } @@ -233,13 +233,13 @@ public: uint32 uiChargeTimer; uint32 uiBackstabTimer; - void Reset() + void Reset() OVERRIDE { uiChargeTimer = 11*IN_MILLISECONDS; uiBackstabTimer = 7*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -266,7 +266,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anub_ar_skirmisherAI(creature); } @@ -284,13 +284,13 @@ public: uint32 uiShadowBoltTimer; uint32 uiShadowNovaTimer; - void Reset() + void Reset() OVERRIDE { uiShadowBoltTimer = 6*IN_MILLISECONDS; uiShadowNovaTimer = 15*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -312,7 +312,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anub_ar_shadowcasterAI(creature); } @@ -330,13 +330,13 @@ public: uint32 uiCleaveTimer; uint32 uiStrikeTimer; - void Reset() + void Reset() OVERRIDE { uiCleaveTimer = 11*IN_MILLISECONDS; uiStrikeTimer = 6*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -357,7 +357,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anub_ar_warriorAI(creature); } @@ -375,18 +375,18 @@ public: uint32 uiWebWrapTimer; uint32 uiInfectedBiteTimer; - void Reset() + void Reset() OVERRIDE { uiWebWrapTimer = 11*IN_MILLISECONDS; uiInfectedBiteTimer = 4*IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_ENRAGE, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -408,7 +408,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_watcher_gashraAI(creature); } @@ -427,14 +427,14 @@ public: uint32 uiInfectedBiteTimer; uint32 uiBindingWebsTimer; - void Reset() + void Reset() OVERRIDE { uiWebWrapTimer = 11*IN_MILLISECONDS; uiInfectedBiteTimer = 4*IN_MILLISECONDS; uiBindingWebsTimer = 17*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -462,7 +462,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_watcher_narjilAI(creature); } @@ -481,14 +481,14 @@ public: uint32 uiInfectedBiteTimer; uint32 uiPoisonSprayTimer; - void Reset() + void Reset() OVERRIDE { uiWebWrapTimer = 11*IN_MILLISECONDS; uiInfectedBiteTimer = 4*IN_MILLISECONDS; uiPoisonSprayTimer = 15*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -518,7 +518,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_watcher_silthikAI(creature); } @@ -531,7 +531,7 @@ class achievement_watch_him_die : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 875aafe9826..65f817f148d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -105,7 +105,7 @@ public: } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -120,7 +120,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -149,7 +149,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -205,7 +205,7 @@ public: } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_azjol_nerub_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 84fad199958..a9f92521ef8 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -124,7 +124,10 @@ enum Enums POINT_ID_LAND = 200, }; -#define DATA_CAN_LOOT 0 +enum Misc +{ + DATA_CAN_LOOT = 0 +}; struct Waypoint { @@ -216,7 +219,7 @@ class boss_sartharion : public CreatureScript public: boss_sartharion() : CreatureScript("boss_sartharion") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_sartharionAI(creature); } @@ -252,7 +255,7 @@ public: uint8 drakeCount; - void Reset() + void Reset() OVERRIDE { m_bIsBerserk = false; m_bIsSoftEnraged = false; @@ -344,13 +347,13 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetData(TYPE_SARTHARION_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_SARTHARION_AGGRO); DoZoneInCombat(); @@ -362,7 +365,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_SARTHARION_DEATH); @@ -382,7 +385,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SARTHARION_SLAY); } @@ -399,7 +402,7 @@ public: me->AddLootMode(LOOT_MODE_HARD_MODE_1); // Add 1st Drake loot mode } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == TWILIGHT_ACHIEVEMENTS) return drakeCount; @@ -546,7 +549,7 @@ public: (*itr)->CastSpell(target, SPELL_LAVA_STRIKE, true); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -739,7 +742,7 @@ struct dummy_dragonAI : public ScriptedAI bool m_bCanMoveFree; bool m_bCanLoot; - void Reset() + void Reset() OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -751,13 +754,13 @@ struct dummy_dragonAI : public ScriptedAI m_bCanLoot = true; } - void SetData(uint32 type, uint32 value) + void SetData(uint32 type, uint32 value) OVERRIDE { if (type == DATA_CAN_LOOT) m_bCanLoot = value; } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE { if (!instance || uiType != POINT_MOTION_TYPE) return; @@ -897,7 +900,7 @@ struct dummy_dragonAI : public ScriptedAI //Refresh respawnTime so time again are set to 30secs? } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!m_bCanLoot) me->SetLootRecipient(NULL); @@ -953,7 +956,7 @@ struct dummy_dragonAI : public ScriptedAI } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (m_bCanMoveFree && m_uiMoveNextTimer) { @@ -981,7 +984,7 @@ class npc_tenebron : public CreatureScript public: npc_tenebron() : CreatureScript("npc_tenebron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tenebronAI(creature); } @@ -996,7 +999,7 @@ public: bool m_bHasPortalOpen; - void Reset() + void Reset() OVERRIDE { m_uiShadowBreathTimer = 20000; m_uiShadowFissureTimer = 5000; @@ -1005,18 +1008,18 @@ public: m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_TENEBRON_AGGRO); DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_TENEBRON_SLAY); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //if no target, update dummy and return if (!UpdateVictim()) @@ -1070,7 +1073,7 @@ class npc_shadron : public CreatureScript public: npc_shadron() : CreatureScript("npc_shadron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadronAI(creature); } @@ -1085,7 +1088,7 @@ public: bool m_bHasPortalOpen; - void Reset() + void Reset() OVERRIDE { m_uiShadowBreathTimer = 20000; m_uiShadowFissureTimer = 5000; @@ -1100,18 +1103,18 @@ public: m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_SHADRON_AGGRO); DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SHADRON_SLAY); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //if no target, update dummy and return if (!UpdateVictim()) @@ -1174,7 +1177,7 @@ class npc_vesperon : public CreatureScript public: npc_vesperon() : CreatureScript("npc_vesperon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_vesperonAI(creature); } @@ -1189,7 +1192,7 @@ public: bool m_bHasPortalOpen; - void Reset() + void Reset() OVERRIDE { m_uiShadowBreathTimer = 20000; m_uiShadowFissureTimer = 5000; @@ -1198,18 +1201,18 @@ public: m_bHasPortalOpen = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_VESPERON_AGGRO); DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_VESPERON_SLAY); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //if no target, update dummy and return if (!UpdateVictim()) @@ -1269,7 +1272,7 @@ class npc_acolyte_of_shadron : public CreatureScript public: npc_acolyte_of_shadron() : CreatureScript("npc_acolyte_of_shadron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_acolyte_of_shadronAI(creature); } @@ -1284,7 +1287,7 @@ public: InstanceScript* instance; uint32 uiDespawnTimer; - void Reset() + void Reset() OVERRIDE { uiDespawnTimer = 28000; if (instance) @@ -1308,7 +1311,7 @@ public: me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -1351,7 +1354,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiDespawnTimer < uiDiff) { @@ -1379,7 +1382,7 @@ class npc_acolyte_of_vesperon : public CreatureScript public: npc_acolyte_of_vesperon() : CreatureScript("npc_acolyte_of_vesperon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_acolyte_of_vesperonAI(creature); } @@ -1394,7 +1397,7 @@ public: InstanceScript* instance; uint32 uiDespawnTimer; - void Reset() + void Reset() OVERRIDE { uiDespawnTimer = 28000; if (instance) @@ -1404,7 +1407,7 @@ public: DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP_ACO); @@ -1446,7 +1449,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiDespawnTimer < uiDiff) { @@ -1474,7 +1477,7 @@ class npc_twilight_eggs : public CreatureScript public: npc_twilight_eggs() : CreatureScript("npc_twilight_eggs") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_twilight_eggsAI(creature); } @@ -1492,7 +1495,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -1513,12 +1516,12 @@ public: me->DealDamage(me, me->GetHealth()); } - void JustSummoned(Creature* who) + void JustSummoned(Creature* who) OVERRIDE { who->SetInCombatWithZone(); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (m_uiHatchEggTimer <= uiDiff) { @@ -1531,8 +1534,9 @@ public: m_uiHatchEggTimer -= uiDiff; } - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + }; }; @@ -1545,7 +1549,7 @@ class npc_flame_tsunami : public CreatureScript public: npc_flame_tsunami() : CreatureScript("npc_flame_tsunami") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_flame_tsunamiAI(creature); } @@ -1562,7 +1566,7 @@ public: uint32 TsunamiBuff_timer; uint32 entry; - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); Tsunami_Timer = 100; @@ -1572,7 +1576,7 @@ public: entry = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Tsunami_Timer <= diff) { @@ -1597,7 +1601,7 @@ class npc_twilight_fissure : public CreatureScript public: npc_twilight_fissure() : CreatureScript("npc_twilight_fissure") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_twilight_fissureAI(creature); } @@ -1611,7 +1615,7 @@ public: uint32 VoidBlast_Timer; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -1620,7 +1624,7 @@ public: VoidBlast_Timer = 5000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (VoidBlast_Timer <= diff) { @@ -1646,7 +1650,7 @@ class npc_twilight_whelp : public CreatureScript public: npc_twilight_whelp() : CreatureScript("npc_twilight_whelp") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_twilight_whelpAI(creature); } @@ -1660,14 +1664,14 @@ public: uint32 m_uiFadeArmorTimer; - void Reset() + void Reset() OVERRIDE { me->RemoveAllAuras(); me->SetInCombatWithZone(); m_uiFadeArmorTimer = 1000; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -1695,7 +1699,7 @@ class achievement_twilight_assist : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; @@ -1715,7 +1719,7 @@ class achievement_twilight_duo : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; @@ -1735,7 +1739,7 @@ class achievement_twilight_zone : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index c602e0b1a9e..b1d03b58bc9 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -30,7 +30,7 @@ class instance_obsidian_sanctum : public InstanceMapScript public: instance_obsidian_sanctum() : InstanceMapScript("instance_obsidian_sanctum", 615) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_obsidian_sanctum_InstanceMapScript(map); } @@ -96,7 +96,7 @@ public: } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) OVERRIDE { if (uiType == TYPE_SARTHARION_EVENT) m_auiEncounter[0] = uiData; @@ -108,7 +108,7 @@ public: m_bVesperonKilled = true; } - uint32 GetData(uint32 uiType) const + uint32 GetData(uint32 uiType) const OVERRIDE { if (uiType == TYPE_SARTHARION_EVENT) return m_auiEncounter[0]; @@ -122,7 +122,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) const + uint64 GetData64(uint32 uiData) const OVERRIDE { switch (uiData) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index 7318e73dea1..7d2403be469 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -18,7 +18,7 @@ #ifndef DEF_OBSIDIAN_SANCTUM_H #define DEF_OBSIDIAN_SANCTUM_H -enum eTypes +enum DataTypes { TYPE_SARTHARION_EVENT = 1, TYPE_TENEBRON_PREKILLED = 2, @@ -28,12 +28,19 @@ enum eTypes DATA_SARTHARION = 10, DATA_TENEBRON = 11, DATA_SHADRON = 12, - DATA_VESPERON = 13, + DATA_VESPERON = 13 +}; +enum CreaturesIds +{ NPC_SARTHARION = 28860, NPC_TENEBRON = 30452, NPC_SHADRON = 30451, - NPC_VESPERON = 30449, + NPC_VESPERON = 30449 +}; + +enum GameObjectIds +{ GO_TWILIGHT_PORTAL = 193988 }; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index d3a685bc6ba..a92df96113c 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -76,7 +76,7 @@ class boss_baltharus_the_warborn : public CreatureScript _introDone = false; } - void Reset() + void Reset() OVERRIDE { _Reset(); events.SetPhase(PHASE_INTRO); @@ -85,7 +85,7 @@ class boss_baltharus_the_warborn : public CreatureScript instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetMaxHealth()); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -110,7 +110,7 @@ class boss_baltharus_the_warborn : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->InterruptNonMeleeSpells(false); _EnterCombat(); @@ -122,7 +122,7 @@ class boss_baltharus_the_warborn : public CreatureScript Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -130,20 +130,20 @@ class boss_baltharus_the_warborn : public CreatureScript xerestrasza->AI()->DoAction(ACTION_BALTHARUS_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); summon->SetHealth(me->GetHealth()); summon->CastSpell(summon, SPELL_SPAWN_EFFECT, true); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) { @@ -162,7 +162,7 @@ class boss_baltharus_the_warborn : public CreatureScript instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { bool introPhase = events.IsInPhase(PHASE_INTRO); if (!UpdateVictim() && !introPhase) @@ -215,7 +215,7 @@ class boss_baltharus_the_warborn : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<boss_baltharus_the_warbornAI>(creature); } @@ -233,7 +233,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); _events.Reset(); @@ -242,14 +242,14 @@ class npc_baltharus_the_warborn_clone : public CreatureScript _events.ScheduleEvent(EVENT_ENERVATING_BRAND, urand(10000, 15000)); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { // Setting DATA_BALTHARUS_SHARED_HEALTH to 0 when killed would bug the boss. if (_instance && me->GetHealth() > damage) _instance->SetData(DATA_BALTHARUS_SHARED_HEALTH, me->GetHealth() - damage); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { // This is here because DamageTaken wont trigger if the damage is deadly. if (_instance) @@ -257,7 +257,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript killer->Kill(baltharus); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -301,7 +301,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_baltharus_the_warborn_cloneAI>(creature); } @@ -325,13 +325,13 @@ class spell_baltharus_enervating_brand_trigger : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_baltharus_enervating_brand_trigger_SpellScript::CheckDistance); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_baltharus_enervating_brand_trigger_SpellScript(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index c616d44816c..175a64f49a5 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -94,14 +94,14 @@ class boss_general_zarithrian : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); if (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -111,36 +111,36 @@ class boss_general_zarithrian : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_ADDS, 40000); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); instance->SetBossState(DATA_GENERAL_ZARITHRIAN, FAIL); } // Override to not set adds in combat yet. - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - bool CanAIAttack(Unit const* /*target*/) const + bool CanAIAttack(Unit const* /*target*/) const OVERRIDE { return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -189,7 +189,7 @@ class boss_general_zarithrian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<boss_general_zarithrianAI>(creature); } @@ -207,7 +207,7 @@ class npc_onyx_flamecaller : public CreatureScript npc_escortAI::SetDespawnAtEnd(false); } - void Reset() + void Reset() OVERRIDE { _lavaGoutCount = 0; me->setActive(true); @@ -215,26 +215,26 @@ class npc_onyx_flamecaller : public CreatureScript Start(true, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_BLAST_NOVA, urand(20000, 30000)); _events.ScheduleEvent(EVENT_LAVA_GOUT, 5000); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { // Prevent EvadeMode } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { // Let Zarithrian count as summoner. _instance cant be null since we got GetRubySanctumAI if (Creature* zarithrian = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_GENERAL_ZARITHRIAN))) zarithrian->AI()->JustSummoned(me); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == MAX_PATH_FLAMECALLER_WAYPOINTS || waypointId == MAX_PATH_FLAMECALLER_WAYPOINTS*2) { @@ -257,7 +257,7 @@ class npc_onyx_flamecaller : public CreatureScript } } - void UpdateEscortAI(uint32 const diff) + void UpdateEscortAI(uint32 const diff) OVERRIDE { if (!UpdateVictim()) return; @@ -299,7 +299,7 @@ class npc_onyx_flamecaller : public CreatureScript uint8 _lavaGoutCount; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_onyx_flamecallerAI>(creature); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 0018722e01f..189b1489940 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -220,7 +220,7 @@ struct generic_halionAI : public BossAI { generic_halionAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId), _canEvade(false) { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); me->AddAura(SPELL_TWILIGHT_PRECISION, me); @@ -230,19 +230,19 @@ struct generic_halionAI : public BossAI events.ScheduleEvent(EVENT_BREATH, urand(10000, 15000)); } - void Reset() + void Reset() OVERRIDE { _canEvade = false; _Reset(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); _JustReachedHome(); } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -261,7 +261,7 @@ struct generic_halionAI : public BossAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -274,7 +274,7 @@ struct generic_halionAI : public BossAI DoMeleeAttackIfReady(); } - void SetData(uint32 index, uint32 dataValue) + void SetData(uint32 index, uint32 dataValue) OVERRIDE { switch (index) { @@ -286,7 +286,7 @@ struct generic_halionAI : public BossAI } } - void SpellHit(Unit* /*who*/, SpellInfo const* spellInfo) + void SpellHit(Unit* /*who*/, SpellInfo const* spellInfo) OVERRIDE { if (spellInfo->Id == SPELL_TWILIGHT_MENDING) Talk(SAY_REGENERATE); @@ -308,7 +308,7 @@ class boss_halion : public CreatureScript me->SetHomePosition(HalionSpawnPos); } - void Reset() + void Reset() OVERRIDE { generic_halionAI::Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -316,14 +316,14 @@ class boss_halion : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { // Phase 1: We always can evade. Phase 2 & 3: We can evade if and only if the controller tells us to. if (events.IsInPhase(PHASE_ONE) || _canEvade) generic_halionAI::EnterEvadeMode(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_AGGRO); @@ -343,7 +343,7 @@ class boss_halion : public CreatureScript controller->AI()->SetData(DATA_FIGHT_PHASE, PHASE_ONE); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -361,7 +361,7 @@ class boss_halion : public CreatureScript Position const* GetMeteorStrikePosition() const { return &_meteorStrikePos; } - void DamageTaken(Unit* attacker, uint32& damage) + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(75, damage) && events.IsInPhase(PHASE_ONE)) { @@ -388,7 +388,7 @@ class boss_halion : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (events.IsInPhase(PHASE_TWO)) return; @@ -396,7 +396,7 @@ class boss_halion : public CreatureScript generic_halionAI::UpdateAI(diff); } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -430,7 +430,7 @@ class boss_halion : public CreatureScript } } - void SetData(uint32 index, uint32 value) + void SetData(uint32 index, uint32 value) OVERRIDE { switch (index) { @@ -446,7 +446,7 @@ class boss_halion : public CreatureScript Position _meteorStrikePos; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<boss_halionAI>(creature); } @@ -477,7 +477,7 @@ class boss_twilight_halion : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { events.Reset(); events.SetPhase(PHASE_TWO); @@ -490,9 +490,9 @@ class boss_twilight_halion : public CreatureScript } // Never evade - void EnterEvadeMode() { } + void EnterEvadeMode() OVERRIDE {} - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); @@ -501,7 +501,7 @@ class boss_twilight_halion : public CreatureScript me->CastSpell(victim, SPELL_LEAVE_TWILIGHT_REALM, true); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (Creature* halion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION))) { @@ -520,7 +520,7 @@ class boss_twilight_halion : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void DamageTaken(Unit* attacker, uint32& damage) + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(50, damage) && events.IsInPhase(PHASE_TWO)) { @@ -542,7 +542,7 @@ class boss_twilight_halion : public CreatureScript } } - void SpellHit(Unit* who, SpellInfo const* spell) + void SpellHit(Unit* who, SpellInfo const* spell) OVERRIDE { switch (spell->Id) { @@ -556,7 +556,7 @@ class boss_twilight_halion : public CreatureScript } } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -575,7 +575,7 @@ class boss_twilight_halion : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<boss_twilight_halionAI>(creature); } @@ -594,7 +594,7 @@ class npc_halion_controller : public CreatureScript me->SetPhaseMask(me->GetPhaseMask() | 0x20, true); } - void Reset() + void Reset() OVERRIDE { _summons.DespawnAll(); _events.Reset(); @@ -605,12 +605,12 @@ class npc_halion_controller : public CreatureScript DoCast(me, SPELL_CLEAR_DEBUFFS); } - void JustSummoned(Creature* who) + void JustSummoned(Creature* who) OVERRIDE { _summons.Summon(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _events.Reset(); _summons.DespawnAll(); @@ -618,7 +618,7 @@ class npc_halion_controller : public CreatureScript DoCast(me, SPELL_CLEAR_DEBUFFS); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _twilightDamageTaken = 0; _materialDamageTaken = 0; @@ -626,7 +626,7 @@ class npc_halion_controller : public CreatureScript _events.ScheduleEvent(EVENT_TRIGGER_BERSERK, 8 * MINUTE * IN_MILLISECONDS); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (Creature* twilightHalion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TWILIGHT_HALION))) twilightHalion->DespawnOrUnsummon(); @@ -640,7 +640,7 @@ class npc_halion_controller : public CreatureScript _instance->SetBossState(DATA_HALION, FAIL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -682,7 +682,7 @@ class npc_halion_controller : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // The IsInCombat() check is needed because that check should be false when Halion is // not engaged, while it would return true without as UpdateVictim() checks for @@ -749,7 +749,7 @@ class npc_halion_controller : public CreatureScript } } - void SetData(uint32 id, uint32 value) + void SetData(uint32 id, uint32 value) OVERRIDE { switch (id) { @@ -890,7 +890,7 @@ class npc_halion_controller : public CreatureScript uint8 _materialCorporealityValue; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_halion_controllerAI>(creature); } @@ -911,7 +911,7 @@ class npc_orb_carrier : public CreatureScript ASSERT(creature->GetVehicleKit()); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { /// According to sniffs this spell is cast every 1 or 2 seconds. /// However, refreshing it looks bad, so just cast the spell if @@ -927,7 +927,7 @@ class npc_orb_carrier : public CreatureScript me->SetFacingToObject(rotationFocus); // setInFront } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_SHOOT) { @@ -961,7 +961,7 @@ class npc_orb_carrier : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_orb_carrierAI>(creature); } @@ -980,7 +980,7 @@ class npc_meteor_strike_initial : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -993,7 +993,7 @@ class npc_meteor_strike_initial : public CreatureScript } } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { Creature* owner = summoner->ToCreature(); if (!owner) @@ -1028,14 +1028,14 @@ class npc_meteor_strike_initial : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) { } - void EnterEvadeMode() { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void EnterEvadeMode() OVERRIDE {} private: InstanceScript* _instance; std::list<Creature*> _meteorList; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_meteor_strike_initialAI>(creature); } @@ -1057,7 +1057,7 @@ class npc_meteor_strike : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_METEOR_STRIKE_BURN) { @@ -1067,14 +1067,14 @@ class npc_meteor_strike : public CreatureScript } } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { // Let Halion Controller count as summoner. if (Creature* controller = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION_CONTROLLER))) controller->AI()->JustSummoned(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_spawnCount > 5) return; @@ -1106,7 +1106,7 @@ class npc_meteor_strike : public CreatureScript uint8 _spawnCount; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_meteor_strikeAI>(creature); } @@ -1146,7 +1146,7 @@ class npc_combustion_consumption : public CreatureScript me->SetPhaseMask(0x01 | 0x20, true); } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { // Let Halion Controller count as summoner if (Creature* controller = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION_CONTROLLER))) @@ -1155,7 +1155,7 @@ class npc_combustion_consumption : public CreatureScript _summonerGuid = summoner->GetGUID(); } - void SetData(uint32 type, uint32 stackAmount) + void SetData(uint32 type, uint32 stackAmount) OVERRIDE { Unit* summoner = ObjectAccessor::GetUnit(*me, _summonerGuid); @@ -1169,7 +1169,7 @@ class npc_combustion_consumption : public CreatureScript summoner->CastCustomSpell(_explosionSpell, SPELLVALUE_BASE_POINT0, damage, summoner); } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} private: InstanceScript* _instance; @@ -1178,7 +1178,7 @@ class npc_combustion_consumption : public CreatureScript uint64 _summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_combustion_consumptionAI>(creature); } @@ -1193,7 +1193,7 @@ class npc_living_inferno : public CreatureScript { npc_living_infernoAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { me->SetInCombatWithZone(); me->CastSpell(me, SPELL_BLAZING_AURA, true); @@ -1203,13 +1203,13 @@ class npc_living_inferno : public CreatureScript controller->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->DespawnOrUnsummon(1); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_living_infernoAI>(creature); } @@ -1225,30 +1225,30 @@ class npc_living_ember : public CreatureScript { npc_living_emberAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { _hasEnraged = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _enrageTimer = 20000; _hasEnraged = false; } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { if (InstanceScript* instance = me->GetInstanceScript()) if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION_CONTROLLER))) controller->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->DespawnOrUnsummon(1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -1268,7 +1268,7 @@ class npc_living_ember : public CreatureScript bool _hasEnraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_living_emberAI>(creature); } @@ -1302,14 +1302,14 @@ class go_twilight_portal : public GameObjectScript } } - bool GossipHello(Player* player) + bool GossipHello(Player* player) OVERRIDE { if (_spellId != 0) player->CastSpell(player, _spellId, true); return true; } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (_instance->GetBossState(DATA_HALION) == IN_PROGRESS) return; @@ -1327,7 +1327,7 @@ class go_twilight_portal : public GameObjectScript bool _deleted; }; - GameObjectAI* GetAI(GameObject* gameobject) const + GameObjectAI* GetAI(GameObject* gameobject) const OVERRIDE { return GetRubySanctumAI<go_twilight_portalAI>(gameobject); } @@ -1352,13 +1352,13 @@ class spell_halion_meteor_strike_marker : public SpellScriptLoader creCaster->AI()->DoAction(ACTION_METEOR_STRIKE_AOE); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_halion_meteor_strike_marker_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_halion_meteor_strike_marker_AuraScript(); } @@ -1376,7 +1376,7 @@ class spell_halion_combustion_consumption : public SpellScriptLoader public: spell_halion_combustion_consumption_AuraScript(uint32 spellID) : AuraScript(), _markSpell(spellID) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_markSpell)) return false; @@ -1402,7 +1402,7 @@ class spell_halion_combustion_consumption : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _markSpell, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_halion_combustion_consumption_AuraScript::AddMarkStack, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); AfterEffectApply += AuraEffectApplyFn(spell_halion_combustion_consumption_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); @@ -1412,7 +1412,7 @@ class spell_halion_combustion_consumption : public SpellScriptLoader uint32 _markSpell; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_halion_combustion_consumption_AuraScript(_spellID); } @@ -1435,7 +1435,7 @@ class spell_halion_marks : public SpellScriptLoader spell_halion_marks_AuraScript(uint32 summonSpell, uint32 removeSpell) : AuraScript(), _summonSpellId(summonSpell), _removeSpellId(removeSpell) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_summonSpellId)) return false; @@ -1462,7 +1462,7 @@ class spell_halion_marks : public SpellScriptLoader GetTarget()->CastCustomSpell(_summonSpellId, SPELLVALUE_BASE_POINT1, aurEff->GetBase()->GetStackAmount(), GetTarget(), TRIGGERED_FULL_MASK, NULL, NULL, GetCasterGUID()); } - void Register() + void Register() OVERRIDE { OnDispel += AuraDispelFn(spell_halion_marks_AuraScript::BeforeDispel); AfterEffectRemove += AuraEffectRemoveFn(spell_halion_marks_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -1472,7 +1472,7 @@ class spell_halion_marks : public SpellScriptLoader uint32 _removeSpellId; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_halion_marks_AuraScript(_summonSpell, _removeSpell); } @@ -1506,13 +1506,13 @@ class spell_halion_damage_aoe_summon : public SpellScriptLoader summon->AI()->SetData(DATA_STACKS_DISPELLED, GetSpellValue()->EffectBasePoints[EFFECT_1]); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_halion_damage_aoe_summon_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_halion_damage_aoe_summon_SpellScript(); } @@ -1534,7 +1534,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader _isApply(isApplyHandler), _beforeHitSpellId(beforeHitSpell) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_beforeHitSpellId)) return false; @@ -1559,7 +1559,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader instance->SendEncounterUnit(ENCOUNTER_FRAME_UNK7); } - void Register() + void Register() OVERRIDE { if (!_isApply) { @@ -1574,7 +1574,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader uint32 _beforeHitSpellId; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_halion_twilight_realm_handlers_AuraScript(_beforeHitSpell, _isApplyHandler); } @@ -1593,7 +1593,7 @@ class spell_halion_clear_debuffs : public SpellScriptLoader { PrepareSpellScript(spell_halion_clear_debuffs_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CLEAR_DEBUFFS)) return false; @@ -1608,13 +1608,13 @@ class spell_halion_clear_debuffs : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(GetSpellInfo()->Effects[effIndex].CalcValue()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_halion_clear_debuffs_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_halion_clear_debuffs_SpellScript(); } @@ -1663,13 +1663,13 @@ class spell_halion_twilight_cutter : public SpellScriptLoader unitList.clear(); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halion_twilight_cutter_SpellScript::RemoveNotBetween, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_halion_twilight_cutter_SpellScript(); } @@ -1691,13 +1691,13 @@ class spell_halion_twilight_phasing : public SpellScriptLoader caster->GetMap()->SummonCreature(NPC_TWILIGHT_HALION, HalionSpawnPos); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_halion_twilight_phasing_SpellScript::Phase); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_halion_twilight_phasing_SpellScript(); } @@ -1725,14 +1725,14 @@ class spell_halion_summon_exit_portals : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectLaunch += SpellEffectFn(spell_halion_summon_exit_portals_SpellScript::OnSummon, EFFECT_0, SPELL_EFFECT_SUMMON_OBJECT_WILD); OnEffectLaunch += SpellEffectFn(spell_halion_summon_exit_portals_SpellScript::OnSummon, EFFECT_1, SPELL_EFFECT_SUMMON_OBJECT_WILD); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_halion_summon_exit_portals_SpellScript(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index bdb0dc6209b..9f20cb4062a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -77,13 +77,13 @@ class boss_saviana_ragefire : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_AGGRESSIVE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -93,13 +93,13 @@ class boss_saviana_ragefire : public CreatureScript events.ScheduleEvent(EVENT_FLIGHT, 60000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); me->PlayDirectSound(SOUND_ID_DEATH); } - void MovementInform(uint32 type, uint32 point) + void MovementInform(uint32 type, uint32 point) OVERRIDE { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -128,20 +128,20 @@ class boss_saviana_ragefire : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); me->SetCanFly(false); me->SetDisableGravity(false); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -197,7 +197,7 @@ class boss_saviana_ragefire : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<boss_saviana_ragefireAI>(creature); } @@ -238,14 +238,14 @@ class spell_saviana_conflagration_init : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_CONFLAGRATION_2, false); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_saviana_conflagration_init_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_saviana_conflagration_init_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_saviana_conflagration_init_SpellScript(); } @@ -267,13 +267,13 @@ class spell_saviana_conflagration_throwback : public SpellScriptLoader GetHitUnit()->GetMotionMaster()->MovePoint(POINT_LAND, SavianaRagefireFlyInPos); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_saviana_conflagration_throwback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_saviana_conflagration_throwback_SpellScript(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index abfa2df5c97..15e7c8227e9 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -181,7 +181,7 @@ class instance_ruby_sanctum : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -278,7 +278,7 @@ class instance_ruby_sanctum : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type != DATA_BALTHARUS_SHARED_HEALTH) return; @@ -286,7 +286,7 @@ class instance_ruby_sanctum : public InstanceMapScript BaltharusSharedHealth = data; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type != DATA_BALTHARUS_SHARED_HEALTH) return 0; @@ -365,7 +365,7 @@ class instance_ruby_sanctum : public InstanceMapScript uint32 BaltharusSharedHealth; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_ruby_sanctum_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 2623b2c542a..9794d8c729f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -60,13 +60,13 @@ class npc_xerestrasza : public CreatureScript _introDone = false; } - void Reset() + void Reset() OVERRIDE { _events.Reset(); me->RemoveFlag(UNIT_NPC_FLAGS, GOSSIP_OPTION_QUESTGIVER); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_BALTHARUS_DEATH) { @@ -92,7 +92,7 @@ class npc_xerestrasza : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_isIntro) return; @@ -138,7 +138,7 @@ class npc_xerestrasza : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_xerestraszaAI>(creature); } @@ -149,7 +149,7 @@ class at_baltharus_plateau : public AreaTriggerScript public: at_baltharus_plateau() : AreaTriggerScript("at_baltharus_plateau") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE { // Only trigger once if (InstanceScript* instance = player->GetInstanceScript()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index ca7e9915ec5..9bc9afa4fa8 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -108,14 +108,14 @@ class spell_eadric_radiance : public SpellScriptLoader unitList.remove_if(OrientationCheck(GetCaster())); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_eadric_radiance_SpellScript(); } @@ -143,7 +143,7 @@ public: bool bDone; - void Reset() + void Reset() OVERRIDE { uiVenganceTimer = 10000; uiRadianceTimer = 16000; @@ -153,7 +153,7 @@ public: bDone = false; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -164,7 +164,7 @@ public: } } - void MovementInform(uint32 MovementType, uint32 /*Data*/) + void MovementInform(uint32 MovementType, uint32 /*Data*/) OVERRIDE { if (MovementType != POINT_MOTION_TYPE) return; @@ -175,7 +175,7 @@ public: me->DisappearAndDie(); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (bDone && uiResetTimer <= uiDiff) { @@ -219,7 +219,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_eadricAI(creature); } @@ -253,7 +253,7 @@ public: uint32 uiRenewTimer; uint32 uiResetTimer; - void Reset() + void Reset() OVERRIDE { me->RemoveAllAuras(); @@ -271,13 +271,13 @@ public: pMemory->RemoveFromWorld(); } - void SetData(uint32 uiId, uint32 /*uiValue*/) + void SetData(uint32 uiId, uint32 /*uiValue*/) OVERRIDE { if (uiId == 1) me->RemoveAura(SPELL_SHIELD); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -288,7 +288,7 @@ public: } } - void MovementInform(uint32 MovementType, uint32 Point) + void MovementInform(uint32 MovementType, uint32 Point) OVERRIDE { if (MovementType != POINT_MOTION_TYPE || Point != 0) return; @@ -299,7 +299,7 @@ public: me->DisappearAndDie(); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (bDone && uiResetTimer <= uiDiff) { @@ -371,13 +371,13 @@ public: DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { MemoryGUID = summon->GetGUID(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_paletressAI(creature); } @@ -396,14 +396,14 @@ public: uint32 uiShadowPastTimer; uint32 uiWakingNightmare; - void Reset() + void Reset() OVERRIDE { uiOldWoundsTimer = 12000; uiShadowPastTimer = 5000; uiWakingNightmare = 7000; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -437,7 +437,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (TempSummon* summ = me->ToTempSummon()) if (Unit* summoner = summ->GetSummoner()) @@ -446,7 +446,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_memoryAI(creature); } @@ -472,7 +472,7 @@ public: uint8 uiWaypoint; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 0) { @@ -491,7 +491,7 @@ public: } } - void SetData(uint32 uiType, uint32 /*uiData*/) + void SetData(uint32 uiType, uint32 /*uiData*/) OVERRIDE { switch (me->GetEntry()) { @@ -543,7 +543,7 @@ public: uiWaypoint = uiType; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -553,14 +553,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, instance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_argent_soldierAI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index c47e7ad1fa4..970c53e56ee 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -108,7 +108,7 @@ public: uint32 uiDeathBiteTimer; uint32 uiMarkedDeathTimer; - void Reset() + void Reset() OVERRIDE { RemoveSummons(); me->SetDisplayId(me->GetNativeDisplayId()); @@ -129,8 +129,8 @@ public: uiDeathArmyCheckTimer = 7000; uiResurrectTimer = 4000; uiGhoulExplodeTimer = 8000; - uiDeathBiteTimer = urand (2000, 4000); - uiMarkedDeathTimer = urand (5000, 7000); + uiDeathBiteTimer = urand(2000, 4000); + uiMarkedDeathTimer = urand(5000, 7000); } void RemoveSummons() @@ -147,13 +147,13 @@ public: SummonList.clear(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { SummonList.push_back(summon->GetGUID()); summon->AI()->AttackStart(me->GetVictim()); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -249,7 +249,7 @@ public: if (uiDeathBiteTimer <= uiDiff) { DoCastAOE(SPELL_DEATH_BITE); - uiDeathBiteTimer = urand (2000, 4000); + uiDeathBiteTimer = urand(2000, 4000); } else uiDeathBiteTimer -= uiDiff; if (uiMarkedDeathTimer <= uiDiff) { @@ -258,7 +258,7 @@ public: if (target && target->IsAlive()) DoCast(target, SPELL_MARKED_DEATH); } - uiMarkedDeathTimer = urand (5000, 7000); + uiMarkedDeathTimer = urand(5000, 7000); } else uiMarkedDeathTimer -= uiDiff; break; } @@ -268,7 +268,7 @@ public: DoMeleeAttackIfReady(); } - void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) OVERRIDE { if (uiDamage > me->GetHealth() && uiPhase <= PHASE_SKELETON) { @@ -289,7 +289,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_KILL_CREDIT); @@ -298,9 +298,9 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_black_knightAI (creature); + return new boss_black_knightAI(creature); } }; @@ -315,12 +315,12 @@ public: uint32 uiAttackTimer; - void Reset() + void Reset() OVERRIDE { uiAttackTimer = 3500; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -339,7 +339,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_risen_ghoulAI(creature); } @@ -357,12 +357,12 @@ public: Start(false, true, 0, NULL); } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -372,7 +372,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_black_knight_skeletal_gryphonAI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index a9750460bb5..07ecaadef77 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -30,7 +30,7 @@ EndScriptData */ #include "trial_of_the_champion.h" #include "Player.h" -enum eSpells +enum Spells { //Vehicle SPELL_CHARGE = 63010, @@ -75,7 +75,7 @@ enum eSpells SPELL_POISON_BOTTLE = 67701 }; -enum eSeat +enum Seats { SEAT_ID_0 = 0 }; @@ -169,14 +169,14 @@ public: uint32 uiWaypointPath; - void Reset() + void Reset() OVERRIDE { uiChargeTimer = 5000; uiShieldBreakerTimer = 8000; uiBuffTimer = urand(30000, 60000); } - void SetData(uint32 uiType, uint32 /*uiData*/) + void SetData(uint32 uiType, uint32 /*uiData*/) OVERRIDE { switch (uiType) { @@ -205,7 +205,7 @@ public: Start(false, true, 0, NULL); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (!instance) return; @@ -222,7 +222,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCastSpellShield(); } @@ -233,7 +233,7 @@ public: DoCast(me, SPELL_SHIELD, true); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -298,7 +298,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new generic_vehicleAI_toc5AI(creature); } @@ -340,14 +340,14 @@ public: bool bDone; bool bHome; - void Reset() + void Reset() OVERRIDE { uiBladeStormTimer = urand(15000, 20000); uiInterceptTimer = 7000; uiMortalStrikeTimer = urand(8000, 12000); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { ScriptedAI::JustReachedHome(); @@ -360,7 +360,7 @@ public: bHome = false; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -424,14 +424,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warrior_toc5AI(creature); } @@ -473,7 +473,7 @@ public: bool bDone; bool bHome; - void Reset() + void Reset() OVERRIDE { uiFireBallTimer = 5000; uiPolymorphTimer = 8000; @@ -481,7 +481,7 @@ public: uiHasteTimer = 22000; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { ScriptedAI::JustReachedHome(); @@ -494,7 +494,7 @@ public: bHome = false; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -563,14 +563,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mage_toc5AI(creature); } @@ -612,7 +612,7 @@ public: bool bDone; bool bHome; - void Reset() + void Reset() OVERRIDE { uiChainLightningTimer = 16000; uiHealingWaveTimer = 12000; @@ -620,13 +620,13 @@ public: uiHexMendingTimer = urand(20000, 25000); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoCast(me, SPELL_EARTH_SHIELD); DoCast(who, SPELL_HEX_OF_MENDING); }; - void JustReachedHome() + void JustReachedHome() OVERRIDE { ScriptedAI::JustReachedHome(); @@ -639,7 +639,7 @@ public: bHome = false; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -710,14 +710,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shaman_toc5AI(creature); } @@ -761,7 +761,7 @@ public: bool bDone; bool bHome; - void Reset() + void Reset() OVERRIDE { uiShootTimer = 12000; uiMultiShotTimer = 0; @@ -772,7 +772,7 @@ public: bShoot = false; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { ScriptedAI::JustReachedHome(); @@ -785,7 +785,7 @@ public: bHome = false; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -866,14 +866,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hunter_toc5AI(creature); } @@ -913,14 +913,14 @@ public: bool bDone; bool bHome; - void Reset() + void Reset() OVERRIDE { uiEviscerateTimer = 8000; uiFanKivesTimer = 14000; uiPosionBottleTimer = 19000; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { ScriptedAI::JustReachedHome(); @@ -933,7 +933,7 @@ public: bHome = false; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!bDone && GrandChampionsOutVehicle(me)) { @@ -987,14 +987,14 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(BOSS_GRAND_CHAMPIONS, DONE); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rouge_toc5AI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index aa9314b84ee..8aa5060609f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -34,7 +34,7 @@ class instance_trial_of_the_champion : public InstanceMapScript public: instance_trial_of_the_champion() : InstanceMapScript("instance_trial_of_the_champion", 650) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_trial_of_the_champion_InstanceMapScript(map); } @@ -166,7 +166,7 @@ public: } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) OVERRIDE { switch (uiType) { @@ -235,7 +235,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 uiData) const + uint32 GetData(uint32 uiData) const OVERRIDE { switch (uiData) { @@ -251,7 +251,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) const + uint64 GetData64(uint32 uiData) const OVERRIDE { switch (uiData) { @@ -266,7 +266,7 @@ public: return 0; } - void SetData64(uint32 uiType, uint64 uiData) + void SetData64(uint32 uiType, uint64 uiData) OVERRIDE { switch (uiType) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 1d785001f72..00b312aa407 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -130,7 +130,7 @@ public: uiPhase = uiPhaseStep; } - void SetData(uint32 uiType, uint32 /*uiData*/) + void SetData(uint32 uiType, uint32 /*uiData*/) OVERRIDE { switch (uiType) { @@ -185,7 +185,7 @@ public: } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -409,7 +409,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { ScriptedAI::UpdateAI(uiDiff); @@ -441,7 +441,7 @@ public: return; } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (instance && instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { @@ -450,7 +450,7 @@ public: } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { switch (summon->GetEntry()) { @@ -470,12 +470,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_announcer_toc5AI(creature); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); @@ -500,7 +500,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 5852d323c6e..f346c796976 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -168,7 +168,7 @@ class boss_anubarak_trial : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); events.SetPhase(PHASE_MELEE); @@ -196,7 +196,7 @@ class boss_anubarak_trial : public CreatureScript _burrowGUID.clear(); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -206,7 +206,8 @@ class boss_anubarak_trial : public CreatureScript } } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { if (!_intro) { @@ -215,7 +216,7 @@ class boss_anubarak_trial : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetBossState(BOSS_ANUBARAK, FAIL); @@ -228,7 +229,7 @@ class boss_anubarak_trial : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -242,7 +243,7 @@ class boss_anubarak_trial : public CreatureScript (*itr)->DespawnOrUnsummon(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); switch (summoned->GetEntry()) @@ -264,7 +265,7 @@ class boss_anubarak_trial : public CreatureScript summons.Summon(summoned); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -284,7 +285,7 @@ class boss_anubarak_trial : public CreatureScript _sphereGUID[i] = summoned->GetGUID(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -422,7 +423,7 @@ class boss_anubarak_trial : public CreatureScript uint32 _berserkTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_anubarak_trialAI(creature); }; @@ -440,7 +441,7 @@ class npc_swarm_scarab : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { me->SetCorpseDelay(0); _determinationTimer = urand(5*IN_MILLISECONDS, 60*IN_MILLISECONDS); @@ -451,7 +452,7 @@ class npc_swarm_scarab : public CreatureScript Anubarak->AI()->JustSummoned(me); } - void DoAction(int32 actionId) + void DoAction(int32 actionId) OVERRIDE { switch (actionId) { @@ -464,12 +465,12 @@ class npc_swarm_scarab : public CreatureScript } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { DoCast(killer, RAID_MODE(SPELL_TRAITOR_KING_10, SPELL_TRAITOR_KING_25)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_instance && _instance->GetBossState(BOSS_ANUBARAK) != IN_PROGRESS) me->DisappearAndDie(); @@ -494,7 +495,7 @@ class npc_swarm_scarab : public CreatureScript uint32 _determinationTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_swarm_scarabAI(creature); }; @@ -512,7 +513,7 @@ class npc_nerubian_burrower : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { me->SetCorpseDelay(10); _submergeTimer = 30*IN_MILLISECONDS; @@ -525,7 +526,7 @@ class npc_nerubian_burrower : public CreatureScript Anubarak->AI()->JustSummoned(me); } - void DoAction(int32 actionId) + void DoAction(int32 actionId) OVERRIDE { switch (actionId) { @@ -539,7 +540,7 @@ class npc_nerubian_burrower : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_instance && _instance->GetBossState(BOSS_ANUBARAK) != IN_PROGRESS) me->DisappearAndDie(); @@ -583,7 +584,7 @@ class npc_nerubian_burrower : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nerubian_burrowerAI(creature); }; @@ -600,7 +601,7 @@ class npc_frost_sphere : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); DoCast(SPELL_FROST_SPHERE); @@ -608,7 +609,7 @@ class npc_frost_sphere : public CreatureScript me->GetMotionMaster()->MoveRandom(20.0f); } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { if (me->GetHealth() <= damage) { @@ -636,7 +637,7 @@ class npc_frost_sphere : public CreatureScript } } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != EFFECT_MOTION_TYPE) return; @@ -656,7 +657,7 @@ class npc_frost_sphere : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frost_sphereAI(creature); }; @@ -673,7 +674,7 @@ class npc_anubarak_spike : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _phase = PHASE_NO_MOVEMENT; _phaseSwitchTimer = 1; @@ -681,12 +682,12 @@ class npc_anubarak_spike : public CreatureScript me->SetInCombatWithZone(); } - bool CanAIAttack(Unit const* victim) const + bool CanAIAttack(Unit const* victim) const OVERRIDE { return victim->GetTypeId() == TYPEID_PLAYER; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) { @@ -695,12 +696,12 @@ class npc_anubarak_spike : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& uiDamage) + void DamageTaken(Unit* /*who*/, uint32& uiDamage) OVERRIDE { uiDamage = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -744,7 +745,8 @@ class npc_anubarak_spike : public CreatureScript } } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) OVERRIDE + { if (!pWho) return; @@ -803,7 +805,7 @@ class npc_anubarak_spike : public CreatureScript PursuingSpikesPhases _phase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anubarak_spikeAI(creature); }; @@ -828,13 +830,13 @@ class spell_impale : public SpellScriptLoader SetHitDamage(0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_impale_SpellScript::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_impale_SpellScript(); } @@ -849,7 +851,7 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader { PrepareAuraScript(spell_anubarak_leeching_swarm_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_DMG) || !sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_HEAL)) return false; @@ -871,13 +873,13 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_anubarak_leeching_swarm_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_anubarak_leeching_swarm_AuraScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index bf1d354deb6..3dc537b4c23 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -37,7 +37,7 @@ enum AIs AI_PET = 3 }; -enum eSpells +enum Spells { // generic SPELL_ANTI_AOE = 68595, @@ -351,7 +351,7 @@ class boss_toc_champion_controller : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _championsNotStarted = 0; _championsFailed = 0; @@ -469,7 +469,7 @@ class boss_toc_champion_controller : public CreatureScript } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) OVERRIDE { switch (uiType) { @@ -537,9 +537,9 @@ class boss_toc_champion_controller : public CreatureScript bool _inProgress; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_toc_champion_controllerAI (creature); + return new boss_toc_champion_controllerAI(creature); } }; @@ -550,14 +550,14 @@ struct boss_faction_championsAI : public BossAI _aiType = aitype; } - void Reset() + void Reset() OVERRIDE { _events.ScheduleEvent(EVENT_THREAT, 5*IN_MILLISECONDS); if (IsHeroic() && (_aiType != AI_PET)) _events.ScheduleEvent(EVENT_REMOVE_CC, 5*IN_MILLISECONDS); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) if (Creature* pChampionController = Unit::GetCreature((*me), instance->GetData64(NPC_CHAMPIONS_CONTROLLER))) @@ -607,7 +607,7 @@ struct boss_faction_championsAI : public BossAI //DoCast(me, SPELL_PVP_TRINKET); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (_aiType != AI_PET) if (instance) @@ -615,7 +615,7 @@ struct boss_faction_championsAI : public BossAI pChampionController->AI()->SetData(2, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_ANTI_AOE, true); _EnterCombat(); @@ -624,7 +624,7 @@ struct boss_faction_championsAI : public BossAI pChampionController->AI()->SetData(2, IN_PROGRESS); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -691,7 +691,7 @@ struct boss_faction_championsAI : public BossAI return count; } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -710,7 +710,7 @@ struct boss_faction_championsAI : public BossAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -759,7 +759,7 @@ class npc_toc_druid : public CreatureScript { npc_toc_druidAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_LIFEBLOOM, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); @@ -773,7 +773,7 @@ class npc_toc_druid : public CreatureScript SetEquipmentSlots(false, 51799, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -837,9 +837,9 @@ class npc_toc_druid : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_druidAI (creature); + return new npc_toc_druidAI(creature); } }; @@ -852,7 +852,7 @@ class npc_toc_shaman : public CreatureScript { npc_toc_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_HEALING_WAVE, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -865,7 +865,7 @@ class npc_toc_shaman : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -930,9 +930,9 @@ class npc_toc_shaman : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_shamanAI (creature); + return new npc_toc_shamanAI(creature); } }; @@ -945,7 +945,7 @@ class npc_toc_paladin : public CreatureScript { npc_toc_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_HAND_OF_FREEDOM, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS)); @@ -959,7 +959,7 @@ class npc_toc_paladin : public CreatureScript SetEquipmentSlots(false, 50771, 47079, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1034,9 +1034,9 @@ class npc_toc_paladin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_paladinAI (creature); + return new npc_toc_paladinAI(creature); } }; @@ -1049,7 +1049,7 @@ class npc_toc_priest : public CreatureScript { npc_toc_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_HEALER) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_RENEW, urand(3*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1062,7 +1062,7 @@ class npc_toc_priest : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1119,9 +1119,9 @@ class npc_toc_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_priestAI (creature); + return new npc_toc_priestAI(creature); } }; @@ -1137,7 +1137,7 @@ class npc_toc_shadow_priest : public CreatureScript { npc_toc_shadow_priestAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_SILENCE, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS)); @@ -1152,7 +1152,7 @@ class npc_toc_shadow_priest : public CreatureScript DoCast(me, SPELL_SHADOWFORM); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1217,9 +1217,9 @@ class npc_toc_shadow_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_shadow_priestAI (creature); + return new npc_toc_shadow_priestAI(creature); } }; @@ -1232,7 +1232,7 @@ class npc_toc_warlock : public CreatureScript { npc_toc_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_HELLFIRE, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS)); @@ -1245,13 +1245,13 @@ class npc_toc_warlock : public CreatureScript SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { boss_faction_championsAI::EnterCombat(who); DoCast(SPELL_SUMMON_FELHUNTER); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1308,9 +1308,9 @@ class npc_toc_warlock : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_warlockAI (creature); + return new npc_toc_warlockAI(creature); } }; @@ -1323,7 +1323,7 @@ class npc_toc_mage : public CreatureScript { npc_toc_mageAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS)); @@ -1337,7 +1337,7 @@ class npc_toc_mage : public CreatureScript SetEquipmentSlots(false, 47524, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1402,9 +1402,9 @@ class npc_toc_mage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_mageAI (creature); + return new npc_toc_mageAI(creature); } }; @@ -1417,7 +1417,7 @@ class npc_toc_hunter : public CreatureScript { npc_toc_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_AIMED_SHOT, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1431,13 +1431,13 @@ class npc_toc_hunter : public CreatureScript SetEquipmentSlots(false, 47156, EQUIP_NO_CHANGE, 48711); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { boss_faction_championsAI::EnterCombat(who); DoCast(SPELL_CALL_PET); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1504,9 +1504,9 @@ class npc_toc_hunter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_hunterAI (creature); + return new npc_toc_hunterAI(creature); } }; @@ -1519,7 +1519,7 @@ class npc_toc_boomkin : public CreatureScript { npc_toc_boomkinAI(Creature* creature) : boss_faction_championsAI(creature, AI_RANGED) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_CYCLONE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS)); @@ -1534,7 +1534,7 @@ class npc_toc_boomkin : public CreatureScript SetEquipmentSlots(false, 50966, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1596,9 +1596,9 @@ class npc_toc_boomkin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_boomkinAI (creature); + return new npc_toc_boomkinAI(creature); } }; @@ -1614,7 +1614,7 @@ class npc_toc_warrior : public CreatureScript { npc_toc_warriorAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_BLADESTORM, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS)); @@ -1629,7 +1629,7 @@ class npc_toc_warrior : public CreatureScript SetEquipmentSlots(false, 47427, 46964, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1700,9 +1700,9 @@ class npc_toc_warrior : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_warriorAI (creature); + return new npc_toc_warriorAI(creature); } }; @@ -1715,7 +1715,7 @@ class npc_toc_dk : public CreatureScript { npc_toc_dkAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_CHAINS_OF_ICE, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS)); @@ -1728,7 +1728,7 @@ class npc_toc_dk : public CreatureScript SetEquipmentSlots(false, 47518, 51021, EQUIP_NO_CHANGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1796,9 +1796,9 @@ class npc_toc_dk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_dkAI (creature); + return new npc_toc_dkAI(creature); } }; @@ -1811,7 +1811,7 @@ class npc_toc_rogue : public CreatureScript { npc_toc_rogueAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_FAN_OF_KNIVES, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1827,7 +1827,7 @@ class npc_toc_rogue : public CreatureScript me->SetMaxPower(POWER_ENERGY, 100); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1901,9 +1901,9 @@ class npc_toc_rogue : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_rogueAI (creature); + return new npc_toc_rogueAI(creature); } }; @@ -1916,7 +1916,7 @@ class npc_toc_enh_shaman : public CreatureScript { npc_toc_enh_shamanAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_DPS_EARTH_SHOCK, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS)); @@ -1933,12 +1933,12 @@ class npc_toc_enh_shaman : public CreatureScript summons.DespawnAll(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* /*pSummoned*/) + void SummonedCreatureDespawn(Creature* /*pSummoned*/) OVERRIDE { --_totemCount; } @@ -1961,13 +1961,13 @@ class npc_toc_enh_shaman : public CreatureScript */ } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { boss_faction_championsAI::JustDied(killer); summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -2027,9 +2027,9 @@ class npc_toc_enh_shaman : public CreatureScript float _totemOldCenterX, _totemOldCenterY; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_enh_shamanAI (creature); + return new npc_toc_enh_shamanAI(creature); } }; @@ -2042,7 +2042,7 @@ class npc_toc_retro_paladin : public CreatureScript { npc_toc_retro_paladinAI(Creature* creature) : boss_faction_championsAI(creature, AI_MELEE) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_AVENGING_WRATH, urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS)); @@ -2056,13 +2056,13 @@ class npc_toc_retro_paladin : public CreatureScript SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { boss_faction_championsAI::EnterCombat(who); DoCast(SPELL_SEAL_OF_COMMAND); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -2133,9 +2133,9 @@ class npc_toc_retro_paladin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_retro_paladinAI (creature); + return new npc_toc_retro_paladinAI(creature); } }; @@ -2148,14 +2148,14 @@ class npc_toc_pet_warlock : public CreatureScript { npc_toc_pet_warlockAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); events.ScheduleEvent(EVENT_DEVOUR_MAGIC, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS)); events.ScheduleEvent(EVENT_SPELL_LOCK, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -2185,9 +2185,9 @@ class npc_toc_pet_warlock : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_pet_warlockAI (creature); + return new npc_toc_pet_warlockAI(creature); } }; @@ -2200,13 +2200,13 @@ class npc_toc_pet_hunter : public CreatureScript { npc_toc_pet_hunterAI(Creature* creature) : boss_faction_championsAI(creature, AI_PET) {} - void Reset() + void Reset() OVERRIDE { boss_faction_championsAI::Reset(); _clawTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -2225,9 +2225,9 @@ class npc_toc_pet_hunter : public CreatureScript uint32 _clawTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_toc_pet_hunterAI (creature); + return new npc_toc_pet_hunterAI(creature); } }; @@ -2240,7 +2240,7 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_faction_champion_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_UNSTABLE_AFFLICTION_DISPEL)) return false; @@ -2253,13 +2253,13 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader caster->CastSpell(dispelInfo->GetDispeller(), SPELL_UNSTABLE_AFFLICTION_DISPEL, true, NULL, GetEffect(EFFECT_0)); } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_faction_champion_warl_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_faction_champion_warl_unstable_affliction_AuraScript(); } @@ -2274,7 +2274,7 @@ class spell_faction_champion_death_grip : public SpellScriptLoader { PrepareSpellScript(spell_faction_champion_death_grip_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DEATH_GRIP_PULL)) return false; @@ -2290,14 +2290,14 @@ class spell_faction_champion_death_grip : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_faction_champion_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_faction_champion_death_grip_SpellScript(); } @@ -2312,7 +2312,7 @@ class spell_toc_bloodlust : public SpellScriptLoader { PrepareSpellScript(spell_toc_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(AURA_SATED)) return false; @@ -2330,7 +2330,7 @@ class spell_toc_bloodlust : public SpellScriptLoader target->CastSpell(target, AURA_SATED, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); @@ -2338,7 +2338,7 @@ class spell_toc_bloodlust : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_toc_bloodlust_SpellScript(); } @@ -2353,7 +2353,7 @@ class spell_toc_heroism : public SpellScriptLoader { PrepareSpellScript(spell_toc_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(AURA_EXHAUSTION)) return false; @@ -2371,7 +2371,7 @@ class spell_toc_heroism : public SpellScriptLoader target->CastSpell(target, AURA_EXHAUSTION, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); @@ -2379,7 +2379,7 @@ class spell_toc_heroism : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_toc_heroism_SpellScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 795e675b12c..7b0867b771c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -101,7 +101,7 @@ class boss_jaraxxus : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); events.ScheduleEvent(EVENT_FEL_FIREBALL, 5*IN_MILLISECONDS); @@ -113,7 +113,7 @@ class boss_jaraxxus : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_INFERNAL_ERUPTION, 80*IN_MILLISECONDS); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); if (instance) @@ -122,7 +122,7 @@ class boss_jaraxxus : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -132,24 +132,24 @@ class boss_jaraxxus : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summons.Summon(summoned); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -212,7 +212,7 @@ class boss_jaraxxus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_jaraxxusAI(creature); } @@ -231,14 +231,14 @@ class npc_legion_flame : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetInCombatWithZone(); DoCast(SPELL_LEGION_FLAME_EFFECT); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { UpdateVictim(); if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) @@ -248,7 +248,7 @@ class npc_legion_flame : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_legion_flameAI(creature); } @@ -266,7 +266,7 @@ class npc_infernal_volcano : public CreatureScript SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); @@ -278,31 +278,31 @@ class npc_infernal_volcano : public CreatureScript _summons.DespawnAll(); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { DoCast(SPELL_INFERNAL_ERUPTION_EFFECT); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { _summons.Summon(summoned); // makes immediate corpse despawn of summoned Felflame Infernals summoned->SetCorpseDelay(0); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { // used to despawn corpse immediately me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} private: SummonList _summons; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_infernal_volcanoAI(creature); } @@ -320,13 +320,13 @@ class npc_fel_infernal : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _felStreakTimer = 30*IN_MILLISECONDS; me->SetInCombatWithZone(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) { @@ -353,7 +353,7 @@ class npc_fel_infernal : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_infernalAI(creature); } @@ -370,7 +370,7 @@ class npc_nether_portal : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); @@ -382,31 +382,31 @@ class npc_nether_portal : public CreatureScript _summons.DespawnAll(); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { DoCast(SPELL_NETHER_PORTAL_EFFECT); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { _summons.Summon(summoned); // makes immediate corpse despawn of summoned Mistress of Pain summoned->SetCorpseDelay(0); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { // used to despawn corpse immediately me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} private: SummonList _summons; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nether_portalAI(creature); } @@ -426,7 +426,7 @@ class npc_mistress_of_pain : public CreatureScript _instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, INCREASE); } - void Reset() + void Reset() OVERRIDE { _events.ScheduleEvent(EVENT_SHIVAN_SLASH, 30*IN_MILLISECONDS); _events.ScheduleEvent(EVENT_SPINNING_STRIKE, 30*IN_MILLISECONDS); @@ -435,13 +435,13 @@ class npc_mistress_of_pain : public CreatureScript me->SetInCombatWithZone(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (_instance) _instance->SetData(DATA_MISTRESS_OF_PAIN_COUNT, DECREASE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_instance && _instance->GetBossState(BOSS_JARAXXUS) != IN_PROGRESS) { @@ -486,7 +486,7 @@ class npc_mistress_of_pain : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mistress_of_painAI(creature); } @@ -501,7 +501,7 @@ class spell_mistress_kiss : public SpellScriptLoader { PrepareAuraScript(spell_mistress_kiss_AuraScript); - bool Load() + bool Load() OVERRIDE { if (GetCaster()) if (sSpellMgr->GetSpellIdForDifficulty(SPELL_MISTRESS_KISS_DAMAGE_SILENCE, GetCaster())) @@ -523,13 +523,13 @@ class spell_mistress_kiss : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mistress_kiss_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mistress_kiss_AuraScript(); } @@ -576,14 +576,14 @@ class spell_mistress_kiss_area : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mistress_kiss_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_mistress_kiss_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mistress_kiss_area_SpellScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 2804f7c0adf..50179d138ae 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -160,7 +160,7 @@ class boss_gormok : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { events.ScheduleEvent(EVENT_IMPALE, urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS)); events.ScheduleEvent(EVENT_STAGGERING_STOMP, 15*IN_MILLISECONDS); @@ -169,13 +169,13 @@ class boss_gormok : public CreatureScript summons.DespawnAll(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); ScriptedAI::EnterEvadeMode(); } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -193,13 +193,13 @@ class boss_gormok : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_NORTHREND_BEASTS, GORMOK_DONE); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) { @@ -209,7 +209,7 @@ class boss_gormok : public CreatureScript me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); me->SetInCombatWithZone(); @@ -226,7 +226,7 @@ class boss_gormok : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { // despawn the remaining passengers on death if (damage >= me->GetHealth()) @@ -235,7 +235,7 @@ class boss_gormok : public CreatureScript pSnobold->ToCreature()->DespawnOrUnsummon(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -282,7 +282,7 @@ class boss_gormok : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gormokAI(creature); } @@ -302,7 +302,7 @@ class npc_snobold_vassal : public CreatureScript _instance->SetData(DATA_SNOBOLD_COUNT, INCREASE); } - void Reset() + void Reset() OVERRIDE { _events.ScheduleEvent(EVENT_BATTER, 5*IN_MILLISECONDS); _events.ScheduleEvent(EVENT_HEAD_CRACK, 25*IN_MILLISECONDS); @@ -316,25 +316,25 @@ class npc_snobold_vassal : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { _targetGUID = who->GetGUID(); me->TauntApply(who); DoCast(who, SPELL_SNOBOLLED); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) OVERRIDE { if (pDoneBy->GetGUID() == _targetGUID) uiDamage = 0; } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -350,7 +350,7 @@ class npc_snobold_vassal : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* target = Unit::GetPlayer(*me, _targetGUID)) if (target->IsAlive()) @@ -359,7 +359,7 @@ class npc_snobold_vassal : public CreatureScript _instance->SetData(DATA_SNOBOLD_COUNT, DECREASE); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -374,7 +374,7 @@ class npc_snobold_vassal : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || _targetDied) return; @@ -455,7 +455,7 @@ class npc_snobold_vassal : public CreatureScript bool _targetDied; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_snobold_vassalAI(creature); } @@ -473,7 +473,7 @@ class npc_firebomb : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_FIRE_BOMB_DOT, true); SetCombatMovement(false); @@ -481,7 +481,7 @@ class npc_firebomb : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (_instance->GetData(TYPE_NORTHREND_BEASTS) != GORMOK_IN_PROGRESS) me->DespawnOrUnsummon(); @@ -491,7 +491,7 @@ class npc_firebomb : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_firebombAI(creature); } @@ -503,7 +503,7 @@ struct boss_jormungarAI : public BossAI { } - void Reset() + void Reset() OVERRIDE { Enraged = false; @@ -515,7 +515,7 @@ struct boss_jormungarAI : public BossAI events.ScheduleEvent(EVENT_SLIME_POOL, 15*IN_MILLISECONDS, 0, PHASE_MOBILE); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -534,7 +534,7 @@ struct boss_jormungarAI : public BossAI } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { // prevent losing 2 attempts at once on heroics if (instance && instance->GetData(TYPE_NORTHREND_BEASTS) != FAIL) @@ -543,14 +543,14 @@ struct boss_jormungarAI : public BossAI me->DespawnOrUnsummon(); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) if (instance) instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELIGIBLE, 0); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); me->SetInCombatWithZone(); @@ -558,7 +558,7 @@ struct boss_jormungarAI : public BossAI instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -697,7 +697,7 @@ class boss_acidmaw : public CreatureScript { boss_acidmawAI(Creature* creature) : boss_jormungarAI(creature) { } - void Reset() + void Reset() OVERRIDE { boss_jormungarAI::Reset(); BiteSpell = SPELL_PARALYTIC_BITE; @@ -713,7 +713,7 @@ class boss_acidmaw : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_acidmawAI(creature); } @@ -730,7 +730,7 @@ class boss_dreadscale : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { boss_jormungarAI::Reset(); BiteSpell = SPELL_BURNING_BITE; @@ -747,7 +747,7 @@ class boss_dreadscale : public CreatureScript WasMobile = false; } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -765,13 +765,13 @@ class boss_dreadscale : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); boss_jormungarAI::EnterEvadeMode(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); @@ -780,7 +780,7 @@ class boss_dreadscale : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_dreadscaleAI(creature); } @@ -798,13 +798,13 @@ class npc_slime_pool : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _cast = false; me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!_cast) { @@ -821,7 +821,7 @@ class npc_slime_pool : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_slime_poolAI(creature); } @@ -845,13 +845,13 @@ class spell_gormok_fire_bomb : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_gormok_fire_bomb_SpellScript::TriggerFireBomb, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gormok_fire_bomb_SpellScript(); } @@ -868,7 +868,7 @@ class boss_icehowl : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { events.ScheduleEvent(EVENT_FEROCIOUS_BUTT, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS)); events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS)); @@ -884,14 +884,14 @@ class boss_icehowl : public CreatureScript _stage = 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); if (instance) instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_DONE); } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -928,13 +928,13 @@ class boss_icehowl : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); ScriptedAI::EnterEvadeMode(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) { @@ -944,7 +944,7 @@ class boss_icehowl : public CreatureScript me->DespawnOrUnsummon(); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -953,14 +953,14 @@ class boss_icehowl : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); if (instance) instance->SetData(TYPE_NORTHREND_BEASTS, ICEHOWL_IN_PROGRESS); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_TRAMPLE && target->GetTypeId() == TYPEID_PLAYER) { @@ -972,7 +972,7 @@ class boss_icehowl : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1138,7 +1138,7 @@ class boss_icehowl : public CreatureScript Unit* _target; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_icehowlAI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index d6d9db6bfb7..eb36c35d895 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -145,7 +145,7 @@ struct boss_twin_baseAI : public BossAI { } - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); @@ -163,7 +163,7 @@ struct boss_twin_baseAI : public BossAI summons.DespawnAll(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetBossState(BOSS_VALKIRIES, FAIL); @@ -172,7 +172,7 @@ struct boss_twin_baseAI : public BossAI me->DespawnOrUnsummon(); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -188,7 +188,7 @@ struct boss_twin_baseAI : public BossAI } } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -198,12 +198,12 @@ struct boss_twin_baseAI : public BossAI } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -224,7 +224,7 @@ struct boss_twin_baseAI : public BossAI summons.Despawn(summoned); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (instance) @@ -253,7 +253,7 @@ struct boss_twin_baseAI : public BossAI return Unit::GetCreature((*me), instance->GetData64(SisterNpcId)); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->SetInCombatWithZone(); if (instance) @@ -270,7 +270,7 @@ struct boss_twin_baseAI : public BossAI DoCast(me, SurgeSpellId); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -292,7 +292,7 @@ struct boss_twin_baseAI : public BossAI me->UpdateDamagePhysical(mode ? OFF_ATTACK : BASE_ATTACK); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance || !UpdateVictim()) return; @@ -403,7 +403,7 @@ class boss_fjola : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); Stage = 0; @@ -425,7 +425,7 @@ class boss_fjola : public CreatureScript boss_twin_baseAI::Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); @@ -434,13 +434,13 @@ class boss_fjola : public CreatureScript boss_twin_baseAI::EnterCombat(who); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); boss_twin_baseAI::EnterEvadeMode(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR)); @@ -449,7 +449,7 @@ class boss_fjola : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fjolaAI(creature); } @@ -464,7 +464,7 @@ class boss_eydis : public CreatureScript { boss_eydisAI(Creature* creature) : boss_twin_baseAI(creature) {} - void Reset() + void Reset() OVERRIDE { SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); Stage = 1; @@ -484,7 +484,7 @@ class boss_eydis : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_eydisAI(creature); } @@ -499,7 +499,7 @@ class npc_essence_of_twin : public CreatureScript { npc_essence_of_twinAI(Creature* creature) : ScriptedAI(creature) { } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { uint32 spellReturned = 0; switch (me->GetEntry()) @@ -518,12 +518,12 @@ class npc_essence_of_twin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_essence_of_twinAI(creature); }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->RemoveAurasDueToSpell(creature->GetAI()->GetData(ESSENCE_REMOVE)); player->CastSpell(player, creature->GetAI()->GetData(ESSENCE_APPLY), true); @@ -552,7 +552,7 @@ struct npc_unleashed_ballAI : public ScriptedAI me->GetMotionMaster()->MovePoint(0, x, y, me->GetPositionZ()); } - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_PASSIVE); @@ -563,7 +563,7 @@ struct npc_unleashed_ballAI : public ScriptedAI RangeCheckTimer = 0.5*IN_MILLISECONDS; } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -594,7 +594,7 @@ class npc_unleashed_dark : public CreatureScript { npc_unleashed_darkAI(Creature* creature) : npc_unleashed_ballAI(creature) {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (RangeCheckTimer < diff) { @@ -611,7 +611,7 @@ class npc_unleashed_dark : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_unleashed_darkAI(creature); } @@ -626,7 +626,7 @@ class npc_unleashed_light : public CreatureScript { npc_unleashed_lightAI(Creature* creature) : npc_unleashed_ballAI(creature) {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (RangeCheckTimer < diff) { @@ -643,7 +643,7 @@ class npc_unleashed_light : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_unleashed_lightAI(creature); } @@ -661,18 +661,18 @@ class npc_bullet_controller : public CreatureScript SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { DoCastAOE(SPELL_CONTROLLER_PERIODIC); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { UpdateVictim(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bullet_controllerAI(creature); } @@ -691,7 +691,7 @@ class spell_powering_up : public SpellScriptLoader uint32 spellId; uint32 poweringUp; - bool Load() + bool Load() OVERRIDE { spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster()); if (!sSpellMgr->GetSpellInfo(spellId)) @@ -724,13 +724,13 @@ class spell_powering_up : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_powering_up_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_powering_up_SpellScript(); } @@ -747,7 +747,7 @@ class spell_valkyr_essences : public SpellScriptLoader uint32 spellId; - bool Load() + bool Load() OVERRIDE { spellId = sSpellMgr->GetSpellIdForDifficulty(SPELL_SURGE_OF_SPEED, GetCaster()); if (!sSpellMgr->GetSpellInfo(spellId)) @@ -819,13 +819,13 @@ class spell_valkyr_essences : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectAbsorb += AuraEffectAbsorbFn(spell_valkyr_essences_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_valkyr_essences_AuraScript(); } @@ -840,7 +840,7 @@ class spell_power_of_the_twins : public SpellScriptLoader { PrepareAuraScript(spell_power_of_the_twins_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -863,7 +863,7 @@ class spell_power_of_the_twins : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_power_of_the_twins_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_power_of_the_twins_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -871,7 +871,7 @@ class spell_power_of_the_twins : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_power_of_the_twins_AuraScript(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 40febbd530a..6011b457a1c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -403,7 +403,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -472,7 +472,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -523,7 +523,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return 0; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -774,7 +774,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript bool TributeToImmortalityEligible; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_trial_of_the_crusader_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 179f248d316..24cbbee76b8 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -25,7 +25,7 @@ #include "trial_of_the_crusader.h" #include "Player.h" -enum eYells +enum Yells { // Highlord Tirion Fordring - 34996 SAY_STAGE_0_01 = 0, @@ -83,7 +83,7 @@ enum eYells struct _Messages { - eAnnouncerMessages msgnum; + AnnouncerMessages msgnum; uint32 id; bool state; uint32 encounter; @@ -115,7 +115,7 @@ class npc_announcer_toc10 : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); if (Creature* pAlly = GetClosestCreatureWithEntry(me, NPC_THRALL, 300.0f)) @@ -124,10 +124,10 @@ class npc_announcer_toc10 : public CreatureScript pAlly->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); if (!instance) @@ -156,7 +156,7 @@ class npc_announcer_toc10 : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -220,7 +220,7 @@ class npc_announcer_toc10 : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_announcer_toc10AI(creature); } @@ -238,7 +238,7 @@ class boss_lich_king_toc : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _updateTimer = 0; me->SetReactState(REACT_PASSIVE); @@ -252,7 +252,7 @@ class boss_lich_king_toc : public CreatureScript me->SetWalk(true); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE { if (uiType != POINT_MOTION_TYPE || !_instance) return; @@ -270,7 +270,7 @@ class boss_lich_king_toc : public CreatureScript } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!_instance) return; @@ -355,7 +355,7 @@ class boss_lich_king_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lich_king_tocAI(creature); } @@ -373,7 +373,7 @@ class npc_fizzlebang_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { Talk(SAY_STAGE_1_06, killer->GetGUID()); _instance->SetData(TYPE_EVENT, 1180); @@ -385,14 +385,14 @@ class npc_fizzlebang_toc : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { me->SetWalk(true); _portalGUID = 0; me->GetMotionMaster()->MovePoint(1, ToCCommonLoc[10].GetPositionX(), ToCCommonLoc[10].GetPositionY()-60, ToCCommonLoc[10].GetPositionZ()); } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -413,12 +413,12 @@ class npc_fizzlebang_toc : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { _summons.Summon(summoned); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!_instance) return; @@ -529,7 +529,7 @@ class npc_fizzlebang_toc : public CreatureScript uint64 _triggerGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fizzlebang_tocAI(creature); } @@ -547,11 +547,11 @@ class npc_tirion_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() {} + void Reset() OVERRIDE {} - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!_instance) return; @@ -817,7 +817,7 @@ class npc_tirion_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tirion_tocAI(creature); } @@ -835,11 +835,11 @@ class npc_garrosh_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() {} + void Reset() OVERRIDE {} - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!_instance) return; @@ -901,7 +901,7 @@ class npc_garrosh_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_garrosh_tocAI(creature); } @@ -919,11 +919,11 @@ class npc_varian_toc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() {} + void Reset() OVERRIDE {} - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!_instance) return; @@ -985,7 +985,7 @@ class npc_varian_toc : public CreatureScript uint32 _updateTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_varian_tocAI(creature); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index f42c985d3e5..0d64655db77 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -140,13 +140,13 @@ const Position EndSpawnLoc[]= {644.6250f, 149.2743f, 140.6015f, 0} // 2 - Portal to Dalaran }; -enum euiWorldStates +enum WorldStateIds { UPDATE_STATE_UI_SHOW = 4390, UPDATE_STATE_UI_COUNT = 4389 }; -enum eNorthrendBeasts +enum NorthrendBeasts { GORMOK_IN_PROGRESS = 1000, GORMOK_DONE = 1001, @@ -159,7 +159,7 @@ enum eNorthrendBeasts ICEHOWL_DONE = 3001 }; -enum eAnnouncerMessages +enum AnnouncerMessages { MSG_BEASTS = 724001, MSG_JARAXXUS = 724002, @@ -169,7 +169,7 @@ enum eAnnouncerMessages MSG_ANUBARAK = 724006 }; -enum eCreature +enum CreatureIds { NPC_BARRENT = 34816, NPC_TIRION = 34996, @@ -234,7 +234,7 @@ enum eCreature NPC_ANUBARAK = 34564 }; -enum eGameObject +enum GameObjectIds { GO_CRUSADERS_CACHE_10 = 195631, GO_CRUSADERS_CACHE_25 = 195632, @@ -260,7 +260,7 @@ enum eGameObject GO_PORTAL_TO_DALARAN = 195682 }; -enum eAchievementData +enum AchievementData { // Northrend Beasts UPPER_BACK_PAIN_10_PLAYER = 11779, diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 923f8a23d6f..34ced66c8be 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -42,8 +42,11 @@ enum Creatures NPC_RAPTOR_2 = 26628 }; -#define ACTION_RAPTOR_KILLED 1 -#define DATA_KING_DRED 2 +enum Misc +{ + ACTION_RAPTOR_KILLED = 1, + DATA_KING_DRED = 2 +}; class boss_dred : public CreatureScript { @@ -67,7 +70,7 @@ class boss_dred : public CreatureScript InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_DRED_EVENT, NOT_STARTED); @@ -80,13 +83,13 @@ class boss_dred : public CreatureScript uiRaptorCallTimer = urand(20000, 25000); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_DRED_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -148,13 +151,13 @@ class boss_dred : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_RAPTOR_KILLED) ++raptorsKilled; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_KING_DRED) return raptorsKilled; @@ -162,14 +165,14 @@ class boss_dred : public CreatureScript return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_DRED_EVENT, DONE); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_dredAI(creature); } @@ -191,12 +194,12 @@ class npc_drakkari_gutripper : public CreatureScript uint32 GutRipTimer; - void Reset() + void Reset() OVERRIDE { GutRipTimer = urand(10000, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -212,14 +215,14 @@ class npc_drakkari_gutripper : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRED))) Dred->AI()->DoAction(ACTION_RAPTOR_KILLED); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_drakkari_gutripperAI(creature); } @@ -241,12 +244,12 @@ class npc_drakkari_scytheclaw : public CreatureScript uint32 uiRendTimer; - void Reset() + void Reset() OVERRIDE { uiRendTimer = urand(10000, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -262,14 +265,14 @@ class npc_drakkari_scytheclaw : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Dred = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_DRED))) Dred->AI()->DoAction(ACTION_RAPTOR_KILLED); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_drakkari_scytheclawAI(creature); } @@ -282,7 +285,7 @@ class achievement_king_dred : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 6eedfb357db..120d52a3050 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -79,7 +79,7 @@ public: { boss_novosAI(Creature* creature) : BossAI(creature, DATA_NOVOS_EVENT) {} - void Reset() + void Reset() OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -92,7 +92,7 @@ public: SetBubbled(false); } - void EnterCombat(Unit* /* victim */) + void EnterCombat(Unit* /* victim */) OVERRIDE { me->setActive(true); DoZoneInCombat(); @@ -103,7 +103,7 @@ public: SetBubbled(true); } - void AttackStart(Unit* target) + void AttackStart(Unit* target) OVERRIDE { if (!target) return; @@ -112,7 +112,7 @@ public: DoStartNoMovement(target); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || _bubbled) return; @@ -141,13 +141,14 @@ public: } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_CRYSTAL_HANDLER_DIED) CrystalHandlerDied(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { BossAI::MoveInLineOfSight(who); @@ -159,12 +160,12 @@ public: _ohNovos = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { return type == DATA_NOVOS_ACHIEV && _ohNovos ? 1 : 0; } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); } @@ -257,7 +258,7 @@ public: bool _bubbled; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_novosAI(creature); } @@ -272,14 +273,14 @@ public: { npc_crystal_channel_targetAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { _spell = 0; _timer = 0; _temp = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_spell) { @@ -293,14 +294,14 @@ public: } } - void SetData(uint32 id, uint32 value) + void SetData(uint32 id, uint32 value) OVERRIDE { _spell = id; _timer = value; _temp = value; } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (InstanceScript* instance = me->GetInstanceScript()) if (uint64 guid = instance->GetData64(DATA_NOVOS)) @@ -320,7 +321,7 @@ public: uint32 _temp; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crystal_channel_targetAI(creature); } @@ -331,7 +332,7 @@ class achievement_oh_novos : public AchievementCriteriaScript public: achievement_oh_novos() : AchievementCriteriaScript("achievement_oh_novos") {} - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(DATA_NOVOS_ACHIEV); } @@ -357,13 +358,13 @@ public: GetCaster()->CastSpell((Unit*)NULL, SPELL_COPY_OF_SUMMON_MINIONS, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_summon_minions_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_summon_minions_SpellScript(); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 873a359b549..63b23eb594e 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -87,7 +87,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiPhaseTimer = 20*IN_MILLISECONDS; uiCurseOfLifeTimer = 1*IN_MILLISECONDS; @@ -99,7 +99,7 @@ public: instance->SetData(DATA_THARON_JA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -107,7 +107,7 @@ public: instance->SetData(DATA_THARON_JA_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -219,12 +219,12 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -244,7 +244,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_tharon_jaAI(creature); } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 48bf4c72d43..f0e72d16f58 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -31,7 +31,7 @@ enum Spells SPELL_CORPSE_EXPLODE = 49555, SPELL_CONSUME = 49380, SPELL_CONSUME_AURA = 49381, - //Heroic spells + // Heroic spells H_SPELL_CORPSE_EXPLODE = 59807, H_SPELL_CONSUME = 59803, H_SPELL_CONSUME_AURA = 59805, @@ -52,7 +52,10 @@ enum Creatures NPC_DRAKKARI_INVADER_2 = 27709 }; -#define DATA_CONSUMPTION_JUNCTION 1 +enum Misc +{ + DATA_CONSUMPTION_JUNCTION = 1 +}; Position AddSpawnPoint = { -260.493011f, -622.968018f, 26.605301f, 3.036870f }; @@ -81,7 +84,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiConsumeTimer = 15*IN_MILLISECONDS; uiAuraCountTimer = 15500; @@ -100,7 +103,7 @@ public: instance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -108,7 +111,7 @@ public: instance->SetData(DATA_TROLLGORE_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -158,7 +161,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -168,7 +171,7 @@ public: instance->SetData(DATA_TROLLGORE_EVENT, DONE); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_CONSUMPTION_JUNCTION) return consumptionJunction ? 1 : 0; @@ -176,7 +179,7 @@ public: return 0; } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -184,7 +187,7 @@ public: Talk(SAY_KILL); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { lSummons.Summon(summon); if (summon->AI()) @@ -192,7 +195,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_trollgoreAI(creature); } @@ -205,7 +208,7 @@ class achievement_consumption_junction : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 28bea60fb87..61dfced65ed 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -172,7 +172,7 @@ public: novosSummonerGUID4 = creature->GetGUID(); } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -193,7 +193,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -221,7 +221,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -286,7 +286,7 @@ public: } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_drak_tharon_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 98f467b0bba..2dedc986b0c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -71,7 +71,7 @@ class boss_bronjahm : public CreatureScript DoCast(me, SPELL_SOULSTORM_CHANNEL, true); } - void InitializeAI() + void InitializeAI() OVERRIDE { if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName)) me->IsAIEnabled = false; @@ -79,7 +79,7 @@ class boss_bronjahm : public CreatureScript Reset(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.SetPhase(PHASE_1); @@ -90,12 +90,12 @@ class boss_bronjahm : public CreatureScript instance->SetBossState(DATA_BRONJAHM, NOT_STARTED); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { DoCast(me, SPELL_SOULSTORM_CHANNEL, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); me->RemoveAurasDueToSpell(SPELL_SOULSTORM_CHANNEL); @@ -103,20 +103,20 @@ class boss_bronjahm : public CreatureScript instance->SetBossState(DATA_BRONJAHM, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); instance->SetBossState(DATA_BRONJAHM, DONE); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (events.IsInPhase(PHASE_1) && !HealthAbovePct(30)) { @@ -127,7 +127,7 @@ class boss_bronjahm : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); summon->SetReactState(REACT_PASSIVE); @@ -136,7 +136,7 @@ class boss_bronjahm : public CreatureScript summon->CastSpell(summon, SPELL_PURPLE_BANISH_VISUAL, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -186,7 +186,7 @@ class boss_bronjahm : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_bronjahmAI(creature); } @@ -204,7 +204,7 @@ class npc_corrupted_soul_fragment : public CreatureScript instance = me->GetInstanceScript(); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != CHASE_MOTION_TYPE) return; @@ -229,7 +229,7 @@ class npc_corrupted_soul_fragment : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_corrupted_soul_fragmentAI(creature); } @@ -257,13 +257,13 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader SetHitDamage(newDamage); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_bronjahm_magic_bane_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_bronjahm_magic_bane_SpellScript(); } @@ -284,13 +284,13 @@ class spell_bronjahm_consume_soul : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue(), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_bronjahm_consume_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_bronjahm_consume_soul_SpellScript(); } @@ -312,13 +312,13 @@ class spell_bronjahm_soulstorm_channel : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), i, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_channel_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_bronjahm_soulstorm_channel_AuraScript(); } @@ -343,13 +343,13 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), i, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_visual_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_bronjahm_soulstorm_visual_AuraScript(); } @@ -391,7 +391,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader targets = sharedTargets; } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargetsInitial, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY); @@ -400,7 +400,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader std::list<WorldObject*> sharedTargets; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_bronjahm_soulstorm_targeting_SpellScript(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 599e2b834a9..173abfc2652 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -70,7 +70,7 @@ enum Events EVENT_FACE_ANGER = 7, }; -enum eEnum +enum Models { DISPLAY_ANGER = 30148, DISPLAY_SORROW = 30149, @@ -111,7 +111,10 @@ struct outroPosition Position const CrucibleSummonPos = {5672.294f, 2520.686f, 713.4386f, 0.9599311f}; -#define DATA_THREE_FACED 1 +enum Misc +{ + DATA_THREE_FACED = 1 +}; class boss_devourer_of_souls : public CreatureScript { @@ -124,7 +127,7 @@ class boss_devourer_of_souls : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(FoSScriptName)) me->IsAIEnabled = false; @@ -132,7 +135,7 @@ class boss_devourer_of_souls : public CreatureScript Reset(); } - void Reset() + void Reset() OVERRIDE { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); me->SetDisplayId(DISPLAY_ANGER); @@ -147,7 +150,7 @@ class boss_devourer_of_souls : public CreatureScript instance->SetData(DATA_DEVOURER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_FACE_AGGRO); @@ -162,7 +165,7 @@ class boss_devourer_of_souls : public CreatureScript instance->SetData(DATA_DEVOURER_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) OVERRIDE { if (mirroredSoulTarget && me->HasAura(SPELL_MIRRORED_SOUL)) { @@ -179,7 +182,7 @@ class boss_devourer_of_souls : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -204,7 +207,7 @@ class boss_devourer_of_souls : public CreatureScript Talk(textId); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { summons.DespawnAll(); @@ -233,13 +236,13 @@ class boss_devourer_of_souls : public CreatureScript } } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == H_SPELL_PHANTOM_BLAST) threeFaced = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_THREE_FACED) return threeFaced; @@ -247,7 +250,7 @@ class boss_devourer_of_souls : public CreatureScript return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Return since we have no target if (!UpdateVictim()) @@ -359,7 +362,7 @@ class boss_devourer_of_souls : public CreatureScript uint64 mirroredSoulTarget; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_devourer_of_soulsAI(creature); } @@ -372,7 +375,7 @@ class achievement_three_faced : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 1073c29b667..cfa149c134f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -59,7 +59,7 @@ enum Yells SAY_SYLVANAS_INTRO_6 = 5, }; -enum eSylvanas +enum Misc { GOSSIP_SPEECHINTRO = 13525, ACTION_INTRO, @@ -89,13 +89,13 @@ public: EventMap events; Phase phase; - void Reset() + void Reset() OVERRIDE { events.Reset(); phase = PHASE_NORMAL; } - void DoAction(int32 actionId) + void DoAction(int32 actionId) OVERRIDE { switch (actionId) { @@ -109,7 +109,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (phase == PHASE_INTRO) { @@ -161,7 +161,7 @@ public: } }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -175,7 +175,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -191,7 +191,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sylvanas_fosAI(creature); } @@ -215,13 +215,13 @@ public: EventMap events; Phase phase; - void Reset() + void Reset() OVERRIDE { events.Reset(); phase = PHASE_NORMAL; } - void DoAction(int32 actionId) + void DoAction(int32 actionId) OVERRIDE { switch (actionId) { @@ -235,7 +235,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (phase == PHASE_INTRO) { @@ -298,7 +298,7 @@ public: } }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -312,7 +312,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -328,7 +328,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jaina_fosAI(creature); } diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 03f67765406..ca4a9c43e60 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -73,7 +73,7 @@ class instance_forge_of_souls : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -86,7 +86,7 @@ class instance_forge_of_souls : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -149,7 +149,7 @@ class instance_forge_of_souls : public InstanceMapScript uint32 teamInInstance; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_forge_of_souls_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 9d266c77b77..530741ea710 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -50,7 +50,7 @@ class boss_falric : public CreatureScript public: boss_falric() : CreatureScript("boss_falric") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_falricAI(creature); } @@ -61,7 +61,7 @@ public: uint8 uiHopelessnessCount; - void Reset() + void Reset() OVERRIDE { boss_horAI::Reset(); @@ -71,7 +71,7 @@ public: instance->SetBossState(DATA_FALRIC_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) @@ -82,7 +82,7 @@ public: events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); /// @todo adjust timer. } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -90,12 +90,12 @@ public: instance->SetBossState(DATA_FALRIC_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index e82f0d48ebd..49fd7481dde 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -49,7 +49,7 @@ class boss_marwyn : public CreatureScript public: boss_marwyn() : CreatureScript("boss_marwyn") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_marwynAI(creature); } @@ -58,7 +58,7 @@ public: { boss_marwynAI(Creature* creature) : boss_horAI(creature) {} - void Reset() + void Reset() OVERRIDE { boss_horAI::Reset(); @@ -66,7 +66,7 @@ public: instance->SetBossState(DATA_MARWYN_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) @@ -78,7 +78,7 @@ public: events.ScheduleEvent(EVENT_SHARED_SUFFERING, 20000); /// @todo Check timer } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -86,12 +86,12 @@ public: instance->SetBossState(DATA_MARWYN_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 60209f04c30..e291ee0de70 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -136,7 +136,7 @@ enum Events EVENT_CLOSE_FROSTWORN_DOOR, }; -enum eEnum +enum Misc { ACTION_START_INTRO, ACTION_SKIP_INTRO, @@ -191,7 +191,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript EventMap events; - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -209,7 +209,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { events.Reset(); @@ -221,7 +221,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript events.ScheduleEvent(EVENT_WALK_INTRO1, 3000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); switch (events.ExecuteEvent()) @@ -575,7 +575,7 @@ class npc_jaina_or_sylvanas_hor : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jaina_or_sylvanas_horAI(creature); } @@ -659,19 +659,19 @@ struct npc_gauntlet_trash : public ScriptedAI { } - void Reset() + void Reset() OVERRIDE { me->CastSpell(me, SPELL_WELL_OF_SOULS, true); events.Reset(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (instance->GetData(DATA_WAVE_COUNT) != NOT_STARTED) instance->SetData(DATA_WAVE_COUNT, NOT_STARTED); } - void SetData(uint32 type, uint32 value) + void SetData(uint32 type, uint32 value) OVERRIDE { if (type) return; @@ -679,7 +679,7 @@ struct npc_gauntlet_trash : public ScriptedAI InternalWaveId = value; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type) return 0; @@ -704,7 +704,7 @@ public: { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 8000); /// @todo adjust timers events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000); @@ -712,7 +712,7 @@ public: events.ScheduleEvent(EVENT_DARK_MENDING, 20000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -758,7 +758,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ghostly_priestAI(creature); } @@ -775,7 +775,7 @@ public: { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_FIREBALL, 3000); /// @todo adjust timers events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000); @@ -784,7 +784,7 @@ public: events.ScheduleEvent(EVENT_HALLUCINATION, 40000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -824,7 +824,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phantom_mageAI(creature); } @@ -839,13 +839,13 @@ public: { npc_phantom_hallucinationAI(Creature* creature) : npc_phantom_mage::npc_phantom_mageAI(creature) {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(SPELL_HALLUCINATION_2); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phantom_hallucinationAI(creature); } @@ -862,7 +862,7 @@ public: { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); /// @todo adjust timers events.ScheduleEvent(EVENT_DEADLY_POISON, 5000); @@ -870,7 +870,7 @@ public: events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -905,7 +905,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadowy_mercenaryAI(creature); } @@ -922,14 +922,14 @@ public: { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); /// @todo adjust timers events.ScheduleEvent(EVENT_SHIELD_BASH, 10000); events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -959,7 +959,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spectral_footmanAI(creature); } @@ -976,7 +976,7 @@ public: { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SHOOT, 2000); /// @todo adjust timers events.ScheduleEvent(EVENT_CURSED_ARROW, 10000); @@ -984,7 +984,7 @@ public: events.ScheduleEvent(EVENT_ICE_SHOT, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1021,7 +1021,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tortured_riflemanAI(creature); } @@ -1067,19 +1067,19 @@ public: EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); instance->SetData(DATA_FROSWORN_EVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); instance->SetData(DATA_FROSWORN_EVENT, DONE); } - void EnterCombat(Unit* /*victim*/) + void EnterCombat(Unit* /*victim*/) OVERRIDE { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SHIELD, 5000); @@ -1088,7 +1088,7 @@ public: instance->SetData(DATA_FROSWORN_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1137,7 +1137,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frostworn_generalAI(creature); } @@ -1157,22 +1157,22 @@ public: EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); } - void EnterCombat(Unit* /*victim*/) + void EnterCombat(Unit* /*victim*/) OVERRIDE { events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3000); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { DoCast(killer, SPELL_SPIRIT_BURST); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1194,7 +1194,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spiritual_reflectionAI(creature); } @@ -1205,7 +1205,7 @@ class at_hor_intro_start : public AreaTriggerScript public: at_hor_intro_start() : AreaTriggerScript("at_hor_intro_start") {} - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); @@ -1226,7 +1226,7 @@ class at_hor_waves_restarter : public AreaTriggerScript public: at_hor_waves_restarter() : AreaTriggerScript("at_hor_waves_restarter") {} - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index b23eb8d6ab8..115127b8c2f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -215,7 +215,7 @@ public: return true; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -409,7 +409,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -428,7 +428,7 @@ public: return 0; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -528,7 +528,7 @@ public: std::set<uint64> waveGuidList[8]; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_halls_of_reflection_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 3a2af8a98d1..4bb989bf2e4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -86,7 +86,7 @@ enum Events { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(PoSScriptName)) me->IsAIEnabled = false; @@ -94,7 +94,7 @@ enum Events Reset(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.SetPhase(PHASE_ONE); @@ -104,7 +104,7 @@ enum Events instance->SetBossState(DATA_GARFROST, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DoCast(me, SPELL_PERMAFROST); @@ -114,13 +114,13 @@ enum Events instance->SetBossState(DATA_GARFROST, IN_PROGRESS); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -130,7 +130,7 @@ enum Events instance->SetBossState(DATA_GARFROST, DONE); } - void DamageTaken(Unit* /*attacker*/, uint32& /*uiDamage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*uiDamage*/) OVERRIDE { if (events.IsInPhase(PHASE_ONE) && !HealthAbovePct(66)) { @@ -153,7 +153,7 @@ enum Events } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != EFFECT_MOTION_TYPE || id != POINT_FORGE) return; @@ -172,7 +172,7 @@ enum Events events.ScheduleEvent(EVENT_RESUME_ATTACK, 5000); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_PERMAFROST_HELPER) { @@ -181,12 +181,12 @@ enum Events } } - uint32 GetData(uint32 /*type*/) const + uint32 GetData(uint32 /*type*/) const OVERRIDE { return _permafrostStack; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -246,7 +246,7 @@ enum Events uint32 _permafrostStack; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_garfrostAI(creature); } @@ -261,7 +261,7 @@ class spell_garfrost_permafrost : public SpellScriptLoader { PrepareSpellScript(spell_garfrost_permafrost_SpellScript); - bool Load() + bool Load() OVERRIDE { prevented = false; return true; @@ -307,7 +307,7 @@ class spell_garfrost_permafrost : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { BeforeHit += SpellHitFn(spell_garfrost_permafrost_SpellScript::PreventHitByLoS); AfterHit += SpellHitFn(spell_garfrost_permafrost_SpellScript::RestoreImmunity); @@ -316,7 +316,7 @@ class spell_garfrost_permafrost : public SpellScriptLoader bool prevented; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_garfrost_permafrost_SpellScript(); } @@ -327,7 +327,7 @@ class achievement_doesnt_go_to_eleven : public AchievementCriteriaScript public: achievement_doesnt_go_to_eleven() : AchievementCriteriaScript("achievement_doesnt_go_to_eleven") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (target) if (Creature* garfrost = target->ToCreature()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 6df01aae7b9..b738f0c9358 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -142,7 +142,7 @@ class boss_ick : public CreatureScript ASSERT(_vehicle); } - void InitializeAI() + void InitializeAI() OVERRIDE { if (!instance || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(PoSScriptName)) me->IsAIEnabled = false; @@ -150,7 +150,7 @@ class boss_ick : public CreatureScript Reset(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); instance->SetBossState(DATA_ICK, NOT_STARTED); @@ -161,7 +161,7 @@ class boss_ick : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KRICK)); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Creature* krick = GetKrick()) krick->AI()->Talk(SAY_KRICK_AGGRO); @@ -174,13 +174,13 @@ class boss_ick : public CreatureScript instance->SetBossState(DATA_ICK, IN_PROGRESS); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->GetMotionMaster()->Clear(); ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* krick = GetKrick()) { @@ -203,7 +203,7 @@ class boss_ick : public CreatureScript me->AddThreat(target, _tempThreat); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) return; @@ -279,7 +279,7 @@ class boss_ick : public CreatureScript float _tempThreat; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ickAI(creature); } @@ -296,7 +296,7 @@ class boss_krick : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (!_instanceScript || static_cast<InstanceMap*>(me->GetMap())->GetScriptId() != sObjectMgr->GetScriptId(PoSScriptName)) me->IsAIEnabled = false; @@ -304,7 +304,7 @@ class boss_krick : public CreatureScript Reset(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _phase = PHASE_COMBAT; @@ -320,7 +320,7 @@ class boss_krick : public CreatureScript return ObjectAccessor::GetCreature(*me, _instanceScript->GetData64(DATA_ICK)); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -328,7 +328,7 @@ class boss_krick : public CreatureScript Talk(SAY_KRICK_SLAY); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { _summons.Summon(summon); if (summon->GetEntry() == NPC_EXPLODING_ORB) @@ -338,7 +338,7 @@ class boss_krick : public CreatureScript } } - void DoAction(int32 actionId) + void DoAction(int32 actionId) OVERRIDE { if (actionId == ACTION_OUTRO) { @@ -354,7 +354,7 @@ class boss_krick : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE || id != POINT_KRICK_INTRO) return; @@ -365,7 +365,7 @@ class boss_krick : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_1, 1000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_phase != PHASE_OUTRO) return; @@ -507,7 +507,7 @@ class boss_krick : public CreatureScript uint64 _tyrannusGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_krickAI(creature); } @@ -536,13 +536,13 @@ class spell_krick_explosive_barrage : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_krick_explosive_barrage_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_krick_explosive_barrage_AuraScript(); } @@ -574,14 +574,14 @@ class spell_ick_explosive_barrage : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_ick_explosive_barrage_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_ick_explosive_barrage_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ick_explosive_barrage_AuraScript(); } @@ -610,13 +610,13 @@ class spell_exploding_orb_hasty_grow : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_exploding_orb_hasty_grow_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAPPLY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_exploding_orb_hasty_grow_AuraScript(); } @@ -647,7 +647,7 @@ class spell_krick_pursuit : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_krick_pursuit_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -664,18 +664,18 @@ class spell_krick_pursuit : public SpellScriptLoader CAST_AI(boss_ick::boss_ickAI, creCaster->AI())->_ResetThreat(GetTarget()); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_krick_pursuit_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_krick_pursuit_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_krick_pursuit_AuraScript(); } @@ -702,14 +702,14 @@ class spell_krick_pursuit_confusion : public SpellScriptLoader GetTarget()->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_krick_pursuit_confusion_AuraScript::OnApply, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_krick_pursuit_confusion_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_krick_pursuit_confusion_AuraScript(); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 195a974a8d3..003b313d28c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -134,7 +134,7 @@ class boss_tyrannus : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (instance->GetBossState(DATA_TYRANNUS) != DONE) Reset(); @@ -142,7 +142,7 @@ class boss_tyrannus : public CreatureScript me->DespawnOrUnsummon(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.SetPhase(PHASE_NONE); @@ -156,12 +156,12 @@ class boss_tyrannus : public CreatureScript return ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_RIMEFANG)); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -170,7 +170,7 @@ class boss_tyrannus : public CreatureScript me->GetMotionMaster()->MoveChase(victim); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->SetBossState(DATA_TYRANNUS, FAIL); if (Creature* rimefang = GetRimefang()) @@ -179,13 +179,13 @@ class boss_tyrannus : public CreatureScript me->DespawnOrUnsummon(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); instance->SetBossState(DATA_TYRANNUS, DONE); @@ -199,7 +199,7 @@ class boss_tyrannus : public CreatureScript rimefang->AI()->DoAction(ACTION_END_COMBAT); } - void DoAction(int32 actionId) + void DoAction(int32 actionId) OVERRIDE { if (actionId == ACTION_START_INTRO) { @@ -213,7 +213,7 @@ class boss_tyrannus : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() && !events.IsInPhase(PHASE_INTRO)) return; @@ -277,7 +277,7 @@ class boss_tyrannus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetPitOfSaronAI<boss_tyrannusAI>(creature); } @@ -295,7 +295,7 @@ class boss_rimefang : public CreatureScript ASSERT(_vehicle); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.SetPhase(PHASE_NONE); @@ -306,12 +306,12 @@ class boss_rimefang : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _vehicle->InstallAllAccessories(false); } - void DoAction(int32 actionId) + void DoAction(int32 actionId) OVERRIDE { if (actionId == ACTION_START_RIMEFANG) { @@ -324,7 +324,7 @@ class boss_rimefang : public CreatureScript _EnterEvadeMode(); } - void SetGUID(uint64 guid, int32 type) + void SetGUID(uint64 guid, int32 type) OVERRIDE { if (type == GUID_HOARFROST) { @@ -333,7 +333,7 @@ class boss_rimefang : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() && !_events.IsInPhase(PHASE_COMBAT)) return; @@ -376,7 +376,7 @@ class boss_rimefang : public CreatureScript uint8 _currentWaypoint; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rimefangAI(creature); } @@ -389,25 +389,25 @@ class player_overlord_brandAI : public PlayerAI { } - void SetGUID(uint64 guid, int32 /*type*/) + void SetGUID(uint64 guid, int32 /*type*/) OVERRIDE { _tyrannus = guid; } - void DamageDealt(Unit* /*victim*/, uint32& damage, DamageEffectType /*damageType*/) + void DamageDealt(Unit* /*victim*/, uint32& damage, DamageEffectType /*damageType*/) OVERRIDE { if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannus)) if (tyrannus->GetVictim()) me->CastCustomSpell(SPELL_OVERLORD_BRAND_DAMAGE, SPELLVALUE_BASE_POINT0, damage, tyrannus->GetVictim(), true, NULL, NULL, tyrannus->GetGUID()); } - void HealDone(Unit* /*target*/, uint32& addHealth) + void HealDone(Unit* /*target*/, uint32& addHealth) OVERRIDE { if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannus)) me->CastCustomSpell(SPELL_OVERLORD_BRAND_HEAL, SPELLVALUE_BASE_POINT0, int32(addHealth*5.5f), tyrannus, true, NULL, NULL, tyrannus->GetGUID()); } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} private: uint64 _tyrannus; @@ -422,7 +422,7 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader { PrepareAuraScript(spell_tyrannus_overlord_brand_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetEntry() == NPC_TYRANNUS; } @@ -449,7 +449,7 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader delete thisAI; } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_tyrannus_overlord_brand_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_tyrannus_overlord_brand_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -459,7 +459,7 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader bool oldAIState; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_tyrannus_overlord_brand_AuraScript(); } @@ -485,13 +485,13 @@ class spell_tyrannus_mark_of_rimefang : public SpellScriptLoader rimefang->AI()->SetGUID(GetTarget()->GetGUID(), GUID_HOARFROST); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_tyrannus_mark_of_rimefang_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_tyrannus_mark_of_rimefang_AuraScript(); } @@ -502,7 +502,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript public: at_tyrannus_event_starter() : AreaTriggerScript("at_tyrannus_event_starter") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); if (player->IsGameMaster() || !instance) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 1abdf2acd60..5efc2e6afaf 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -224,7 +224,7 @@ class instance_pit_of_saron : public InstanceMapScript return true; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -237,7 +237,7 @@ class instance_pit_of_saron : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -322,7 +322,7 @@ class instance_pit_of_saron : public InstanceMapScript uint32 _teamInInstance; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_pit_of_saron_InstanceScript(map); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 48498b4dbeb..82dfcb716b6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -22,7 +22,7 @@ #include "pit_of_saron.h" #include "Vehicle.h" -enum eSpells +enum Spells { SPELL_FIREBALL = 69583, //Ymirjar Flamebearer SPELL_HELLFIRE = 69586, @@ -31,7 +31,7 @@ enum eSpells SPELL_LEAPING_FACE_MAUL = 69504, // Geist Ambusher }; -enum eEvents +enum Events { // Ymirjar Flamebearer EVENT_FIREBALL = 1, @@ -49,18 +49,18 @@ class npc_ymirjar_flamebearer : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _events.ScheduleEvent(EVENT_FIREBALL, 4000); _events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -97,7 +97,7 @@ class npc_ymirjar_flamebearer : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ymirjar_flamebearerAI(creature); } @@ -115,17 +115,17 @@ class npc_iceborn_protodrake : public CreatureScript ASSERT(_vehicle); } - void Reset() + void Reset() OVERRIDE { _frostBreathCooldown = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _vehicle->RemoveAllPassengers(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -146,7 +146,7 @@ class npc_iceborn_protodrake : public CreatureScript uint32 _frostBreathCooldown; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_iceborn_protodrakeAI(creature); } @@ -163,12 +163,12 @@ class npc_geist_ambusher : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _leapingFaceMaulCooldown = 9000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (who->GetTypeId() != TYPEID_PLAYER) return; @@ -178,7 +178,7 @@ class npc_geist_ambusher : public CreatureScript DoCast(who, SPELL_LEAPING_FACE_MAUL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -199,7 +199,7 @@ class npc_geist_ambusher : public CreatureScript uint32 _leapingFaceMaulCooldown; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_geist_ambusherAI(creature); } @@ -223,13 +223,13 @@ class spell_trash_npc_glacial_strike : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_trash_npc_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_trash_npc_glacial_strike_AuraScript(); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 958e8c3f39f..93030492caf 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -86,13 +86,13 @@ class boss_drakkari_colossus : public CreatureScript introDone = false; } - void InitializeAI() + void InitializeAI() OVERRIDE { if (!me->isDead()) Reset(); } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -113,7 +113,7 @@ class boss_drakkari_colossus : public CreatureScript instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -124,7 +124,7 @@ class boss_drakkari_colossus : public CreatureScript instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -133,14 +133,14 @@ class boss_drakkari_colossus : public CreatureScript instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, DONE); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { // Note: This should not be called, but before use SetBossState function we should use BossAI // in all the bosses of the instance instance->SetData(DATA_DRAKKARI_COLOSSUS_EVENT, FAIL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -173,7 +173,7 @@ class boss_drakkari_colossus : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC)) damage = 0; @@ -192,7 +192,7 @@ class boss_drakkari_colossus : public CreatureScript } } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { if (data == DATA_COLOSSUS_PHASE) return phase; @@ -202,13 +202,13 @@ class boss_drakkari_colossus : public CreatureScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == DATA_INTRO_DONE) introDone = data; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -233,7 +233,7 @@ class boss_drakkari_colossus : public CreatureScript DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->SetInCombatWithZone(); @@ -246,7 +246,7 @@ class boss_drakkari_colossus : public CreatureScript bool introDone; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_drakkari_colossusAI(creature); } @@ -265,7 +265,7 @@ class boss_drakkari_elemental : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); @@ -273,7 +273,7 @@ class boss_drakkari_elemental : public CreatureScript me->AddAura(SPELL_MOJO_VOLLEY, me); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer == me) return; @@ -285,7 +285,7 @@ class boss_drakkari_elemental : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -311,7 +311,7 @@ class boss_drakkari_elemental : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -327,7 +327,7 @@ class boss_drakkari_elemental : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (HealthBelowPct(50) && instance) { @@ -357,12 +357,12 @@ class boss_drakkari_elemental : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->DespawnOrUnsummon(); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_MERGE) { @@ -379,7 +379,7 @@ class boss_drakkari_elemental : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_drakkari_elementalAI(creature); } @@ -390,9 +390,9 @@ class npc_living_mojo : public CreatureScript public: npc_living_mojo() : CreatureScript("npc_living_mojo") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_living_mojoAI (creature); + return new npc_living_mojoAI(creature); } struct npc_living_mojoAI : public ScriptedAI @@ -402,7 +402,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { mojoWaveTimer = 2*IN_MILLISECONDS; mojoPuddleTimer = 7*IN_MILLISECONDS; @@ -422,7 +422,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -440,7 +440,7 @@ public: } } - void AttackStart(Unit* attacker) + void AttackStart(Unit* attacker) OVERRIDE { if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) return; @@ -466,7 +466,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 6aca3a2ff88..c11db7146d1 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -35,9 +35,9 @@ class boss_eck : public CreatureScript public: boss_eck() : CreatureScript("boss_eck") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_eckAI (creature); + return new boss_eckAI(creature); } struct boss_eckAI : public ScriptedAI @@ -56,7 +56,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiBerserkTimer = urand(60*IN_MILLISECONDS, 90*IN_MILLISECONDS); //60-90 secs according to wowwiki uiBiteTimer = 5*IN_MILLISECONDS; @@ -69,13 +69,13 @@ public: instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -125,7 +125,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ECK_THE_FEROCIOUS_EVENT, DONE); @@ -139,9 +139,9 @@ class npc_ruins_dweller : public CreatureScript public: npc_ruins_dweller() : CreatureScript("npc_ruins_dweller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_ruins_dwellerAI (creature); + return new npc_ruins_dwellerAI(creature); } struct npc_ruins_dwellerAI : public ScriptedAI @@ -153,7 +153,7 @@ public: InstanceScript* instance; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 1d2398dbfb4..7a5520ab145 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -58,16 +58,19 @@ enum CombatPhase RHINO }; -#define DATA_SHARE_THE_LOVE 1 +enum Misc +{ + DATA_SHARE_THE_LOVE = 1 +}; class boss_gal_darah : public CreatureScript { public: boss_gal_darah() : CreatureScript("boss_gal_darah") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_gal_darahAI (creature); + return new boss_gal_darahAI(creature); } struct boss_gal_darahAI : public ScriptedAI @@ -95,7 +98,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiStampedeTimer = 10*IN_MILLISECONDS; uiWhirlingSlashTimer = 21*IN_MILLISECONDS; @@ -119,7 +122,7 @@ public: instance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -127,7 +130,7 @@ public: instance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -254,7 +257,7 @@ public: impaledList.push_back(guid); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_SHARE_THE_LOVE) return shareTheLove; @@ -262,7 +265,7 @@ public: return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -270,7 +273,7 @@ public: instance->SetData(DATA_GAL_DARAH_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -288,7 +291,7 @@ class achievement_share_the_love : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index bfc1b9cfcb6..0ccaea316ef 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -19,7 +19,7 @@ #include "ScriptedCreature.h" #include "gundrak.h" -enum eSpells +enum Spells { SPELL_DETERMINED_STAB = 55104, SPELL_GROUND_TREMOR = 55142, @@ -32,7 +32,7 @@ enum eSpells SPELL_TRANSFORMATION = 55098, //Periodic, The caster transforms into a powerful mammoth, increasing Physical damage done by 25% and granting immunity to Stun effects. }; -enum eSays +enum Says { SAY_AGGRO = 0, SAY_SLAY = 1, @@ -42,14 +42,17 @@ enum eSays EMOTE_TRANSFORM = 5 }; -#define DATA_LESS_RABI 1 +enum Misc +{ + DATA_LESS_RABI = 1 +}; class boss_moorabi : public CreatureScript { public: boss_moorabi() : CreatureScript("boss_moorabi") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_moorabiAI(creature); } @@ -70,7 +73,7 @@ public: uint32 uiDeterminedStabTimer; uint32 uiTransformationTImer; - void Reset() + void Reset() OVERRIDE { uiGroundTremorTimer = 18*IN_MILLISECONDS; uiNumblingShoutTimer = 10*IN_MILLISECONDS; @@ -82,7 +85,7 @@ public: instance->SetData(DATA_MOORABI_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DoCast(me, SPELL_MOJO_FRENZY, true); @@ -91,7 +94,7 @@ public: instance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -142,7 +145,7 @@ public: DoMeleeAttackIfReady(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_LESS_RABI) return bPhase ? 0 : 1; @@ -150,7 +153,7 @@ public: return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -158,7 +161,7 @@ public: instance->SetData(DATA_MOORABI_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -176,7 +179,7 @@ class achievement_less_rabi : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 71c4c1b4f41..afd0e8a4342 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -21,7 +21,6 @@ #include "gundrak.h" #include "Player.h" -//Spells enum Spells { SPELL_POISON_NOVA = 55081, @@ -32,7 +31,6 @@ enum Spells H_SPELL_VENOM_BOLT = 59839 }; -//Yell enum Yells { SAY_AGGRO = 0, @@ -43,14 +41,12 @@ enum Yells EMOTE_NOVA = 5 }; -//Creatures enum Creatures { CREATURE_SNAKE = 29680, CREATURE_CONSTRICTORS = 29713 }; -//Creatures' spells enum ConstrictorSpells { SPELL_GRIP_OF_SLAD_RAN = 55093, @@ -68,16 +64,19 @@ static Position SpawnLoc[]= {1716.76f, 635.159f, 129.282f, 0.191986f} }; -#define DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES 1 +enum Misc +{ + DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES = 1 +}; class boss_slad_ran : public CreatureScript { public: boss_slad_ran() : CreatureScript("boss_slad_ran") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_slad_ranAI (creature); + return new boss_slad_ranAI(creature); } struct boss_slad_ranAI : public ScriptedAI @@ -99,7 +98,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiPoisonNovaTimer = 10*IN_MILLISECONDS; uiPowerfullBiteTimer = 3*IN_MILLISECONDS; @@ -114,7 +113,7 @@ public: instance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -122,7 +121,7 @@ public: instance->SetData(DATA_SLAD_RAN_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -176,7 +175,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); lSummons.DespawnAll(); @@ -185,18 +184,18 @@ public: instance->SetData(DATA_SLAD_RAN_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); lSummons.Summon(summoned); } - void SetGUID(uint64 guid, int32 type) + void SetGUID(uint64 guid, int32 type) OVERRIDE { if (type == DATA_SNAKES_WHYD_IT_HAVE_TO_BE_SNAKES) lWrappedPlayers.insert(guid); @@ -215,9 +214,9 @@ class npc_slad_ran_constrictor : public CreatureScript public: npc_slad_ran_constrictor() : CreatureScript("npc_slad_ran_constrictor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_slad_ran_constrictorAI (creature); + return new npc_slad_ran_constrictorAI(creature); } struct npc_slad_ran_constrictorAI : public ScriptedAI @@ -226,12 +225,12 @@ public: uint32 uiGripOfSladRanTimer; - void Reset() + void Reset() OVERRIDE { uiGripOfSladRanTimer = 1*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -268,9 +267,9 @@ class npc_slad_ran_viper : public CreatureScript public: npc_slad_ran_viper() : CreatureScript("npc_slad_ran_viper") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_slad_ran_viperAI (creature); + return new npc_slad_ran_viperAI(creature); } struct npc_slad_ran_viperAI : public ScriptedAI @@ -281,12 +280,12 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiVenomousBiteTimer = 2*IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -308,7 +307,7 @@ class achievement_snakes_whyd_it_have_to_be_snakes : public AchievementCriteriaS { } - bool OnCheck(Player* player, Unit* target) + bool OnCheck(Player* player, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index ddd26fe6bc2..9af4de8135d 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -36,7 +36,7 @@ class instance_gundrak : public InstanceMapScript public: instance_gundrak() : InstanceMapScript("instance_gundrak", 604) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_gundrak_InstanceMapScript(map); } @@ -272,7 +272,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -325,7 +325,7 @@ public: SaveToDB(); } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { if (type == DATA_RUIN_DWELLER_DIED) DwellerGUIDs.erase(data); @@ -337,7 +337,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -358,7 +358,7 @@ public: return 0; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -541,7 +541,7 @@ class go_gundrak_altar : public GameObjectScript public: go_gundrak_altar() : GameObjectScript("go_gundrak_altar") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); uint64 statueGUID = 0; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 86e455fedc8..0c859236965 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -184,7 +184,7 @@ class boss_blood_council_controller : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { events.Reset(); me->SetReactState(REACT_PASSIVE); @@ -194,7 +194,7 @@ class boss_blood_council_controller : public CreatureScript instance->SetBossState(DATA_BLOOD_PRINCE_COUNCIL, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == IN_PROGRESS) return; @@ -243,14 +243,14 @@ class boss_blood_council_controller : public CreatureScript } } - void SetData(uint32 /*type*/, uint32 data) + void SetData(uint32 /*type*/, uint32 data) OVERRIDE { _resetCounter += uint8(data); if (_resetCounter == 3) EnterEvadeMode(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _resetCounter = 0; if (Creature* keleseth = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PRINCE_KELESETH_GUID))) @@ -263,7 +263,7 @@ class boss_blood_council_controller : public CreatureScript valanar->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { _JustDied(); // kill all prices @@ -282,7 +282,7 @@ class boss_blood_council_controller : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -349,7 +349,7 @@ class boss_blood_council_controller : public CreatureScript uint32 _resetCounter; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_blood_council_controllerAI>(creature); } @@ -368,7 +368,7 @@ class boss_prince_keleseth_icc : public CreatureScript _spawnHealth = creature->GetMaxHealth(); } - void InitializeAI() + void InitializeAI() OVERRIDE { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -380,7 +380,7 @@ class boss_prince_keleseth_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void Reset() + void Reset() OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -392,7 +392,7 @@ class boss_prince_keleseth_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BLOOD_PRINCES_CONTROL))) DoZoneInCombat(controller); @@ -408,7 +408,7 @@ class boss_prince_keleseth_icc : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -417,7 +417,7 @@ class boss_prince_keleseth_icc : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->SetHealth(_spawnHealth); @@ -429,19 +429,19 @@ class boss_prince_keleseth_icc : public CreatureScript } } - void JustRespawned() + void JustRespawned() OVERRIDE { DoCast(me, SPELL_FEIGN_DEATH); me->SetHealth(_spawnHealth); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_INVOCATION_OF_BLOOD_KELESETH) DoAction(ACTION_CAST_INVOCATION); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); Position pos; @@ -453,7 +453,7 @@ class boss_prince_keleseth_icc : public CreatureScript summon->ToTempSummon()->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -462,7 +462,7 @@ class boss_prince_keleseth_icc : public CreatureScript instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void DamageTaken(Unit* attacker, uint32& damage) + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { if (!_isEmpowered) { @@ -471,13 +471,13 @@ class boss_prince_keleseth_icc : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KELESETH_KILL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -522,7 +522,7 @@ class boss_prince_keleseth_icc : public CreatureScript return true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckRoom()) return; @@ -565,7 +565,7 @@ class boss_prince_keleseth_icc : public CreatureScript bool _isEmpowered; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_prince_kelesethAI>(creature); } @@ -584,7 +584,7 @@ class boss_prince_taldaram_icc : public CreatureScript _spawnHealth = creature->GetMaxHealth(); } - void InitializeAI() + void InitializeAI() OVERRIDE { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -596,7 +596,7 @@ class boss_prince_taldaram_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void Reset() + void Reset() OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -608,11 +608,12 @@ class boss_prince_taldaram_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BLOOD_PRINCES_CONTROL))) DoZoneInCombat(controller); @@ -624,7 +625,7 @@ class boss_prince_taldaram_icc : public CreatureScript me->AddAura(SPELL_SHADOW_PRISON, me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -633,7 +634,7 @@ class boss_prince_taldaram_icc : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->SetHealth(_spawnHealth); @@ -645,19 +646,19 @@ class boss_prince_taldaram_icc : public CreatureScript } } - void JustRespawned() + void JustRespawned() OVERRIDE { DoCast(me, SPELL_FEIGN_DEATH); me->SetHealth(_spawnHealth); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_INVOCATION_OF_BLOOD_TALDARAM) DoAction(ACTION_CAST_INVOCATION); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -10.0f, true); // first try at distance @@ -671,7 +672,7 @@ class boss_prince_taldaram_icc : public CreatureScript summon->AI()->SetGUID(target->GetGUID()); } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -680,7 +681,7 @@ class boss_prince_taldaram_icc : public CreatureScript instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void DamageTaken(Unit* attacker, uint32& damage) + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { if (!_isEmpowered) { @@ -689,13 +690,13 @@ class boss_prince_taldaram_icc : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_TALDARAM_KILL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -740,7 +741,7 @@ class boss_prince_taldaram_icc : public CreatureScript return true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckRoom()) return; @@ -788,7 +789,7 @@ class boss_prince_taldaram_icc : public CreatureScript bool _isEmpowered; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_prince_taldaramAI>(creature); } @@ -807,7 +808,7 @@ class boss_prince_valanar_icc : public CreatureScript _spawnHealth = creature->GetMaxHealth(); } - void InitializeAI() + void InitializeAI() OVERRIDE { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -819,7 +820,7 @@ class boss_prince_valanar_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void Reset() + void Reset() OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -831,11 +832,12 @@ class boss_prince_valanar_icc : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BLOOD_PRINCES_CONTROL))) DoZoneInCombat(controller); @@ -847,7 +849,7 @@ class boss_prince_valanar_icc : public CreatureScript me->AddAura(SPELL_SHADOW_PRISON, me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -856,7 +858,7 @@ class boss_prince_valanar_icc : public CreatureScript instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); me->SetHealth(me->GetMaxHealth()); @@ -868,13 +870,13 @@ class boss_prince_valanar_icc : public CreatureScript } } - void JustRespawned() + void JustRespawned() OVERRIDE { DoCast(me, SPELL_FEIGN_DEATH); me->SetHealth(_spawnHealth); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { switch (summon->GetEntry()) { @@ -903,13 +905,13 @@ class boss_prince_valanar_icc : public CreatureScript DoZoneInCombat(summon); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_INVOCATION_OF_BLOOD_VALANAR) DoAction(ACTION_CAST_INVOCATION); } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -918,7 +920,7 @@ class boss_prince_valanar_icc : public CreatureScript instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void DamageTaken(Unit* attacker, uint32& damage) + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { if (!_isEmpowered) { @@ -927,13 +929,13 @@ class boss_prince_valanar_icc : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_VALANAR_KILL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -978,7 +980,7 @@ class boss_prince_valanar_icc : public CreatureScript return true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckRoom()) return; @@ -1031,7 +1033,7 @@ class boss_prince_valanar_icc : public CreatureScript bool _isEmpowered; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_prince_valanarAI>(creature); } @@ -1050,7 +1052,7 @@ class npc_blood_queen_lana_thel : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); me->SetDisableGravity(true); @@ -1063,7 +1065,8 @@ class npc_blood_queen_lana_thel : public CreatureScript me->SetVisible(true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (_introDone) return; @@ -1084,13 +1087,13 @@ class npc_blood_queen_lana_thel : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == POINT_INTRO_DESPAWN) me->SetVisible(false); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!_events.GetPhaseMask()) return; @@ -1124,7 +1127,7 @@ class npc_blood_queen_lana_thel : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_blood_queen_lana_thelAI>(creature); } @@ -1142,7 +1145,7 @@ class npc_ball_of_flame : public CreatureScript _despawnTimer = 0; } - void Reset() + void Reset() OVERRIDE { me->CastSpell(me, SPELL_BALL_OF_FLAMES_VISUAL, true); if (me->GetEntry() == NPC_BALL_OF_INFERNO_FLAME) @@ -1152,7 +1155,7 @@ class npc_ball_of_flame : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == CHASE_MOTION_TYPE && id == GUID_LOPART(_chaseGUID) && _chaseGUID) { @@ -1163,12 +1166,12 @@ class npc_ball_of_flame : public CreatureScript } } - void SetGUID(uint64 guid, int32 /*type*/) + void SetGUID(uint64 guid, int32 /*type*/) OVERRIDE { _chaseGUID = guid; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_FLAME_BALL_CHASE) if (Player* target = ObjectAccessor::GetPlayer(*me, _chaseGUID)) @@ -1180,7 +1183,7 @@ class npc_ball_of_flame : public CreatureScript } } - void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) + void DamageDealt(Unit* /*target*/, uint32& damage, DamageEffectType damageType) OVERRIDE { if (damageType != SPELL_DIRECT_DAMAGE) return; @@ -1189,7 +1192,7 @@ class npc_ball_of_flame : public CreatureScript _instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(false)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!_despawnTimer) return; @@ -1209,7 +1212,7 @@ class npc_ball_of_flame : public CreatureScript uint32 _despawnTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_ball_of_flameAI>(creature); } @@ -1224,7 +1227,7 @@ class npc_kinetic_bomb : public CreatureScript { npc_kinetic_bombAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); me->SetWalk(true); @@ -1236,7 +1239,7 @@ class npc_kinetic_bomb : public CreatureScript _groundZ = me->GetMap()->GetHeight(me->GetPhaseMask(), _x, _y, _groundZ, true, 500.0f); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == SPELL_KINETIC_BOMB_EXPLOSION) _events.ScheduleEvent(EVENT_BOMB_DESPAWN, 1000); @@ -1248,7 +1251,7 @@ class npc_kinetic_bomb : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -1276,7 +1279,7 @@ class npc_kinetic_bomb : public CreatureScript float _groundZ; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_kinetic_bombAI>(creature); } @@ -1295,13 +1298,13 @@ class npc_dark_nucleus : public CreatureScript _targetAuraCheck = 0; } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_DEFENSIVE); me->CastSpell(me, SPELL_SHADOW_RESONANCE_AURA, true); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { _targetAuraCheck = 1000; if (me->GetDistance(who) >= 15.0f) @@ -1314,12 +1317,13 @@ class npc_dark_nucleus : public CreatureScript me->ClearUnitState(UNIT_STATE_CASTING); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); } - void DamageTaken(Unit* attacker, uint32& /*damage*/) + void DamageTaken(Unit* attacker, uint32& /*damage*/) OVERRIDE { if (attacker == me) return; @@ -1328,7 +1332,7 @@ class npc_dark_nucleus : public CreatureScript me->AddThreat(attacker, 500000000.0f); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1357,7 +1361,7 @@ class npc_dark_nucleus : public CreatureScript bool _lockedTarget; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_dark_nucleusAI>(creature); } @@ -1378,13 +1382,13 @@ class spell_taldaram_glittering_sparks : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_taldaram_glittering_sparks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_taldaram_glittering_sparks_SpellScript(); } @@ -1405,13 +1409,13 @@ class spell_taldaram_summon_flame_ball : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_taldaram_summon_flame_ball_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_taldaram_summon_flame_ball_SpellScript(); } @@ -1426,7 +1430,7 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader { PrepareAuraScript(spell_flame_ball_visual_AuraScript); - bool Load() + bool Load() OVERRIDE { if (GetCaster()->GetEntry() == NPC_BALL_OF_FLAME || GetCaster()->GetEntry() == NPC_BALL_OF_INFERNO_FLAME) return true; @@ -1449,13 +1453,13 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader target->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_flame_ball_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_flame_ball_visual_AuraScript(); } @@ -1476,13 +1480,13 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader aur->SetStackAmount(uint8(GetSpellInfo()->StackAmount)); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_taldaram_ball_of_inferno_flame_SpellScript::ModAuraStack); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_taldaram_ball_of_inferno_flame_SpellScript(); } @@ -1506,7 +1510,7 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_valanar_kinetic_bomb_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } @@ -1531,18 +1535,18 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_valanar_kinetic_bomb_AuraScript::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_valanar_kinetic_bomb_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_valanar_kinetic_bomb_AuraScript(); } @@ -1563,13 +1567,13 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScriptLoader target->AI()->DoAction(ACTION_KINETIC_BOMB_JUMP); } - void Register() + void Register() OVERRIDE { BeforeHit += SpellHitFn(spell_valanar_kinetic_bomb_knockback_SpellScript::KnockIntoAir); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_valanar_kinetic_bomb_knockback_SpellScript(); } @@ -1591,13 +1595,13 @@ class spell_valanar_kinetic_bomb_absorb : public SpellScriptLoader dmgInfo.AbsorbDamage(absorbAmount); } - void Register() + void Register() OVERRIDE { OnEffectAbsorb += AuraEffectAbsorbFn(spell_valanar_kinetic_bomb_absorb_AuraScript::OnAbsorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_valanar_kinetic_bomb_absorb_AuraScript(); } @@ -1618,13 +1622,13 @@ class spell_blood_council_shadow_prison : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_PRISON_DAMAGE, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_blood_council_shadow_prison_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_blood_council_shadow_prison_AuraScript(); } @@ -1646,13 +1650,13 @@ class spell_blood_council_shadow_prison_damage : public SpellScriptLoader SetHitDamage(GetHitDamage() + eff->GetAmount()); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_blood_council_shadow_prison_SpellScript::AddExtraDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_blood_council_shadow_prison_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index f602a07f47f..107b95c5990 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -145,7 +145,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); events.ScheduleEvent(EVENT_BERSERK, 330000); @@ -163,7 +163,7 @@ class boss_blood_queen_lana_thel : public CreatureScript _killMinchar = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer())) { @@ -183,7 +183,7 @@ class boss_blood_queen_lana_thel : public CreatureScript _creditBloodQuickening = instance->GetData(DATA_BLOOD_QUICKENING_STATE) == IN_PROGRESS; } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -223,7 +223,7 @@ class boss_blood_queen_lana_thel : public CreatureScript instance->DoRemoveAurasDueToSpellOnPlayers(PRESENCE_OF_THE_DARKFALLEN); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_KILL_MINCHAR) return; @@ -238,7 +238,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { _EnterEvadeMode(); CleanAuras(); @@ -256,7 +256,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); @@ -266,13 +266,13 @@ class boss_blood_queen_lana_thel : public CreatureScript instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, FAIL); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void SetGUID(uint64 guid, int32 type = 0) + void SetGUID(uint64 guid, int32 type = 0) OVERRIDE { switch (type) { @@ -287,7 +287,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -325,7 +325,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -498,7 +498,7 @@ class boss_blood_queen_lana_thel : public CreatureScript bool _killMinchar; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_blood_queen_lana_thelAI>(creature); } @@ -516,7 +516,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader { PrepareSpellScript(spell_blood_queen_vampiric_bite_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR)) return false; @@ -570,7 +570,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PRESENCE_OF_THE_DARKFALLEN_2, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_blood_queen_vampiric_bite_SpellScript::CheckTarget); BeforeHit += SpellHitFn(spell_blood_queen_vampiric_bite_SpellScript::OnCast); @@ -578,7 +578,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_blood_queen_vampiric_bite_SpellScript(); } @@ -616,14 +616,14 @@ class spell_blood_queen_frenzied_bloodthirst : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_blood_queen_frenzied_bloodthirst_AuraScript::OnApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_blood_queen_frenzied_bloodthirst_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_blood_queen_frenzied_bloodthirst_AuraScript(); } @@ -652,14 +652,14 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader { PrepareSpellScript(spell_blood_queen_bloodbolt_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TWILIGHT_BLOODBOLT)) return false; return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetEntry() == NPC_BLOOD_QUEEN_LANA_THEL; } @@ -680,14 +680,14 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_TWILIGHT_BLOODBOLT, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_bloodbolt_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_blood_queen_bloodbolt_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_blood_queen_bloodbolt_SpellScript(); } @@ -703,7 +703,7 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader { PrepareAuraScript(spell_blood_queen_essence_of_the_blood_queen_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL)) return false; @@ -717,13 +717,13 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), TRIGGERED_FULL_MASK, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_blood_queen_essence_of_the_blood_queen_AuraScript::OnProc, EFFECT_1, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_blood_queen_essence_of_the_blood_queen_AuraScript(); } @@ -765,13 +765,13 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_pact_of_the_darkfallen_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_blood_queen_pact_of_the_darkfallen_SpellScript(); } @@ -786,7 +786,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader { PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE)) return false; @@ -803,13 +803,13 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript(); } @@ -830,13 +830,13 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo unitList.push_back(GetCaster()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript(); } @@ -847,7 +847,7 @@ class achievement_once_bitten_twice_shy_n : public AchievementCriteriaScript public: achievement_once_bitten_twice_shy_n() : AchievementCriteriaScript("achievement_once_bitten_twice_shy_n") { } - bool OnCheck(Player* source, Unit* target) + bool OnCheck(Player* source, Unit* target) OVERRIDE { if (!target) return false; @@ -863,7 +863,7 @@ class achievement_once_bitten_twice_shy_v : public AchievementCriteriaScript public: achievement_once_bitten_twice_shy_v() : AchievementCriteriaScript("achievement_once_bitten_twice_shy_v") { } - bool OnCheck(Player* source, Unit* target) + bool OnCheck(Player* source, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 08a14c3d700..0f46888fbe7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -199,7 +199,10 @@ enum Actions ACTION_MARK_OF_THE_FALLEN_CHAMPION = -72293, }; -#define DATA_MADE_A_MESS 45374613 // 4537, 4613 are achievement IDs +enum Misc +{ + DATA_MADE_A_MESS = 45374613 // 4537, 4613 are achievement IDs +}; enum MovePoints { @@ -251,7 +254,7 @@ class boss_deathbringer_saurfang : public CreatureScript _fallenChampionCastCount = 0; } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -268,7 +271,7 @@ class boss_deathbringer_saurfang : public CreatureScript me->RemoveAurasDueToSpell(SPELL_FRENZY); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (_dead) return; @@ -308,11 +311,11 @@ class boss_deathbringer_saurfang : public CreatureScript instance->SetBossState(DATA_DEATHBRINGER_SAURFANG, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC)) return; @@ -320,27 +323,27 @@ class boss_deathbringer_saurfang : public CreatureScript ScriptedAI::AttackStart(victim); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); if (_introDone) me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); instance->SetBossState(DATA_DEATHBRINGER_SAURFANG, FAIL); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MARK_OF_THE_FALLEN_CHAMPION); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (damage >= me->GetHealth()) damage = me->GetHealth() - 1; @@ -370,7 +373,7 @@ class boss_deathbringer_saurfang : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) summon->AI()->AttackStart(target); @@ -381,12 +384,12 @@ class boss_deathbringer_saurfang : public CreatureScript DoZoneInCombat(summon); } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE { summons.Despawn(summon); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE && id != POINT_SAURFANG) return; @@ -394,7 +397,7 @@ class boss_deathbringer_saurfang : public CreatureScript instance->HandleGameObject(instance->GetData64(GO_SAURFANG_S_DOOR), false); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { switch (spell->Id) { @@ -413,14 +416,14 @@ class boss_deathbringer_saurfang : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_BLOOD_LINK_POWER) if (Aura* bloodPower = me->GetAura(SPELL_BLOOD_POWER)) bloodPower->RecalculateAmountOfEffects(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() && !(events.IsInPhase(PHASE_INTRO_A) || events.IsInPhase(PHASE_INTRO_H))) return; @@ -502,7 +505,7 @@ class boss_deathbringer_saurfang : public CreatureScript DoMeleeAttackIfReady(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_MADE_A_MESS) if (_fallenChampionCastCount < RAID_MODE<uint32>(3, 5, 3, 5)) @@ -512,7 +515,7 @@ class boss_deathbringer_saurfang : public CreatureScript } // intro setup - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -577,7 +580,7 @@ class boss_deathbringer_saurfang : public CreatureScript bool _dead; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_deathbringer_saurfangAI>(creature); } @@ -598,12 +601,12 @@ class npc_high_overlord_saurfang_icc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -654,7 +657,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_GRIP_OF_AGONY) { @@ -663,7 +666,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE) { @@ -708,7 +711,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); while (uint32 eventId = _events.ExecuteEvent()) @@ -767,7 +770,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript std::list<Creature*> _guardList; }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) @@ -779,7 +782,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -789,7 +792,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_high_overlord_saurfangAI>(creature); } @@ -807,12 +810,12 @@ class npc_muradin_bronzebeard_icc : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -859,7 +862,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_GRIP_OF_AGONY) { @@ -868,7 +871,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == POINT_FIRST_STEP) { @@ -888,7 +891,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); while (uint32 eventId = _events.ExecuteEvent()) @@ -915,7 +918,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript std::list<Creature*> _guardList; }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) @@ -927,7 +930,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -937,7 +940,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_muradin_bronzebeard_iccAI>(creature); } @@ -955,13 +958,13 @@ class npc_saurfang_event : public CreatureScript _index = 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { ASSERT(!type && data && data < 6); _index = data; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_GRIP_OF_AGONY) { @@ -970,7 +973,7 @@ class npc_saurfang_event : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_CHARGE && _index) me->GetMotionMaster()->MoveCharge(chargePos[_index].GetPositionX(), chargePos[_index].GetPositionY(), chargePos[_index].GetPositionZ(), 13.0f, POINT_CHARGE); @@ -982,7 +985,7 @@ class npc_saurfang_event : public CreatureScript uint32 _index; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_saurfang_eventAI>(creature); } @@ -997,7 +1000,7 @@ class spell_deathbringer_blood_link : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_blood_link_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_POWER)) return false; @@ -1012,13 +1015,13 @@ class spell_deathbringer_blood_link : public SpellScriptLoader PreventHitDefaultEffect(EFFECT_0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_link_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_deathbringer_blood_link_SpellScript(); } @@ -1033,7 +1036,7 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader { PrepareAuraScript(spell_deathbringer_blood_link_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_THE_FALLEN_CHAMPION)) return false; @@ -1048,13 +1051,13 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader saurfang->AI()->DoAction(ACTION_MARK_OF_THE_FALLEN_CHAMPION); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_deathbringer_blood_link_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_deathbringer_blood_link_AuraScript(); } @@ -1075,7 +1078,7 @@ class spell_deathbringer_blood_power : public SpellScriptLoader aura->RecalculateAmountOfEffects(); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_deathbringer_blood_power_SpellScript::ModAuraValue); } @@ -1091,19 +1094,19 @@ class spell_deathbringer_blood_power : public SpellScriptLoader canBeRecalculated = true; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_0, SPELL_AURA_MOD_SCALE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_deathbringer_blood_power_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_deathbringer_blood_power_AuraScript(); } @@ -1118,7 +1121,7 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_rune_of_blood_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_DUMMY)) return false; @@ -1132,13 +1135,13 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_BLOOD_LINK_DUMMY, SPELLVALUE_BASE_POINT0, 1, GetCaster(), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_rune_of_blood_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_deathbringer_rune_of_blood_SpellScript(); } @@ -1153,7 +1156,7 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_blood_nova_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_DUMMY)) return false; @@ -1167,13 +1170,13 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_BLOOD_LINK_DUMMY, SPELLVALUE_BASE_POINT0, 2, GetCaster(), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_nova_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_deathbringer_blood_nova_SpellScript(); } @@ -1188,7 +1191,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_blood_nova_targeting_SpellScript); - bool Load() + bool Load() OVERRIDE { // initialize variable target = NULL; @@ -1242,7 +1245,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -1252,7 +1255,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader WorldObject* target; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_deathbringer_blood_nova_targeting_SpellScript(); } @@ -1267,7 +1270,7 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader { PrepareSpellScript(spell_deathbringer_boiling_blood_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1283,13 +1286,13 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader targets.push_back(target); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_boiling_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_deathbringer_boiling_blood_SpellScript(); } @@ -1310,13 +1313,13 @@ class spell_deathbringer_remove_marks : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_deathbringer_remove_marks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_deathbringer_remove_marks_SpellScript(); } @@ -1327,7 +1330,7 @@ class achievement_ive_gone_and_made_a_mess : public AchievementCriteriaScript public: achievement_ive_gone_and_made_a_mess() : AchievementCriteriaScript("achievement_ive_gone_and_made_a_mess") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (target) if (Creature* saurfang = target->ToCreature()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 998e87ce015..bf85fe455c7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -71,7 +71,10 @@ enum Events EVENT_MORTAL_WOUND = 7, }; -#define DATA_INOCULATED_STACK 69291 +enum Misc +{ + DATA_INOCULATED_STACK = 69291 +}; class boss_festergut : public CreatureScript { @@ -87,7 +90,7 @@ class boss_festergut : public CreatureScript _gasDummyGUID = 0; } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -109,7 +112,7 @@ class boss_festergut : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer())) { @@ -127,7 +130,7 @@ class boss_festergut : public CreatureScript DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -137,32 +140,32 @@ class boss_festergut : public CreatureScript RemoveBlight(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); instance->SetBossState(DATA_FESTERGUT, FAIL); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE))) professor->AI()->EnterEvadeMode(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == PUNGENT_BLIGHT_HELPER) target->RemoveAurasDueToSpell(INOCULATED_HELPER); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -238,13 +241,13 @@ class boss_festergut : public CreatureScript DoMeleeAttackIfReady(); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == DATA_INOCULATED_STACK && data > _maxInoculatedStack) _maxInoculatedStack = data; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_INOCULATED_STACK) return uint32(_maxInoculatedStack); @@ -268,7 +271,7 @@ class boss_festergut : public CreatureScript uint32 _inhaleCounter; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_festergutAI>(creature); } @@ -286,19 +289,19 @@ class npc_stinky_icc : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000)); _events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(3000, 7000)); } - void EnterCombat(Unit* /*target*/) + void EnterCombat(Unit* /*target*/) OVERRIDE { DoCast(me, SPELL_PLAGUE_STENCH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -328,7 +331,7 @@ class npc_stinky_icc : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* festergut = me->GetCreature(*me, _instance->GetData64(DATA_FESTERGUT))) if (festergut->IsAlive()) @@ -340,7 +343,7 @@ class npc_stinky_icc : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_stinky_iccAI>(creature); } @@ -355,7 +358,7 @@ class spell_festergut_pungent_blight : public SpellScriptLoader { PrepareSpellScript(spell_festergut_pungent_blight_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -370,13 +373,13 @@ class spell_festergut_pungent_blight : public SpellScriptLoader GetCaster()->ToCreature()->AI()->Talk(EMOTE_PUNGENT_BLIGHT); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_festergut_pungent_blight_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_festergut_pungent_blight_SpellScript(); } @@ -391,7 +394,7 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader { PrepareSpellScript(spell_festergut_gastric_bloat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GASTRIC_EXPLOSION)) return false; @@ -408,13 +411,13 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), SPELL_GASTRIC_EXPLOSION, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_festergut_gastric_bloat_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_festergut_gastric_bloat_SpellScript(); } @@ -429,7 +432,7 @@ class spell_festergut_blighted_spores : public SpellScriptLoader { PrepareAuraScript(spell_festergut_blighted_spores_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_INOCULATED)) return false; @@ -444,13 +447,13 @@ class spell_festergut_blighted_spores : public SpellScriptLoader festergut->AI()->SetData(DATA_INOCULATED_STACK, GetStackAmount()); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_festergut_blighted_spores_AuraScript::ExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_festergut_blighted_spores_AuraScript(); } @@ -461,7 +464,7 @@ class achievement_flu_shot_shortage : public AchievementCriteriaScript public: achievement_flu_shot_shortage() : AchievementCriteriaScript("achievement_flu_shot_shortage") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (target && target->GetTypeId() == TYPEID_UNIT) return target->ToCreature()->AI()->GetData(DATA_INOCULATED_STACK) < 3; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index a213c420383..f4eb5d4ac1b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -220,7 +220,7 @@ class boss_lady_deathwhisper : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetPower(POWER_MANA, me->GetMaxPower(POWER_MANA)); @@ -235,7 +235,8 @@ class boss_lady_deathwhisper : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!_introDone && me->IsWithinDistInMap(who, 110.0f)) { @@ -251,7 +252,7 @@ class boss_lady_deathwhisper : public CreatureScript } } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -260,7 +261,7 @@ class boss_lady_deathwhisper : public CreatureScript me->GetMotionMaster()->MoveChase(victim); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_LADY_DEATHWHISPER, who->ToPlayer())) { @@ -292,7 +293,7 @@ class boss_lady_deathwhisper : public CreatureScript instance->SetBossState(DATA_LADY_DEATHWHISPER, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { Talk(SAY_DEATH); @@ -333,7 +334,7 @@ class boss_lady_deathwhisper : public CreatureScript _JustDied(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); instance->SetBossState(DATA_LADY_DEATHWHISPER, FAIL); @@ -346,13 +347,13 @@ class boss_lady_deathwhisper : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void DamageTaken(Unit* /*damageDealer*/, uint32& damage) + void DamageTaken(Unit* /*damageDealer*/, uint32& damage) OVERRIDE { // phase transition if (events.IsInPhase(PHASE_ONE) && damage > uint32(me->GetPower(POWER_MANA))) @@ -378,7 +379,7 @@ class boss_lady_deathwhisper : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DARNAVAN) _darnavanGUID = summon->GetGUID(); @@ -401,7 +402,7 @@ class boss_lady_deathwhisper : public CreatureScript summon->CastSpell(summon, SPELL_ADHERENT_S_DETERMINATION, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((!UpdateVictim() && !events.IsInPhase(PHASE_INTRO)) || !CheckInRoom()) return; @@ -547,7 +548,7 @@ class boss_lady_deathwhisper : public CreatureScript summon->AI()->DoCast(summon, SPELL_TELEPORT_VISUAL); } - void SetGUID(uint64 guid, int32 id/* = 0*/) + void SetGUID(uint64 guid, int32 id/* = 0*/) OVERRIDE { if (id != GUID_CULTIST) return; @@ -571,7 +572,7 @@ class boss_lady_deathwhisper : public CreatureScript DoCast(cultist, SPELL_DARK_MARTYRDOM_T); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_DARK_MARTYRDOM_T) { @@ -617,7 +618,7 @@ class boss_lady_deathwhisper : public CreatureScript bool _introDone; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_lady_deathwhisperAI>(creature); } @@ -634,7 +635,7 @@ class npc_cult_fanatic : public CreatureScript { npc_cult_fanaticAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { Events.Reset(); Events.ScheduleEvent(EVENT_FANATIC_NECROTIC_STRIKE, urand(10000, 12000)); @@ -644,7 +645,7 @@ class npc_cult_fanatic : public CreatureScript Events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000)); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_DARK_TRANSFORMATION) me->UpdateEntry(NPC_DEFORMED_FANATIC); @@ -656,7 +657,7 @@ class npc_cult_fanatic : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -696,7 +697,7 @@ class npc_cult_fanatic : public CreatureScript EventMap Events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_cult_fanaticAI>(creature); } @@ -711,7 +712,7 @@ class npc_cult_adherent : public CreatureScript { npc_cult_adherentAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { Events.Reset(); Events.ScheduleEvent(EVENT_ADHERENT_FROST_FEVER, urand(10000, 12000)); @@ -722,7 +723,7 @@ class npc_cult_adherent : public CreatureScript Events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000)); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_DARK_EMPOWERMENT) me->UpdateEntry(NPC_EMPOWERED_ADHERENT); @@ -734,7 +735,7 @@ class npc_cult_adherent : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -782,7 +783,7 @@ class npc_cult_adherent : public CreatureScript EventMap Events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_cult_adherentAI>(creature); } @@ -801,12 +802,12 @@ class npc_vengeful_shade : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Reset() + void Reset() OVERRIDE { me->AddAura(SPELL_VENGEFUL_BLAST_PASSIVE, me); } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE { switch (spell->Id) { @@ -822,7 +823,7 @@ class npc_vengeful_shade : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_vengeful_shadeAI>(creature); } @@ -839,7 +840,7 @@ class npc_darnavan : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_DARNAVAN_BLADESTORM, 10000); @@ -850,7 +851,7 @@ class npc_darnavan : public CreatureScript _canShatter = true; } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { _events.Reset(); if (Player* owner = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) @@ -866,7 +867,7 @@ class npc_darnavan : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE || id != POINT_DESPAWN) return; @@ -874,12 +875,12 @@ class npc_darnavan : public CreatureScript me->DespawnOrUnsummon(); } - void EnterCombat(Unit* /*victim*/) + void EnterCombat(Unit* /*victim*/) OVERRIDE { Talk(SAY_DARNAVAN_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -943,7 +944,7 @@ class npc_darnavan : public CreatureScript bool _canShatter; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_darnavanAI>(creature); } @@ -969,13 +970,13 @@ class spell_deathwhisper_mana_barrier : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_deathwhisper_mana_barrier_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_deathwhisper_mana_barrier_AuraScript(); } @@ -1000,13 +1001,13 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader GetCaster()->SetDisplayId(uint32(GetCaster()->GetEntry() == NPC_CULT_FANATIC ? 38009 : 38010)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_cultist_dark_martyrdom_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_FORCE_DESELECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_cultist_dark_martyrdom_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 41892694055..42bb8acbf07 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -135,7 +135,7 @@ class boss_lord_marrowgar : public CreatureScript _boneSlice = false; } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetSpeed(MOVE_RUN, _baseSpeed, true); @@ -150,7 +150,7 @@ class boss_lord_marrowgar : public CreatureScript _boneSpikeImmune.clear(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -159,27 +159,28 @@ class boss_lord_marrowgar : public CreatureScript instance->SetBossState(DATA_LORD_MARROWGAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); instance->SetBossState(DATA_LORD_MARROWGAR, FAIL); instance->SetData(DATA_BONED_ACHIEVEMENT, uint32(true)); // reset } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!_introDone && me->IsWithinDistInMap(who, 70.0f)) { @@ -188,7 +189,7 @@ class boss_lord_marrowgar : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -273,7 +274,7 @@ class boss_lord_marrowgar : public CreatureScript DoMeleeAttackIfReady(); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE || id != POINT_TARGET_BONESTORM_PLAYER) return; @@ -287,7 +288,7 @@ class boss_lord_marrowgar : public CreatureScript return &_coldflameLastPos; } - uint64 GetGUID(int32 type /*= 0 */) const + uint64 GetGUID(int32 type /*= 0 */) const OVERRIDE { switch (type) { @@ -308,7 +309,7 @@ class boss_lord_marrowgar : public CreatureScript return 0LL; } - void SetGUID(uint64 guid, int32 type /*= 0 */) + void SetGUID(uint64 guid, int32 type /*= 0 */) OVERRIDE { switch (type) { @@ -321,7 +322,7 @@ class boss_lord_marrowgar : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_CLEAR_SPIKE_IMMUNITIES) return; @@ -339,7 +340,7 @@ class boss_lord_marrowgar : public CreatureScript bool _boneSlice; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_lord_marrowgarAI>(creature); } @@ -358,7 +359,7 @@ class npc_coldflame : public CreatureScript { } - void IsSummonedBy(Unit* owner) + void IsSummonedBy(Unit* owner) OVERRIDE { if (owner->GetTypeId() != TYPEID_UNIT) return; @@ -394,7 +395,7 @@ class npc_coldflame : public CreatureScript _events.ScheduleEvent(EVENT_COLDFLAME_TRIGGER, 500); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -412,7 +413,7 @@ class npc_coldflame : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_coldflameAI>(creature); } @@ -432,7 +433,7 @@ class npc_bone_spike : public CreatureScript SetCombatMovement(false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (TempSummon* summ = me->ToTempSummon()) if (Unit* trapped = summ->GetSummoner()) @@ -441,13 +442,13 @@ class npc_bone_spike : public CreatureScript me->DespawnOrUnsummon(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { me->DespawnOrUnsummon(); victim->RemoveAurasDueToSpell(SPELL_IMPALED); } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { DoCast(summoner, SPELL_IMPALED); summoner->CastSpell(me, SPELL_RIDE_VEHICLE, true); @@ -455,7 +456,7 @@ class npc_bone_spike : public CreatureScript _hasTrappedUnit = true; } - void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) + void PassengerBoarded(Unit* passenger, int8 /*seat*/, bool apply) OVERRIDE { if (!apply) return; @@ -469,7 +470,7 @@ class npc_bone_spike : public CreatureScript init.Launch(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!_hasTrappedUnit) return; @@ -486,7 +487,7 @@ class npc_bone_spike : public CreatureScript bool _hasTrappedUnit; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_bone_spikeAI>(creature); } @@ -521,14 +522,14 @@ class spell_marrowgar_coldflame : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_marrowgar_coldflame_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_marrowgar_coldflame_SpellScript(); } @@ -550,13 +551,13 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue() + i), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_marrowgar_coldflame_SpellScript(); } @@ -586,13 +587,13 @@ class spell_marrowgar_coldflame_damage : public SpellScriptLoader return true; } - void Register() + void Register() OVERRIDE { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_marrowgar_coldflame_damage_AuraScript::CanBeAppliedOn); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_marrowgar_coldflame_damage_AuraScript(); } @@ -607,7 +608,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader { PrepareSpellScript(spell_marrowgar_bone_spike_graveyard_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { for (uint32 i = 0; i < 3; ++i) if (!sSpellMgr->GetSpellInfo(BoneSpikeSummonId[i])) @@ -616,7 +617,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT && GetCaster()->IsAIEnabled; } @@ -650,14 +651,14 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_marrowgar_bone_spike_graveyard_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_marrowgar_bone_spike_graveyard_SpellScript::HandleSpikes, EFFECT_1, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_marrowgar_bone_spike_graveyard_SpellScript(); } @@ -677,13 +678,13 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() / std::max(sqrtf(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f))); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_marrowgar_bone_storm_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_marrowgar_bone_storm_SpellScript(); } @@ -698,7 +699,7 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader { PrepareSpellScript(spell_marrowgar_bone_slice_SpellScript); - bool Load() + bool Load() OVERRIDE { _targetCount = 0; return true; @@ -725,7 +726,7 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader SetHitDamage(GetHitDamage() / _targetCount); } - void Register() + void Register() OVERRIDE { BeforeCast += SpellCastFn(spell_marrowgar_bone_slice_SpellScript::ClearSpikeImmunities); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_marrowgar_bone_slice_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); @@ -735,7 +736,7 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_marrowgar_bone_slice_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 6441497a4f6..8e783fa9361 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -228,7 +228,7 @@ class boss_professor_putricide : public CreatureScript _phase = PHASE_NONE; } - void Reset() + void Reset() OVERRIDE { if (!(events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT))) instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, NOT_STARTED); @@ -247,7 +247,7 @@ class boss_professor_putricide : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT)) return; @@ -275,7 +275,7 @@ class boss_professor_putricide : public CreatureScript instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, IN_PROGRESS); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); me->SetWalk(false); @@ -283,13 +283,13 @@ class boss_professor_putricide : public CreatureScript instance->SetBossState(DATA_PROFESSOR_PUTRICIDE, FAIL); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -300,7 +300,7 @@ class boss_professor_putricide : public CreatureScript DoCast(SPELL_MUTATED_PLAGUE_CLEAR); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); switch (summon->GetEntry()) @@ -341,7 +341,7 @@ class boss_professor_putricide : public CreatureScript DoZoneInCombat(summon); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { switch (_phase) { @@ -362,7 +362,7 @@ class boss_professor_putricide : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -413,7 +413,7 @@ class boss_professor_putricide : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -540,7 +540,7 @@ class boss_professor_putricide : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -557,13 +557,13 @@ class boss_professor_putricide : public CreatureScript return 0; } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { if (id == DATA_EXPERIMENT_STAGE) _experimentState = bool(data); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((!(events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT)) && !UpdateVictim()) || !CheckInRoom()) return; @@ -716,7 +716,7 @@ class boss_professor_putricide : public CreatureScript bool _experimentState; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_professor_putricideAI>(creature); } @@ -730,19 +730,19 @@ class npc_putricide_oozeAI : public ScriptedAI { } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE { if (!_newTargetSelectTimer && spell->Id == sSpellMgr->GetSpellIdForDifficulty(_hitTargetSpellId, me)) _newTargetSelectTimer = 1000; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_TEAR_GAS_CREATURE) _newTargetSelectTimer = 1000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() && !_newTargetSelectTimer) return; @@ -791,7 +791,7 @@ class npc_volatile_ooze : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_volatile_oozeAI>(creature); } @@ -818,7 +818,7 @@ class npc_gas_cloud : public CreatureScript uint32 _newTargetSelectTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_gas_cloudAI>(creature); } @@ -844,13 +844,13 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_putricide_gaseous_bloat_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_putricide_gaseous_bloat_AuraScript(); } @@ -865,7 +865,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader { PrepareSpellScript(spell_putricide_ooze_channel_SpellScript); - bool Validate(SpellInfo const* spell) + bool Validate(SpellInfo const* spell) OVERRIDE { if (!spell->ExcludeTargetAuraSpell) return false; @@ -876,7 +876,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader // set up initial variables and check if caster is creature // this will let use safely use ToCreature() casts in entire script - bool Load() + bool Load() OVERRIDE { _target = NULL; return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -912,7 +912,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader GetCaster()->AddThreat(GetHitUnit(), 500000000.0f); // value seen in sniff } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -923,7 +923,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_ooze_channel_SpellScript(); } @@ -958,14 +958,14 @@ class spell_putricide_slime_puddle : public SpellScriptLoader targets.remove_if(ExactDistanceCheck(GetCaster(), 2.5f * GetCaster()->GetFloatValue(OBJECT_FIELD_SCALE_X))); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_slime_puddle_SpellScript(); } @@ -987,13 +987,13 @@ class spell_putricide_slime_puddle_aura : public SpellScriptLoader GetCaster()->AddAura((GetCaster()->GetMap()->GetSpawnMode() & 1) ? 72456 : 70346, target); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_putricide_slime_puddle_aura_SpellScript::ReplaceAura); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_slime_puddle_aura_SpellScript(); } @@ -1035,13 +1035,13 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader GetCaster()->CastSpell(target, uint32(GetSpellInfo()->Effects[stage].CalcValue()), true, NULL, NULL, GetCaster()->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_putricide_unstable_experiment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_unstable_experiment_SpellScript(); } @@ -1066,13 +1066,13 @@ class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_putricide_ooze_eruption_searcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_ooze_eruption_searcher_SpellScript(); } @@ -1100,13 +1100,13 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_putricide_choking_gas_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_choking_gas_bomb_SpellScript(); } @@ -1121,7 +1121,7 @@ class spell_putricide_unbound_plague : public SpellScriptLoader { PrepareSpellScript(spell_putricide_unbound_plague_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_UNBOUND_PLAGUE)) return false; @@ -1178,14 +1178,14 @@ class spell_putricide_unbound_plague : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_unbound_plague_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnEffectHitTarget += SpellEffectFn(spell_putricide_unbound_plague_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_unbound_plague_SpellScript(); } @@ -1230,14 +1230,14 @@ class spell_putricide_eat_ooze : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_putricide_eat_ooze_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_eat_ooze_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_eat_ooze_SpellScript(); } @@ -1280,14 +1280,14 @@ class spell_putricide_mutated_plague : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), healSpell, true, NULL, NULL, GetCasterGUID()); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_putricide_mutated_plague_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutated_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_putricide_mutated_plague_AuraScript(); } @@ -1346,7 +1346,7 @@ class spell_putricide_mutation_init : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_putricide_mutation_init_SpellScript::CheckRequirement); } @@ -1365,18 +1365,18 @@ class spell_putricide_mutation_init : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutation_init_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_mutation_init_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_putricide_mutation_init_AuraScript(); } @@ -1397,13 +1397,13 @@ class spell_putricide_mutated_transformation_dismiss : public SpellScriptLoader veh->RemoveAllPassengers(); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutated_transformation_dismiss_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_putricide_mutated_transformation_dismiss_AuraScript(); } @@ -1459,13 +1459,13 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader putricide->AI()->JustSummoned(summon); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_mutated_transformation_SpellScript(); } @@ -1486,13 +1486,13 @@ class spell_putricide_mutated_transformation_dmg : public SpellScriptLoader targets.remove(owner); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_mutated_transformation_dmg_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_mutated_transformation_dmg_SpellScript(); } @@ -1514,13 +1514,13 @@ class spell_putricide_regurgitated_ooze : public SpellScriptLoader instance->SetData(DATA_NAUSEA_ACHIEVEMENT, uint32(false)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_putricide_regurgitated_ooze_SpellScript::ExtraEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_regurgitated_ooze_SpellScript(); } @@ -1543,13 +1543,13 @@ class spell_putricide_clear_aura_effect_value : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(auraId); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_putricide_clear_aura_effect_value_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_putricide_clear_aura_effect_value_SpellScript(); } @@ -1574,13 +1574,13 @@ class spell_stinky_precious_decimate : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_stinky_precious_decimate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_stinky_precious_decimate_SpellScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 688febe41dd..97385b108b6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -96,7 +96,7 @@ class boss_rotface : public CreatureScript infectionCooldown = 14000; } - void Reset() + void Reset() OVERRIDE { _Reset(); events.ScheduleEvent(EVENT_SLIME_SPRAY, 20000); @@ -106,7 +106,7 @@ class boss_rotface : public CreatureScript infectionCooldown = 14000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer())) { @@ -122,7 +122,7 @@ class boss_rotface : public CreatureScript DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { instance->DoRemoveAurasDueToSpellOnPlayers(MUTATED_INFECTION); _JustDied(); @@ -131,38 +131,39 @@ class boss_rotface : public CreatureScript professor->AI()->DoAction(ACTION_ROTFACE_DEATH); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); instance->SetBossState(DATA_ROTFACE, FAIL); instance->SetData(DATA_OOZE_DANCE_ACHIEVEMENT, uint32(true)); // reset } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); if (Creature* professor = Unit::GetCreature(*me, instance->GetData64(DATA_PROFESSOR_PUTRICIDE))) professor->AI()->EnterEvadeMode(); } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_SLIME_SPRAY) Talk(SAY_SLIME_SPRAY); } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { // don't enter combat } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -209,7 +210,7 @@ class boss_rotface : public CreatureScript uint32 infectionStage; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_rotfaceAI>(creature); } @@ -226,7 +227,7 @@ class npc_little_ooze : public CreatureScript { } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { DoCast(me, SPELL_LITTLE_OOZE_COMBINE, true); DoCast(me, SPELL_WEAK_RADIATING_OOZE, true); @@ -234,12 +235,12 @@ class npc_little_ooze : public CreatureScript me->AddThreat(summoner, 500000.0f); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->DespawnOrUnsummon(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -259,7 +260,7 @@ class npc_little_ooze : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_little_oozeAI>(creature); } @@ -276,7 +277,7 @@ class npc_big_ooze : public CreatureScript { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { DoCast(me, SPELL_LARGE_OOZE_COMBINE, true); DoCast(me, SPELL_LARGE_OOZE_BUFF_COMBINE, true); @@ -289,20 +290,20 @@ class npc_big_ooze : public CreatureScript rotface->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* rotface = Unit::GetCreature(*me, instance->GetData64(DATA_ROTFACE))) rotface->AI()->SummonedCreatureDespawn(me); me->DespawnOrUnsummon(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == EVENT_STICKY_OOZE) events.CancelEvent(EVENT_STICKY_OOZE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -330,7 +331,7 @@ class npc_big_ooze : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_big_oozeAI>(creature); } @@ -348,7 +349,7 @@ class npc_precious_icc : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000)); @@ -357,19 +358,19 @@ class npc_precious_icc : public CreatureScript _summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { _summons.Summon(summon); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(target); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { _summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _summons.DespawnAll(); if (Creature* rotface = Unit::GetCreature(*me, _instance->GetData64(DATA_ROTFACE))) @@ -377,7 +378,7 @@ class npc_precious_icc : public CreatureScript rotface->AI()->Talk(SAY_PRECIOUS_DIES); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -419,7 +420,7 @@ class npc_precious_icc : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_precious_iccAI>(creature); } @@ -462,14 +463,14 @@ class spell_rotface_ooze_flood : public SpellScriptLoader targets.pop_front(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rotface_ooze_flood_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_ooze_flood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rotface_ooze_flood_SpellScript(); } @@ -484,7 +485,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader { PrepareSpellScript(spell_rotface_mutated_infection_SpellScript); - bool Load() + bool Load() OVERRIDE { _target = NULL; return true; @@ -518,7 +519,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader caster->AI()->Talk(EMOTE_MUTATED_INFECTION, target->GetGUID()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_mutated_infection_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_mutated_infection_SpellScript::ReplaceTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -529,7 +530,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rotface_mutated_infection_SpellScript(); } @@ -555,13 +556,13 @@ class spell_rotface_little_ooze_combine : public SpellScriptLoader GetHitCreature()->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rotface_little_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rotface_little_ooze_combine_SpellScript(); } @@ -597,13 +598,13 @@ class spell_rotface_large_ooze_combine : public SpellScriptLoader GetHitCreature()->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rotface_large_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rotface_large_ooze_combine_SpellScript(); } @@ -652,13 +653,13 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader GetHitCreature()->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rotface_large_ooze_buff_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rotface_large_ooze_buff_combine_SpellScript(); } @@ -673,7 +674,7 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader { PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER)) return false; @@ -692,13 +693,13 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader GetCaster()->CastSpell(dummy, SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rotface_unstable_ooze_explosion_init_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rotface_unstable_ooze_explosion_init_SpellScript(); } @@ -729,13 +730,13 @@ class spell_rotface_unstable_ooze_explosion : public SpellScriptLoader rotface->CastSpell(x, y, z, triggered_spell_id, true, NULL, NULL, GetCaster()->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_rotface_unstable_ooze_explosion_SpellScript::CheckTarget, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rotface_unstable_ooze_explosion_SpellScript(); } @@ -762,13 +763,13 @@ class spell_rotface_unstable_ooze_explosion_suicide : public SpellScriptLoader target->ToCreature()->DespawnOrUnsummon(60000); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rotface_unstable_ooze_explosion_suicide_AuraScript::DespawnSelf, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rotface_unstable_ooze_explosion_suicide_AuraScript(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 53e8b6d8110..999e7081d52 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -207,7 +207,7 @@ class boss_sindragosa : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { BossAI::Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -230,7 +230,7 @@ class boss_sindragosa : public CreatureScript } } - void JustDied(Unit* /* killer */) + void JustDied(Unit* /* killer */) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -240,7 +240,7 @@ class boss_sindragosa : public CreatureScript } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer())) { @@ -255,7 +255,7 @@ class boss_sindragosa : public CreatureScript Talk(SAY_AGGRO); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { BossAI::JustReachedHome(); instance->SetBossState(DATA_SINDRAGOSA, FAIL); @@ -263,13 +263,13 @@ class boss_sindragosa : public CreatureScript me->SetDisableGravity(false); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_KILL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_START_FROSTWYRM) { @@ -296,14 +296,14 @@ class boss_sindragosa : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_MYSTIC_BUFFET_STACK) return _mysticBuffetStack; return 0xFFFFFFFF; } - void MovementInform(uint32 type, uint32 point) + void MovementInform(uint32 type, uint32 point) OVERRIDE { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -357,7 +357,7 @@ class boss_sindragosa : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!_isThirdPhase && !HealthAbovePct(35)) { @@ -367,7 +367,7 @@ class boss_sindragosa : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); if (summon->GetEntry() == NPC_FROST_BOMB) @@ -378,14 +378,14 @@ class boss_sindragosa : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { BossAI::SummonedCreatureDespawn(summon); if (summon->GetEntry() == NPC_ICE_TOMB) summon->AI()->JustDied(summon); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(70127, me)) if (spellId == spell->Id) @@ -394,7 +394,7 @@ class boss_sindragosa : public CreatureScript } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -526,7 +526,7 @@ class boss_sindragosa : public CreatureScript bool _summoned; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_sindragosaAI>(creature); } @@ -545,12 +545,12 @@ class npc_ice_tomb : public CreatureScript SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); } - void SetGUID(uint64 guid, int32 type/* = 0 */) + void SetGUID(uint64 guid, int32 type/* = 0 */) OVERRIDE { if (type == DATA_TRAPPED_PLAYER) { @@ -559,14 +559,14 @@ class npc_ice_tomb : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_TRIGGER_ASPHYXIATION) if (Player* player = ObjectAccessor::GetPlayer(*me, _trappedPlayerGUID)) player->CastSpell(player, SPELL_ASPHYXIATION, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveAllGameObjects(); @@ -578,7 +578,7 @@ class npc_ice_tomb : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!_trappedPlayerGUID) return; @@ -604,7 +604,7 @@ class npc_ice_tomb : public CreatureScript uint32 _existenceCheckTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_ice_tombAI>(creature); } @@ -621,7 +621,7 @@ class npc_spinestalker : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { // Increase add count if (!me->isDead()) @@ -631,7 +631,7 @@ class npc_spinestalker : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_BELLOWING_ROAR, urand(20000, 25000)); @@ -646,18 +646,18 @@ class npc_spinestalker : public CreatureScript } } - void JustRespawned() + void JustRespawned() OVERRIDE { ScriptedAI::JustRespawned(); _instance->SetData(DATA_SINDRAGOSA_FROSTWYRMS, me->GetDBTableGUIDLow()); // this cannot be in Reset because reset also happens on evade } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _events.Reset(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_START_FROSTWYRM) { @@ -680,7 +680,7 @@ class npc_spinestalker : public CreatureScript } } - void MovementInform(uint32 type, uint32 point) + void MovementInform(uint32 type, uint32 point) OVERRIDE { if (type != EFFECT_MOTION_TYPE || point != POINT_FROSTWYRM_LAND) return; @@ -694,7 +694,7 @@ class npc_spinestalker : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -734,7 +734,7 @@ class npc_spinestalker : public CreatureScript bool _summoned; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_spinestalkerAI>(creature); } @@ -751,7 +751,7 @@ class npc_rimefang : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { // Increase add count if (!me->isDead()) @@ -761,7 +761,7 @@ class npc_rimefang : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_FROST_BREATH_RIMEFANG, urand(12000, 15000)); @@ -776,18 +776,18 @@ class npc_rimefang : public CreatureScript } } - void JustRespawned() + void JustRespawned() OVERRIDE { ScriptedAI::JustRespawned(); _instance->SetData(DATA_SINDRAGOSA_FROSTWYRMS, me->GetDBTableGUIDLow()); // this cannot be in Reset because reset also happens on evade } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _events.Reset(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_START_FROSTWYRM) { @@ -810,7 +810,7 @@ class npc_rimefang : public CreatureScript } } - void MovementInform(uint32 type, uint32 point) + void MovementInform(uint32 type, uint32 point) OVERRIDE { if (type != EFFECT_MOTION_TYPE || point != POINT_FROSTWYRM_LAND) return; @@ -824,12 +824,12 @@ class npc_rimefang : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void EnterCombat(Unit* /*victim*/) + void EnterCombat(Unit* /*victim*/) OVERRIDE { DoCast(me, SPELL_FROST_AURA_RIMEFANG, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -891,7 +891,7 @@ class npc_rimefang : public CreatureScript bool _summoned; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_rimefangAI>(creature); } @@ -909,7 +909,7 @@ class npc_sindragosa_trash : public CreatureScript _instance = creature->GetInstanceScript(); } - void InitializeAI() + void InitializeAI() OVERRIDE { _frostwyrmId = (me->GetHomePosition().GetPositionY() < 2484.35f) ? DATA_RIMEFANG : DATA_SPINESTALKER; // Increase add count @@ -921,7 +921,7 @@ class npc_sindragosa_trash : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { // This is shared AI for handler and whelps if (me->GetEntry() == NPC_FROSTWARDEN_HANDLER) @@ -933,7 +933,7 @@ class npc_sindragosa_trash : public CreatureScript _isTaunted = false; } - void JustRespawned() + void JustRespawned() OVERRIDE { ScriptedAI::JustRespawned(); @@ -942,13 +942,13 @@ class npc_sindragosa_trash : public CreatureScript _instance->SetData(_frostwyrmId, me->GetDBTableGUIDLow()); // this cannot be in Reset because reset also happens on evade } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == DATA_WHELP_MARKER) _isTaunted = data != 0; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_FROSTWYRM_OWNER) return _frostwyrmId; @@ -957,7 +957,7 @@ class npc_sindragosa_trash : public CreatureScript return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -994,7 +994,7 @@ class npc_sindragosa_trash : public CreatureScript bool _isTaunted; // Frostwing Whelp only }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_sindragosa_trashAI>(creature); } @@ -1009,7 +1009,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader { PrepareSpellScript(spell_sindragosa_s_fury_SpellScript); - bool Load() + bool Load() OVERRIDE { _targetCount = 0; @@ -1058,7 +1058,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader GetCaster()->DealSpellDamage(&damageInfo, false); } - void Register() + void Register() OVERRIDE { BeforeCast += SpellCastFn(spell_sindragosa_s_fury_SpellScript::SelectDest); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_s_fury_SpellScript::CountTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); @@ -1068,7 +1068,7 @@ class spell_sindragosa_s_fury : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sindragosa_s_fury_SpellScript(); } @@ -1104,13 +1104,13 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader Trinity::Containers::RandomResizeList(unitList, maxSize); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_unchained_magic_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sindragosa_unchained_magic_SpellScript(); } @@ -1149,13 +1149,13 @@ class spell_sindragosa_frost_breath : public SpellScriptLoader target->CastSpell(target, SPELL_FROST_INFUSION, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_sindragosa_frost_breath_SpellScript::HandleInfusion); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sindragosa_frost_breath_SpellScript(); } @@ -1170,7 +1170,7 @@ class spell_sindragosa_instability : public SpellScriptLoader { PrepareAuraScript(spell_sindragosa_instability_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BACKLASH)) return false; @@ -1183,13 +1183,13 @@ class spell_sindragosa_instability : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_BACKLASH, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_sindragosa_instability_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sindragosa_instability_AuraScript(); } @@ -1204,7 +1204,7 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader { PrepareAuraScript(spell_sindragosa_frost_beacon_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ICE_TOMB_DAMAGE)) return false; @@ -1218,13 +1218,13 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader caster->CastSpell(GetTarget(), SPELL_ICE_TOMB_DAMAGE, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_sindragosa_frost_beacon_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sindragosa_frost_beacon_AuraScript(); } @@ -1239,7 +1239,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader { PrepareSpellScript(spell_sindragosa_ice_tomb_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sObjectMgr->GetCreatureTemplate(NPC_ICE_TOMB)) return false; @@ -1263,7 +1263,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_sindragosa_ice_tomb_SpellScript::SummonTomb); } @@ -1278,18 +1278,18 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader PreventDefaultAction(); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_sindragosa_ice_tomb_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sindragosa_ice_tomb_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sindragosa_ice_tomb_AuraScript(); } @@ -1304,7 +1304,7 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader { PrepareSpellScript(spell_sindragosa_icy_grip_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ICY_GRIP_JUMP)) return false; @@ -1317,13 +1317,13 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), SPELL_ICY_GRIP_JUMP, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sindragosa_icy_grip_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sindragosa_icy_grip_SpellScript(); } @@ -1357,13 +1357,13 @@ class spell_sindragosa_mystic_buffet : public SpellScriptLoader targets.remove_if(MysticBuffetTargetFilter(GetCaster())); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_mystic_buffet_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sindragosa_mystic_buffet_SpellScript(); } @@ -1378,7 +1378,7 @@ class spell_rimefang_icy_blast : public SpellScriptLoader { PrepareSpellScript(spell_rimefang_icy_blast_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ICY_BLAST_AREA)) return false; @@ -1393,13 +1393,13 @@ class spell_rimefang_icy_blast : public SpellScriptLoader summon->CastSpell(summon, SPELL_ICY_BLAST_AREA, true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_rimefang_icy_blast_SpellScript::HandleTriggerMissile, EFFECT_1, SPELL_EFFECT_TRIGGER_MISSILE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rimefang_icy_blast_SpellScript(); } @@ -1430,7 +1430,7 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader { PrepareSpellScript(spell_frostwarden_handler_order_whelp_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FOCUS_FIRE)) return false; @@ -1463,14 +1463,14 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader Trinity::Containers::SelectRandomContainerElement(unitList)->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_frostwarden_handler_order_whelp_SpellScript::HandleForcedCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_frostwarden_handler_order_whelp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_frostwarden_handler_order_whelp_SpellScript(); } @@ -1492,7 +1492,7 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader GetCaster()->GetAI()->SetData(DATA_WHELP_MARKER, 1); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_frostwarden_handler_focus_fire_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -1512,18 +1512,18 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_frostwarden_handler_focus_fire_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_frostwarden_handler_focus_fire_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_frostwarden_handler_focus_fire_AuraScript(); } @@ -1534,7 +1534,7 @@ class at_sindragosa_lair : public AreaTriggerScript public: at_sindragosa_lair() : AreaTriggerScript("at_sindragosa_lair") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -1566,7 +1566,7 @@ class achievement_all_you_can_eat : public AchievementCriteriaScript public: achievement_all_you_can_eat() : AchievementCriteriaScript("achievement_all_you_can_eat") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 42fe279ce87..6ced10e0ca1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -348,8 +348,11 @@ enum MiscData MOVIE_FALL_OF_THE_LICH_KING = 16, }; -#define DATA_PLAGUE_STACK 70337 -#define DATA_VILE 45814622 +enum Misc +{ + DATA_PLAGUE_STACK = 70337, + DATA_VILE = 45814622 +}; class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> { @@ -484,7 +487,7 @@ class boss_the_lich_king : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -494,7 +497,7 @@ class boss_the_lich_king : public CreatureScript SetEquipmentSlots(true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); DoCastAOE(SPELL_PLAY_MOVIE, false); @@ -505,7 +508,7 @@ class boss_the_lich_king : public CreatureScript frostmourne->DespawnOrUnsummon(); } - void EnterCombat(Unit* target) + void EnterCombat(Unit* target) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer())) { @@ -527,7 +530,7 @@ class boss_the_lich_king : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); instance->SetBossState(DATA_THE_LICH_KING, NOT_STARTED); @@ -541,13 +544,13 @@ class boss_the_lich_king : public CreatureScript SendLightOverride(0, 5000); } - bool CanAIAttack(Unit const* target) const + bool CanAIAttack(Unit const* target) const OVERRIDE { // The Lich King must not select targets in frostmourne room if he killed everyone outside return !target->HasAura(SPELL_IN_FROSTMOURNE_ROOM); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->SetBossState(DATA_THE_LICH_KING, FAIL); BossAI::EnterEvadeMode(); @@ -558,13 +561,13 @@ class boss_the_lich_king : public CreatureScript summons.DoAction(ACTION_TELEPORT_BACK, pred); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER && !me->IsInEvadeMode() && !events.IsInPhase(PHASE_OUTRO)) Talk(SAY_LK_KILL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -608,7 +611,7 @@ class boss_the_lich_king : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -623,7 +626,7 @@ class boss_the_lich_king : public CreatureScript return 0; } - void SetData(uint32 type, uint32 value) + void SetData(uint32 type, uint32 value) OVERRIDE { switch (type) { @@ -638,7 +641,7 @@ class boss_the_lich_king : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (events.IsInPhase(PHASE_ONE) && !HealthAbovePct(70)) { @@ -683,7 +686,7 @@ class boss_the_lich_king : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { switch (summon->GetEntry()) { @@ -743,7 +746,7 @@ class boss_the_lich_king : public CreatureScript BossAI::JustSummoned(summon); } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE { switch (summon->GetEntry()) { @@ -760,13 +763,13 @@ class boss_the_lich_king : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_HARVESTED_SOUL && me->IsInCombat() && !IsHeroic()) Talk(SAY_LK_FROSTMOURNE_KILL); } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == REMORSELESS_WINTER_1 || spell->Id == REMORSELESS_WINTER_2) { @@ -775,7 +778,7 @@ class boss_the_lich_king : public CreatureScript } } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -841,7 +844,7 @@ class boss_the_lich_king : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // check phase first to prevent updating victim and entering evade mode when not wanted if (!(events.IsInPhase(PHASE_OUTRO) || events.IsInPhase(PHASE_INTRO) || events.IsInPhase(PHASE_FROSTMOURNE))) @@ -1133,7 +1136,7 @@ class boss_the_lich_king : public CreatureScript uint32 _vileSpiritExplosions; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_the_lich_kingAI>(creature); } @@ -1151,14 +1154,14 @@ class npc_tirion_fordring_tft : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE) me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -1176,7 +1179,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -1194,7 +1197,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_ICE_LOCK) me->SetFacingTo(3.085098f); @@ -1202,7 +1205,7 @@ class npc_tirion_fordring_tft : public CreatureScript SetEquipmentSlots(true); // remove glow on ashbringer } - void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) + void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) OVERRIDE { if (me->GetCreatureTemplate()->GossipMenuId == sender && !action) { @@ -1213,7 +1216,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); @@ -1223,7 +1226,7 @@ class npc_tirion_fordring_tft : public CreatureScript me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() && !(_events.IsInPhase(PHASE_OUTRO) || _events.IsInPhase(PHASE_INTRO))) return; @@ -1283,7 +1286,7 @@ class npc_tirion_fordring_tft : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_tirion_fordringAI>(creature); } @@ -1301,14 +1304,14 @@ class npc_shambling_horror_icc : public CreatureScript _frenzied = false; } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000)); _events.ScheduleEvent(EVENT_ENRAGE, urand(11000, 14000)); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (!_frenzied && IsHeroic() && me->HealthBelowPctDamaged(20, damage)) { @@ -1317,7 +1320,7 @@ class npc_shambling_horror_icc : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1352,7 +1355,7 @@ class npc_shambling_horror_icc : public CreatureScript bool _frenzied; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_shambling_horror_iccAI>(creature); } @@ -1370,7 +1373,7 @@ class npc_raging_spirit : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000)); @@ -1382,14 +1385,14 @@ class npc_raging_spirit : public CreatureScript DoCast(me, SPELL_BOSS_HITTIN_YA, true); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { // player is the spellcaster so register summon manually if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) lichKing->AI()->JustSummoned(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) lichKing->AI()->SummonedCreatureDespawn(me); @@ -1397,7 +1400,7 @@ class npc_raging_spirit : public CreatureScript summon->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1428,7 +1431,7 @@ class npc_raging_spirit : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_raging_spiritAI>(creature); } @@ -1446,7 +1449,7 @@ class npc_valkyr_shadowguard : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); me->SetReactState(REACT_PASSIVE); @@ -1454,13 +1457,13 @@ class npc_valkyr_shadowguard : public CreatureScript me->SetSpeed(MOVE_FLIGHT, 0.642857f, true); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2500); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (!IsHeroic()) return; @@ -1477,7 +1480,7 @@ class npc_valkyr_shadowguard : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { // schedule siphon life event (heroic only) DoZoneInCombat(); @@ -1485,11 +1488,11 @@ class npc_valkyr_shadowguard : public CreatureScript _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2000); } - void AttackStart(Unit* /*target*/) + void AttackStart(Unit* /*target*/) OVERRIDE { } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -1527,12 +1530,12 @@ class npc_valkyr_shadowguard : public CreatureScript } } - void SetGUID(uint64 guid, int32 /* = 0*/) + void SetGUID(uint64 guid, int32 /* = 0*/) OVERRIDE { _grabbedPlayer = guid; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1576,7 +1579,7 @@ class npc_valkyr_shadowguard : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_valkyr_shadowguardAI>(creature); } @@ -1594,7 +1597,7 @@ class npc_strangulate_vehicle : public CreatureScript { } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { me->SetFacingToObject(summoner); DoCast(summoner, SPELL_HARVEST_SOUL_VEHICLE); @@ -1607,7 +1610,7 @@ class npc_strangulate_vehicle : public CreatureScript lichKing->AI()->JustSummoned(me); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_TELEPORT_BACK) return; @@ -1625,7 +1628,7 @@ class npc_strangulate_vehicle : public CreatureScript lichKing->AI()->SummonedCreatureDespawn(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { UpdateVictim(); @@ -1683,7 +1686,7 @@ class npc_strangulate_vehicle : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_strangulate_vehicleAI>(creature); } @@ -1701,12 +1704,12 @@ class npc_terenas_menethil : public CreatureScript { } - bool CanAIAttack(Unit const* target) const + bool CanAIAttack(Unit const* target) const OVERRIDE { return target->GetEntry() != NPC_THE_LICH_KING; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -1733,7 +1736,7 @@ class npc_terenas_menethil : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { // no running back home if (!me->IsAlive()) @@ -1743,7 +1746,7 @@ class npc_terenas_menethil : public CreatureScript me->CombatStop(false); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -1764,7 +1767,7 @@ class npc_terenas_menethil : public CreatureScript } } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { _events.Reset(); _events.SetPhase(PHASE_OUTRO); @@ -1775,7 +1778,7 @@ class npc_terenas_menethil : public CreatureScript _events.ScheduleEvent(EVENT_OUTRO_TERENAS_TALK_2, 14000, 0, PHASE_OUTRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { UpdateVictim(); @@ -1836,7 +1839,7 @@ class npc_terenas_menethil : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_terenas_menethilAI>(creature); } @@ -1854,20 +1857,20 @@ class npc_spirit_warden : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_SOUL_RIP, urand(12000, 15000)); DoCast(SPELL_DARK_HUNGER); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* terenas = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TERENAS_MENETHIL))) terenas->AI()->DoAction(ACTION_TELEPORT_BACK); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1895,7 +1898,7 @@ class npc_spirit_warden : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_spirit_wardenAI>(creature); } @@ -1912,7 +1915,7 @@ class npc_spirit_bomb : public CreatureScript { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { float destX, destY, destZ; me->GetPosition(destX, destY); @@ -1921,7 +1924,7 @@ class npc_spirit_bomb : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_GROUND, destX, destY, destZ); } - void MovementInform(uint32 type, uint32 point) + void MovementInform(uint32 type, uint32 point) OVERRIDE { if (type != POINT_MOTION_TYPE || point != POINT_GROUND) return; @@ -1931,18 +1934,18 @@ class npc_spirit_bomb : public CreatureScript me->DespawnOrUnsummon(1000); } - void AttackStart(Unit* /*victim*/) + void AttackStart(Unit* /*victim*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { UpdateVictim(); // no melee attacks } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_spirit_bombAI>(creature); } @@ -1959,28 +1962,28 @@ class npc_broken_frostmourne : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { _events.SetPhase(PHASE_OUTRO); _events.ScheduleEvent(EVENT_OUTRO_KNOCK_BACK, 3000, 0, PHASE_OUTRO); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_SUMMON_TERENAS) _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6000, 0, PHASE_OUTRO); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { UpdateVictim(); @@ -2008,7 +2011,7 @@ class npc_broken_frostmourne : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_broken_frostmourneAI>(creature); } @@ -2041,14 +2044,14 @@ class spell_the_lich_king_infest : public SpellScriptLoader aurEff->SetAmount(int32(aurEff->GetAmount() * 1.15f)); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_infest_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_the_lich_king_infest_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_infest_AuraScript(); } @@ -2063,7 +2066,7 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NECROTIC_PLAGUE_JUMP)) return false; @@ -2090,13 +2093,13 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader caster->CastSpell(caster, SPELL_PLAGUE_SIPHON, true); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_necrotic_plague_AuraScript(); } @@ -2111,7 +2114,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_necrotic_plague_SpellScript); - bool Load() + bool Load() OVERRIDE { _hadAura = false; return true; @@ -2138,7 +2141,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader GetHitAura()->ModStackAmount(1); } - void Register() + void Register() OVERRIDE { BeforeHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::CheckAura); OnHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::AddMissingStack); @@ -2151,7 +2154,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); - bool Load() + bool Load() OVERRIDE { _lastAmount = 0; return true; @@ -2204,7 +2207,7 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader Remove(AURA_REMOVE_BY_ENEMY_SPELL); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_the_lich_king_necrotic_plague_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); @@ -2215,12 +2218,12 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader int32 _lastAmount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_necrotic_plague_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_necrotic_plague_AuraScript(); } @@ -2241,13 +2244,13 @@ class spell_the_lich_king_shadow_trap_visual : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHADOW_TRAP_AURA, TRIGGERED_NONE); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_shadow_trap_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_shadow_trap_visual_AuraScript(); } @@ -2270,13 +2273,13 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, SPELL_SHADOW_TRAP_KNOCKBACK, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_shadow_trap_periodic_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_shadow_trap_periodic_SpellScript(); } @@ -2291,7 +2294,7 @@ class spell_the_lich_king_quake : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_quake_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetInstanceScript() != NULL; } @@ -2308,14 +2311,14 @@ class spell_the_lich_king_quake : public SpellScriptLoader GetCaster()->GetAI()->DoAction(ACTION_START_ATTACK); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHit += SpellEffectFn(spell_the_lich_king_quake_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_quake_SpellScript(); } @@ -2330,7 +2333,7 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_ice_burst_target_search_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) return false; @@ -2352,13 +2355,13 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_ice_burst_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_ice_burst_target_search_SpellScript(); } @@ -2373,7 +2376,7 @@ class spell_the_lich_king_raging_spirit : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_raging_spirit_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) return false; @@ -2386,13 +2389,13 @@ class spell_the_lich_king_raging_spirit : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_raging_spirit_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_raging_spirit_SpellScript(); } @@ -2436,7 +2439,7 @@ class spell_the_lich_king_defile : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DEFILE_GROW, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -2444,7 +2447,7 @@ class spell_the_lich_king_defile : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_defile_SpellScript(); } @@ -2473,13 +2476,13 @@ class spell_the_lich_king_summon_into_air : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_summon_into_air_SpellScript(); } @@ -2494,7 +2497,7 @@ class spell_the_lich_king_soul_reaper : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_soul_reaper_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SOUL_REAPER_BUFF)) return false; @@ -2507,13 +2510,13 @@ class spell_the_lich_king_soul_reaper : public SpellScriptLoader GetTarget()->CastSpell(caster, SPELL_SOUL_REAPER_BUFF, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_reaper_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_soul_reaper_AuraScript(); } @@ -2528,14 +2531,14 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ICE_BURST)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _target = NULL; return true; @@ -2569,7 +2572,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_CHARGE, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_valkyr_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_valkyr_target_search_SpellScript::ReplaceTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -2579,7 +2582,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_valkyr_target_search_SpellScript(); } @@ -2594,7 +2597,7 @@ class spell_the_lich_king_eject_all_passengers : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_eject_all_passengers_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->IsVehicle(); } @@ -2605,13 +2608,13 @@ class spell_the_lich_king_eject_all_passengers : public SpellScriptLoader GetCaster()->GetVehicleKit()->RemoveAllPassengers(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_eject_all_passengers_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_eject_all_passengers_SpellScript(); } @@ -2631,13 +2634,13 @@ class spell_the_lich_king_cast_back_to_caster : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_cast_back_to_caster_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_cast_back_to_caster_SpellScript(); } @@ -2652,7 +2655,7 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_life_siphon_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LIFE_SIPHON_HEAL)) return false; @@ -2664,13 +2667,13 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_LIFE_SIPHON_HEAL, SPELLVALUE_BASE_POINT0, GetHitDamage() * 10, GetCaster(), true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_the_lich_king_life_siphon_SpellScript::TriggerHeal); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_life_siphon_SpellScript(); } @@ -2685,7 +2688,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_vile_spirits_AuraScript); - bool Load() + bool Load() OVERRIDE { _is25Man = GetUnitOwner()->GetMap()->Is25ManRaid(); return true; @@ -2697,7 +2700,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff, GetCasterGUID()); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_vile_spirits_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } @@ -2705,7 +2708,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader bool _is25Man; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_vile_spirits_AuraScript(); } @@ -2726,13 +2729,13 @@ class spell_the_lich_king_vile_spirits_visual : public SpellScriptLoader const_cast<WorldLocation*>(GetExplTargetDest())->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectLaunch += SpellEffectFn(spell_the_lich_king_vile_spirits_visual_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_vile_spirits_visual_SpellScript(); } @@ -2747,7 +2750,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa { PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search_SpellScript); - bool Load() + bool Load() OVERRIDE { _target = NULL; return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2772,7 +2775,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa GetCaster()->AddThreat(GetHitUnit(), 100000.0f); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); @@ -2781,7 +2784,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa WorldObject* _target; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_vile_spirit_move_target_search_SpellScript(); } @@ -2796,7 +2799,7 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL { PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2816,13 +2819,13 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL GetCaster()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_vile_spirit_damage_target_search_SpellScript(); } @@ -2837,7 +2840,7 @@ class spell_the_lich_king_harvest_soul : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_harvest_soul_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetOwner()->GetInstanceScript() != NULL; } @@ -2849,13 +2852,13 @@ class spell_the_lich_king_harvest_soul : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_harvest_soul_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_harvest_soul_AuraScript(); } @@ -2885,14 +2888,14 @@ class spell_the_lich_king_lights_favor : public SpellScriptLoader amount = int32(caster->GetHealthPct()); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_lights_favor_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_the_lich_king_lights_favor_AuraScript::CalculateBonus, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_lights_favor_AuraScript(); } @@ -2915,13 +2918,13 @@ class spell_the_lich_king_soul_rip : public SpellScriptLoader caster->CastCustomSpell(SPELL_SOUL_RIP_DAMAGE, SPELLVALUE_BASE_POINT0, 5000 * aurEff->GetTickNumber(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_rip_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_soul_rip_AuraScript(); } @@ -2936,7 +2939,7 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_restore_soul_SpellScript); - bool Load() + bool Load() OVERRIDE { _instance = GetCaster()->GetInstanceScript(); return _instance != NULL; @@ -2965,7 +2968,7 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader target->RemoveAurasDueToSpell(target->GetMap()->IsHeroic() ? SPELL_HARVEST_SOULS_TELEPORT : SPELL_HARVEST_SOUL_TELEPORT); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_the_lich_king_restore_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); BeforeHit += SpellHitFn(spell_the_lich_king_restore_soul_SpellScript::RemoveAura); @@ -2974,7 +2977,7 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader InstanceScript* _instance; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_restore_soul_SpellScript(); } @@ -2989,7 +2992,7 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_dark_hunger_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DARK_HUNGER_HEAL)) return false; @@ -3003,13 +3006,13 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DARK_HUNGER_HEAL, SPELLVALUE_BASE_POINT0, heal, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_the_lich_king_dark_hunger_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_dark_hunger_AuraScript(); } @@ -3024,7 +3027,7 @@ class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader { PrepareAuraScript(spell_the_lich_king_in_frostmourne_room_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetOwner()->GetInstanceScript() != NULL; } @@ -3036,13 +3039,13 @@ class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_HARVESTED_SOUL, true, NULL, NULL, GetTarget()->GetInstanceScript()->GetData64(DATA_THE_LICH_KING)); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_in_frostmourne_room_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_the_lich_king_in_frostmourne_room_AuraScript(); } @@ -3063,13 +3066,13 @@ class spell_the_lich_king_summon_spirit_bomb : public SpellScriptLoader GetHitUnit()->CastSpell((Unit*)NULL, uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_summon_spirit_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_summon_spirit_bomb_SpellScript(); } @@ -3093,13 +3096,13 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader VileSpiritActivateEvent(target).Execute(0, 0); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_the_lich_king_trigger_vile_spirit_SpellScript::ActivateSpirit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_trigger_vile_spirit_SpellScript(); } @@ -3123,13 +3126,13 @@ class spell_the_lich_king_jump : public SpellScriptLoader creature->AI()->DoAction(ACTION_BREAK_FROSTMOURNE); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_jump_SpellScript(); } @@ -3150,13 +3153,13 @@ class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_jump_SpellScript(); } @@ -3171,7 +3174,7 @@ class spell_the_lich_king_play_movie : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_play_movie_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sMovieStore.LookupEntry(MOVIE_FALL_OF_THE_LICH_KING)) return false; @@ -3185,13 +3188,13 @@ class spell_the_lich_king_play_movie : public SpellScriptLoader player->SendMovieStart(MOVIE_FALL_OF_THE_LICH_KING); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_play_movie_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_play_movie_SpellScript(); } @@ -3202,7 +3205,7 @@ class achievement_been_waiting_long_time : public AchievementCriteriaScript public: achievement_been_waiting_long_time() : AchievementCriteriaScript("achievement_been_waiting_long_time") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; @@ -3216,7 +3219,7 @@ class achievement_neck_deep_in_vile : public AchievementCriteriaScript public: achievement_neck_deep_in_vile() : AchievementCriteriaScript("achievement_neck_deep_in_vile") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index cf200530726..557d6768790 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -284,7 +284,7 @@ class boss_valithria_dreamwalker : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow())) if (data->curhealth) @@ -294,7 +294,7 @@ class boss_valithria_dreamwalker : public CreatureScript Reset(); } - void Reset() + void Reset() OVERRIDE { me->SetHealth(_spawnHealth); me->SetReactState(REACT_PASSIVE); @@ -312,11 +312,11 @@ class boss_valithria_dreamwalker : public CreatureScript _done = false; } - void AttackStart(Unit* /*target*/) + void AttackStart(Unit* /*target*/) OVERRIDE { } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_ENTER_COMBAT) return; @@ -329,7 +329,7 @@ class boss_valithria_dreamwalker : public CreatureScript _events.ScheduleEvent(EVENT_BERSERK, 420000); } - void HealReceived(Unit* healer, uint32& heal) + void HealReceived(Unit* healer, uint32& heal) OVERRIDE { if (!me->hasLootRecipient()) me->SetLootRecipient(healer); @@ -359,7 +359,7 @@ class boss_valithria_dreamwalker : public CreatureScript archmage->AI()->DoZoneInCombat(); // call EnterCombat on one of them, that will make it all start } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(25, damage)) { @@ -384,7 +384,7 @@ class boss_valithria_dreamwalker : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_DREAM_SLIP) { @@ -402,7 +402,7 @@ class boss_valithria_dreamwalker : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DREAM_PORTAL_PRE_EFFECT) { @@ -416,14 +416,14 @@ class boss_valithria_dreamwalker : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DREAM_PORTAL || summon->GetEntry() == NPC_NIGHTMARE_PORTAL) if (summon->AI()->GetData(MISSED_PORTALS)) ++_missedPortals; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // does not enter combat if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) != IN_PROGRESS) @@ -460,7 +460,7 @@ class boss_valithria_dreamwalker : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == MISSED_PORTALS) return _missedPortals; @@ -480,7 +480,7 @@ class boss_valithria_dreamwalker : public CreatureScript bool _done; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_valithria_dreamwalkerAI>(creature); } @@ -497,13 +497,13 @@ class npc_green_dragon_combat_trigger : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* target) + void EnterCombat(Unit* target) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_VALITHRIA_DREAMWALKER, target->ToPlayer())) { @@ -519,24 +519,24 @@ class npc_green_dragon_combat_trigger : public CreatureScript valithria->AI()->DoAction(ACTION_ENTER_COMBAT); } - void AttackStart(Unit* target) + void AttackStart(Unit* target) OVERRIDE { if (target->GetTypeId() == TYPEID_PLAYER) BossAI::AttackStart(target); } - bool CanAIAttack(Unit const* target) const + bool CanAIAttack(Unit const* target) const OVERRIDE { return target->GetTypeId() == TYPEID_PLAYER; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); DoAction(ACTION_DEATH); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_DEATH) { @@ -545,7 +545,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!me->IsInCombat()) return; @@ -575,7 +575,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript bool _evadeCheck; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_green_dragon_combat_triggerAI>(creature); } @@ -593,7 +593,7 @@ class npc_the_lich_king_controller : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_GLUTTONOUS_ABOMINATION_SUMMONER, 5000); @@ -604,18 +604,18 @@ class npc_the_lich_king_controller : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->setActive(false); } - void EnterCombat(Unit* /*target*/) + void EnterCombat(Unit* /*target*/) OVERRIDE { Talk(SAY_LICH_KING_INTRO); me->setActive(true); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { // must not be in dream phase summon->SetPhaseMask((summon->GetPhaseMask() & ~0x10), true); @@ -624,7 +624,7 @@ class npc_the_lich_king_controller : public CreatureScript summon->AI()->AttackStart(target); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -664,7 +664,7 @@ class npc_the_lich_king_controller : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_the_lich_king_controllerAI(creature); } @@ -682,12 +682,12 @@ class npc_risen_archmage : public CreatureScript { } - bool CanAIAttack(Unit const* target) const + bool CanAIAttack(Unit const* target) const OVERRIDE { return target->GetEntry() != NPC_VALITHRIA_DREAMWALKER; } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, urand(5000, 15000)); @@ -696,7 +696,7 @@ class npc_risen_archmage : public CreatureScript _canCallEnterCombat = true; } - void EnterCombat(Unit* /*target*/) + void EnterCombat(Unit* /*target*/) OVERRIDE { me->FinishSpell(CURRENT_CHANNELED_SPELL, false); if (me->GetDBTableGUIDLow() && _canCallEnterCombat) @@ -716,7 +716,7 @@ class npc_risen_archmage : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_ENTER_COMBAT) return; @@ -726,7 +726,7 @@ class npc_risen_archmage : public CreatureScript _canCallEnterCombat = true; } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_COLUMN_OF_FROST) summon->m_Events.AddEvent(new DelayedCastEvent(summon, SPELL_COLUMN_OF_FROST_DAMAGE, 0, 8000), summon->m_Events.CalculateTime(2000)); @@ -734,7 +734,7 @@ class npc_risen_archmage : public CreatureScript summon->DespawnOrUnsummon(36000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) if (me->GetDBTableGUIDLow()) @@ -781,7 +781,7 @@ class npc_risen_archmage : public CreatureScript bool _canCallEnterCombat; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_risen_archmageAI>(creature); } @@ -798,14 +798,14 @@ class npc_blazing_skeleton : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_FIREBALL, urand(2000, 4000)); _events.ScheduleEvent(EVENT_LEY_WASTE, urand(15000, 20000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -840,7 +840,7 @@ class npc_blazing_skeleton : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_blazing_skeletonAI>(creature); } @@ -858,20 +858,20 @@ class npc_suppresser : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_SUPPRESSION, urand(10000, 15000)); me->SetReactState(REACT_PASSIVE); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { if (Creature* valithria = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_VALITHRIA_DREAMWALKER))) AttackStart(valithria); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -906,7 +906,7 @@ class npc_suppresser : public CreatureScript InstanceScript* const _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_suppresserAI>(creature); } @@ -923,12 +923,12 @@ class npc_blistering_zombie : public CreatureScript { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_ACID_BURST, true); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -937,7 +937,7 @@ class npc_blistering_zombie : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_blistering_zombieAI>(creature); } @@ -954,18 +954,18 @@ class npc_gluttonous_abomination : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_GUT_SPRAY, urand(10000, 13000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_ROT_WORM_SPAWNER, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -995,7 +995,7 @@ class npc_gluttonous_abomination : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_gluttonous_abominationAI>(creature); } @@ -1013,7 +1013,7 @@ class npc_dream_portal : public CreatureScript { } - void OnSpellClick(Unit* /*clicker*/, bool& result) + void OnSpellClick(Unit* /*clicker*/, bool& result) OVERRIDE { if (!result) return; @@ -1022,12 +1022,12 @@ class npc_dream_portal : public CreatureScript me->DespawnOrUnsummon(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { return (type == MISSED_PORTALS && _used) ? 0 : 1; } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { UpdateVictim(); } @@ -1036,7 +1036,7 @@ class npc_dream_portal : public CreatureScript bool _used; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_dream_portalAI>(creature); } @@ -1054,7 +1054,7 @@ class npc_dream_cloud : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_CHECK_PLAYER, 1000); @@ -1062,7 +1062,7 @@ class npc_dream_cloud : public CreatureScript me->LoadCreaturesAddon(true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // trigger if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) != IN_PROGRESS) @@ -1100,7 +1100,7 @@ class npc_dream_cloud : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_dream_cloudAI>(creature); } @@ -1124,13 +1124,13 @@ class spell_dreamwalker_mana_void : public SpellScriptLoader PreventDefaultAction(); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_mana_void_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dreamwalker_mana_void_AuraScript(); } @@ -1145,7 +1145,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader { PrepareAuraScript(spell_dreamwalker_decay_periodic_timer_AuraScript); - bool Load() + bool Load() OVERRIDE { _decayRate = GetId() != SPELL_TIMER_BLAZING_SKELETON ? 1000 : 5000; return true; @@ -1160,7 +1160,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader aurEff->SetPeriodicTimer(timer - _decayRate); } - void Register() + void Register() OVERRIDE { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_dreamwalker_decay_periodic_timer_AuraScript::DecayPeriodicTimer, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -1168,7 +1168,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader int32 _decayRate; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dreamwalker_decay_periodic_timer_AuraScript(); } @@ -1183,7 +1183,7 @@ class spell_dreamwalker_summoner : public SpellScriptLoader { PrepareSpellScript(spell_dreamwalker_summoner_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster()->GetInstanceScript()) return false; @@ -1210,14 +1210,14 @@ class spell_dreamwalker_summoner : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, true, NULL, NULL, GetCaster()->GetInstanceScript()->GetData64(DATA_VALITHRIA_LICH_KING)); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dreamwalker_summoner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summoner_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dreamwalker_summoner_SpellScript(); } @@ -1252,13 +1252,13 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader caster->CastSpell(summoners.back(), SPELL_SUMMON_SUPPRESSER, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_summon_suppresser_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dreamwalker_summon_suppresser_AuraScript(); } @@ -1273,7 +1273,7 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScriptLoader { PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster()->GetInstanceScript()) return false; @@ -1289,13 +1289,13 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, true, NULL, NULL, GetCaster()->GetInstanceScript()->GetData64(DATA_VALITHRIA_LICH_KING)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_suppresser_effect_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dreamwalker_summon_suppresser_effect_SpellScript(); } @@ -1320,13 +1320,13 @@ class spell_dreamwalker_summon_dream_portal : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_dream_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dreamwalker_summon_dream_portal_SpellScript(); } @@ -1351,13 +1351,13 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_nightmare_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dreamwalker_summon_nightmare_portal_SpellScript(); } @@ -1372,7 +1372,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader { PrepareAuraScript(spell_dreamwalker_nightmare_cloud_AuraScript); - bool Load() + bool Load() OVERRIDE { _instance = GetOwner()->GetInstanceScript(); return _instance != NULL; @@ -1384,7 +1384,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader PreventDefaultAction(); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_nightmare_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -1392,7 +1392,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader InstanceScript* _instance; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dreamwalker_nightmare_cloud_AuraScript(); } @@ -1418,13 +1418,13 @@ class spell_dreamwalker_twisted_nightmares : public SpellScriptLoader GetHitUnit()->CastSpell((Unit*)NULL, GetSpellInfo()->Effects[effIndex].TriggerSpell, true, NULL, NULL, instance->GetData64(DATA_VALITHRIA_DREAMWALKER)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_twisted_nightmares_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dreamwalker_twisted_nightmares_SpellScript(); } @@ -1435,7 +1435,7 @@ class achievement_portal_jockey : public AchievementCriteriaScript public: achievement_portal_jockey() : AchievementCriteriaScript("achievement_portal_jockey") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return target && !target->GetAI()->GetData(MISSED_PORTALS); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index aab1e5354d1..e3e1bfedc44 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -387,7 +387,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _theLichKing = 0; @@ -398,7 +398,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript // IMPORTANT NOTE: This is triggered from per-GUID scripts // of The Damned SAI - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == DATA_DAMNED_KILLS && data == 1) { @@ -460,7 +460,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_damnedKills != 2) return; @@ -581,7 +581,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript uint16 _damnedKills; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_highlord_tirion_fordringAI>(creature); } @@ -598,7 +598,7 @@ class npc_rotting_frost_giant : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_DEATH_PLAGUE, 15000); @@ -606,12 +606,12 @@ class npc_rotting_frost_giant : public CreatureScript _events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(10000, 15000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _events.Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -653,7 +653,7 @@ class npc_rotting_frost_giant : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_rotting_frost_giantAI>(creature); } @@ -671,7 +671,7 @@ class npc_frost_freeze_trap : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -684,7 +684,7 @@ class npc_frost_freeze_trap : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -699,7 +699,7 @@ class npc_frost_freeze_trap : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_frost_freeze_trapAI>(creature); } @@ -710,7 +710,7 @@ class npc_alchemist_adrianna : public CreatureScript public: npc_alchemist_adrianna() : CreatureScript("npc_alchemist_adrianna") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (!creature->FindCurrentSpellBySpellId(SPELL_HARVEST_BLIGHT_SPECIMEN) && !creature->FindCurrentSpellBySpellId(SPELL_HARVEST_BLIGHT_SPECIMEN25)) if (player->HasAura(SPELL_ORANGE_BLIGHT_RESIDUE) && player->HasAura(SPELL_GREEN_BLIGHT_RESIDUE)) @@ -731,7 +731,7 @@ class boss_sister_svalna : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (!me->isDead()) Reset(); @@ -739,14 +739,14 @@ class boss_sister_svalna : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_DEFENSIVE); _isEventInProgress = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_SVALNA_DEATH); @@ -765,7 +765,7 @@ class boss_sister_svalna : public CreatureScript } } - void EnterCombat(Unit* /*attacker*/) + void EnterCombat(Unit* /*attacker*/) OVERRIDE { _EnterCombat(); if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_CROK_SCOURGEBANE))) @@ -775,7 +775,7 @@ class boss_sister_svalna : public CreatureScript events.ScheduleEvent(EVENT_AETHER_SHIELD, urand(100000, 110000)); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { switch (victim->GetTypeId()) { @@ -800,7 +800,7 @@ class boss_sister_svalna : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { _JustReachedHome(); me->SetReactState(REACT_PASSIVE); @@ -808,7 +808,7 @@ class boss_sister_svalna : public CreatureScript me->SetHover(false); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -836,7 +836,7 @@ class boss_sister_svalna : public CreatureScript } } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_HURL_SPEAR && me->HasAura(SPELL_AETHER_SHIELD)) { @@ -845,7 +845,7 @@ class boss_sister_svalna : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != EFFECT_MOTION_TYPE || id != POINT_LAND) return; @@ -857,7 +857,7 @@ class boss_sister_svalna : public CreatureScript me->SetHover(false); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { switch (spell->Id) { @@ -877,7 +877,7 @@ class boss_sister_svalna : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() && !_isEventInProgress) return; @@ -922,7 +922,7 @@ class boss_sister_svalna : public CreatureScript bool _isEventInProgress; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<boss_sister_svalnaAI>(creature); } @@ -946,7 +946,7 @@ class npc_crok_scourgebane : public CreatureScript _didUnderTenPercentText = false; } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_SCOURGE_STRIKE, urand(7500, 12500)); @@ -956,7 +956,7 @@ class npc_crok_scourgebane : public CreatureScript _wipeCheckTimer = 1000; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_START_GAUNTLET) { @@ -988,7 +988,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void SetGUID(uint64 guid, int32 type/* = 0*/) + void SetGUID(uint64 guid, int32 type/* = 0*/) OVERRIDE { if (type == ACTION_VRYKUL_DEATH) { @@ -1008,7 +1008,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -1038,7 +1038,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void WaypointStart(uint32 waypointId) + void WaypointStart(uint32 waypointId) OVERRIDE { _currentWPid = waypointId; switch (waypointId) @@ -1086,7 +1086,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { // check wipe if (!_wipeCheckTimer) @@ -1128,7 +1128,7 @@ class npc_crok_scourgebane : public CreatureScript } } - void UpdateEscortAI(uint32 const diff) + void UpdateEscortAI(uint32 const diff) OVERRIDE { if (_wipeCheckTimer <= diff) _wipeCheckTimer = 0; @@ -1186,7 +1186,7 @@ class npc_crok_scourgebane : public CreatureScript DoMeleeAttackIfReady(); } - bool CanAIAttack(Unit const* target) const + bool CanAIAttack(Unit const* target) const OVERRIDE { // do not see targets inside Frostwing Halls when we are not there return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f); @@ -1205,7 +1205,7 @@ class npc_crok_scourgebane : public CreatureScript bool _didUnderTenPercentText; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_crok_scourgebaneAI>(creature); } @@ -1221,7 +1221,7 @@ struct npc_argent_captainAI : public ScriptedAI IsUndead = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (_firstDeath) { @@ -1232,13 +1232,13 @@ struct npc_argent_captainAI : public ScriptedAI Talk(SAY_CAPTAIN_SECOND_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) Talk(SAY_CAPTAIN_KILL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_START_GAUNTLET) { @@ -1258,20 +1258,20 @@ struct npc_argent_captainAI : public ScriptedAI } } - void EnterCombat(Unit* /*target*/) + void EnterCombat(Unit* /*target*/) OVERRIDE { me->SetHomePosition(*me); if (IsUndead) DoZoneInCombat(); } - bool CanAIAttack(Unit const* target) const + bool CanAIAttack(Unit const* target) const OVERRIDE { // do not see targets inside Frostwing Halls when we are not there return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { // not yet following if (me->GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != CHASE_MOTION_TYPE || IsUndead) @@ -1293,7 +1293,7 @@ struct npc_argent_captainAI : public ScriptedAI Reset(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_REVIVE_CHAMPION && !IsUndead) { @@ -1346,7 +1346,7 @@ class npc_captain_arnath : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { Events.Reset(); Events.ScheduleEvent(EVENT_ARNATH_FLASH_HEAL, urand(4000, 7000)); @@ -1356,7 +1356,7 @@ class npc_captain_arnath : public CreatureScript Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, urand(22000, 27000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1410,7 +1410,7 @@ class npc_captain_arnath : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_captain_arnathAI>(creature); } @@ -1427,7 +1427,7 @@ class npc_captain_brandon : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { Events.Reset(); Events.ScheduleEvent(EVENT_BRANDON_CRUSADER_STRIKE, urand(6000, 10000)); @@ -1437,7 +1437,7 @@ class npc_captain_brandon : public CreatureScript Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, urand(25000, 30000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1478,7 +1478,7 @@ class npc_captain_brandon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_captain_brandonAI>(creature); } @@ -1495,7 +1495,7 @@ class npc_captain_grondel : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { Events.Reset(); Events.ScheduleEvent(EVENT_GRONDEL_CHARGE_CHECK, 500); @@ -1505,7 +1505,7 @@ class npc_captain_grondel : public CreatureScript Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, urand(12000, 17000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1545,7 +1545,7 @@ class npc_captain_grondel : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_captain_grondelAI>(creature); } @@ -1562,7 +1562,7 @@ class npc_captain_rupert : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { Events.Reset(); Events.ScheduleEvent(EVENT_RUPERT_FEL_IRON_BOMB, urand(15000, 20000)); @@ -1570,7 +1570,7 @@ class npc_captain_rupert : public CreatureScript Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, urand(10000, 15000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1608,7 +1608,7 @@ class npc_captain_rupert : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetIcecrownCitadelAI<npc_captain_rupertAI>(creature); } @@ -1625,14 +1625,14 @@ class npc_frostwing_vrykul : public CreatureScript { } - bool CanAIAttack(Unit const* target) const + bool CanAIAttack(Unit const* target) const OVERRIDE { // do not see targets inside Frostwing Halls when we are not there return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f) && SmartAI::CanAIAttack(target); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frostwing_vrykulAI(creature); } @@ -1649,13 +1649,13 @@ class npc_impaling_spear : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); _vehicleCheckTimer = 500; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_vehicleCheckTimer <= diff) { @@ -1670,7 +1670,7 @@ class npc_impaling_spear : public CreatureScript uint32 _vehicleCheckTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_impaling_spearAI(creature); } @@ -1687,7 +1687,7 @@ class npc_arthas_teleport_visual : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); if (_instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && @@ -1696,7 +1696,7 @@ class npc_arthas_teleport_visual : public CreatureScript _events.ScheduleEvent(EVENT_SOUL_MISSILE, urand(1000, 6000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_events.Empty()) return; @@ -1715,7 +1715,7 @@ class npc_arthas_teleport_visual : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { // Distance from the center of the spire if (creature->GetExactDist2d(4357.052f, 2769.421f) < 100.0f && creature->GetHomePosition().GetPositionZ() < 315.0f) @@ -1755,14 +1755,14 @@ class spell_icc_stoneform : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_icc_stoneform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_icc_stoneform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_icc_stoneform_AuraScript(); } @@ -1818,13 +1818,13 @@ class spell_icc_sprit_alarm : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_icc_sprit_alarm_SpellScript::HandleEvent, EFFECT_2, SPELL_EFFECT_SEND_EVENT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_icc_sprit_alarm_SpellScript(); } @@ -1862,7 +1862,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader { PrepareSpellScript(spell_frost_giant_death_plague_SpellScript); - bool Load() + bool Load() OVERRIDE { _failed = false; return true; @@ -1899,7 +1899,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DEATH_PLAGUE_KILL, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_frost_giant_death_plague_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_frost_giant_death_plague_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); @@ -1909,7 +1909,7 @@ class spell_frost_giant_death_plague : public SpellScriptLoader bool _failed; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_frost_giant_death_plague_SpellScript(); } @@ -1935,14 +1935,14 @@ class spell_icc_harvest_blight_specimen : public SpellScriptLoader GetHitUnit()->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_icc_harvest_blight_specimen_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_icc_harvest_blight_specimen_SpellScript::HandleQuestComplete, EFFECT_1, SPELL_EFFECT_QUEST_COMPLETE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_icc_harvest_blight_specimen_SpellScript(); } @@ -1989,14 +1989,14 @@ class spell_svalna_revive_champion : public SpellScriptLoader caster->GetMotionMaster()->MoveLand(POINT_LAND, pos); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_svalna_revive_champion_SpellScript::RemoveAliveTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); OnEffectHit += SpellEffectFn(spell_svalna_revive_champion_SpellScript::Land, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_svalna_revive_champion_SpellScript(); } @@ -2022,13 +2022,13 @@ class spell_svalna_remove_spear : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_svalna_remove_spear_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_svalna_remove_spear_SpellScript(); } @@ -2049,13 +2049,13 @@ class spell_icc_soul_missile : public SpellScriptLoader const_cast<WorldLocation*>(GetExplTargetDest())->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnCast += SpellCastFn(spell_icc_soul_missile_SpellScript::RelocateDest); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_icc_soul_missile_SpellScript(); } @@ -2066,7 +2066,7 @@ class at_icc_saurfang_portal : public AreaTriggerScript public: at_icc_saurfang_portal() : AreaTriggerScript("at_icc_saurfang_portal") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); if (!instance || instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE) @@ -2100,7 +2100,7 @@ class at_icc_shutdown_traps : public AreaTriggerScript public: at_icc_shutdown_traps() : AreaTriggerScript("at_icc_shutdown_traps") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE { if (InstanceScript* instance = player->GetInstanceScript()) instance->SetData(DATA_COLDFLAME_JETS, DONE); @@ -2113,7 +2113,7 @@ class at_icc_start_blood_quickening : public AreaTriggerScript public: at_icc_start_blood_quickening() : AreaTriggerScript("at_icc_start_blood_quickening") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE { if (InstanceScript* instance = player->GetInstanceScript()) if (instance->GetData(DATA_BLOOD_QUICKENING_STATE) == NOT_STARTED) @@ -2127,7 +2127,7 @@ class at_icc_start_frostwing_gauntlet : public AreaTriggerScript public: at_icc_start_frostwing_gauntlet() : AreaTriggerScript("at_icc_start_frostwing_gauntlet") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE { if (InstanceScript* instance = player->GetInstanceScript()) if (Creature* crok = ObjectAccessor::GetCreature(*player, instance->GetData64(DATA_CROK_SCOURGEBANE))) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 887a31baf9a..e328658b9af 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -472,7 +472,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader public: spell_trigger_spell_from_caster_SpellScript(uint32 triggerId) : SpellScript(), _triggerId(triggerId) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_triggerId)) return false; @@ -484,7 +484,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), _triggerId, true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_trigger_spell_from_caster_SpellScript::HandleTrigger); } @@ -492,7 +492,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader uint32 _triggerId; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_trigger_spell_from_caster_SpellScript(_triggerId); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index c7996c830a3..72700a83a55 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -29,7 +29,7 @@ class icecrown_citadel_teleport : public GameObjectScript public: icecrown_citadel_teleport() : GameObjectScript("icecrown_citadel_teleport") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to Light's Hammer.", GOSSIP_SENDER_ICC_PORT, LIGHT_S_HAMMER_TELEPORT); if (InstanceScript* instance = go->GetInstanceScript()) @@ -51,7 +51,7 @@ class icecrown_citadel_teleport : public GameObjectScript return true; } - bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 sender, uint32 action) + bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 sender, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); player->CLOSE_GOSSIP_MENU(); @@ -77,7 +77,7 @@ class at_frozen_throne_teleport : public AreaTriggerScript public: at_frozen_throne_teleport() : AreaTriggerScript("at_frozen_throne_teleport") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) OVERRIDE { if (player->IsInCombat()) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 99af60d7bea..d1a0e1a3e26 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -592,7 +592,7 @@ class instance_icecrown_citadel : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -617,7 +617,7 @@ class instance_icecrown_citadel : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -846,7 +846,7 @@ class instance_icecrown_citadel : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -1314,7 +1314,7 @@ class instance_icecrown_citadel : public InstanceMapScript bool IsOrbWhispererEligible; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_icecrown_citadel_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 1228c4d72e1..45e0855bb4f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -60,9 +60,9 @@ class boss_anubrekhan : public CreatureScript public: boss_anubrekhan() : CreatureScript("boss_anubrekhan") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_anubrekhanAI (creature); + return new boss_anubrekhanAI(creature); } struct boss_anubrekhanAI : public BossAI @@ -71,7 +71,7 @@ public: bool hasTaunted; - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -93,7 +93,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { /// Force the player to spawn corpse scarabs via spell, @todo Check percent chance for scarabs, 20% at the moment if (!(rand()%5)) @@ -103,7 +103,7 @@ public: Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -111,7 +111,7 @@ public: if (instance) instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -123,7 +123,8 @@ public: events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000, 20000)); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!hasTaunted && me->IsWithinDistInMap(who, 60.0f) && who->GetTypeId() == TYPEID_PLAYER) { @@ -133,7 +134,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { BossAI::SummonedCreatureDespawn(summon); @@ -144,7 +145,7 @@ public: summon->CastSpell(summon, SPELL_SUMMON_CORPSE_SCARABS_MOB, true, NULL, NULL, me->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 3283d2b32b2..b723c2f4139 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -49,7 +49,10 @@ enum Events EVENT_FRENZY = 3 }; -#define DATA_FRENZY_DISPELS 1 +enum Misc +{ + DATA_FRENZY_DISPELS = 1 +}; class boss_faerlina : public CreatureScript { @@ -64,7 +67,7 @@ class boss_faerlina : public CreatureScript } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -73,14 +76,15 @@ class boss_faerlina : public CreatureScript events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); } - void Reset() + void Reset() OVERRIDE { _Reset(); _delayFrenzy = false; _frenzyDispels = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!_introDone && who->GetTypeId() == TYPEID_PLAYER) { @@ -91,19 +95,19 @@ class boss_faerlina : public CreatureScript BossAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!urand(0, 2)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_WIDOWS_EMBRACE || spell->Id == H_SPELL_WIDOWS_EMBRACE) { @@ -114,7 +118,7 @@ class boss_faerlina : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_FRENZY_DISPELS) return _frenzyDispels; @@ -122,7 +126,7 @@ class boss_faerlina : public CreatureScript return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -173,7 +177,7 @@ class boss_faerlina : public CreatureScript bool _delayFrenzy; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_faerlinaAI(creature); } @@ -191,7 +195,7 @@ class npc_faerlina_add : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { if (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) { me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_BIND, true); @@ -199,7 +203,7 @@ class npc_faerlina_add : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (_instance && GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) if (Creature* faerlina = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_FAERLINA))) @@ -210,7 +214,7 @@ class npc_faerlina_add : public CreatureScript InstanceScript* const _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_faerlina_addAI(creature); } @@ -221,7 +225,7 @@ class achievement_momma_said_knock_you_out : public AchievementCriteriaScript public: achievement_momma_said_knock_you_out() : AchievementCriteriaScript("achievement_momma_said_knock_you_out") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return target && !target->GetAI()->GetData(DATA_FRENZY_DISPELS); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 2ca4214ceed..9b336a77e26 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -87,9 +87,9 @@ class boss_four_horsemen : public CreatureScript public: boss_four_horsemen() : CreatureScript("boss_four_horsemen") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_four_horsemenAI (creature); + return new boss_four_horsemenAI(creature); } struct boss_four_horsemenAI : public BossAI @@ -116,7 +116,7 @@ public: bool encounterActionReset; bool doDelayPunish; - void Reset() + void Reset() OVERRIDE { if (!encounterActionReset) DoEncounteraction(NULL, false, true, false); @@ -220,7 +220,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -263,14 +263,15 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { BossAI::MoveInLineOfSight(who); if (caster) SelectNearestTarget(who); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!movementCompleted && !movementStarted) { @@ -289,13 +290,13 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -316,7 +317,7 @@ public: Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -326,7 +327,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 15*100*1000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (nextWP && movementStarted && !movementCompleted && !nextMovementStarted) { @@ -435,13 +436,13 @@ class spell_four_horsemen_mark : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_four_horsemen_mark_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_four_horsemen_mark_AuraScript(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index bc489eff438..8980cd063c0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -19,15 +19,21 @@ #include "ScriptedCreature.h" #include "naxxramas.h" -#define SPELL_MORTAL_WOUND 25646 -#define SPELL_ENRAGE RAID_MODE(28371, 54427) -#define SPELL_DECIMATE RAID_MODE(28374, 54426) -#define SPELL_BERSERK 26662 -#define SPELL_INFECTED_WOUND 29306 +enum Spells +{ + SPELL_MORTAL_WOUND = 25646, + SPELL_ENRAGE = 28371, + SPELL_DECIMATE = 28374, + SPELL_BERSERK = 26662, + SPELL_INFECTED_WOUND = 29306 +}; -#define NPC_ZOMBIE 16360 +enum Creatures +{ + NPC_ZOMBIE = 16360 +}; -const Position PosSummon[3] = +Position const PosSummon[3] = { {3267.9f, -3172.1f, 297.42f, 0.94f}, {3253.2f, -3132.3f, 297.42f, 0}, @@ -36,8 +42,7 @@ const Position PosSummon[3] = enum Events { - EVENT_NONE, - EVENT_WOUND, + EVENT_WOUND = 1, EVENT_ENRAGE, EVENT_DECIMATE, EVENT_BERSERK, @@ -51,9 +56,9 @@ class boss_gluth : public CreatureScript public: boss_gluth() : CreatureScript("boss_gluth") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_gluthAI (creature); + return new boss_gluthAI(creature); } struct boss_gluthAI : public BossAI @@ -64,7 +69,8 @@ public: me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_INFECTED_WOUND, true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who->GetEntry() == NPC_ZOMBIE && me->IsWithinDistInMap(who, 7)) { @@ -76,7 +82,7 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_WOUND, 10000); @@ -86,14 +92,14 @@ public: events.ScheduleEvent(EVENT_SUMMON, 15000); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_ZOMBIE) summon->AI()->AttackStart(me); summons.Summon(summon); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictimWithGaze() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 18fe6ca0553..90f14bf43e4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -175,7 +175,7 @@ class boss_gothik : public CreatureScript std::vector<uint64> LiveTriggerGUID; std::vector<uint64> DeadTriggerGUID; - void Reset() + void Reset() OVERRIDE { LiveTriggerGUID.clear(); DeadTriggerGUID.clear(); @@ -189,7 +189,7 @@ class boss_gothik : public CreatureScript thirtyPercentReached = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { for (uint32 i = 0; i < POS_LIVE; ++i) if (Creature* trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i])) @@ -214,7 +214,7 @@ class boss_gothik : public CreatureScript instance->SetData(DATA_GOTHIK_GATE, GO_STATE_READY); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == WORLD_TRIGGER) summon->setActive(true); @@ -231,18 +231,18 @@ class boss_gothik : public CreatureScript summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!(rand()%5)) Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { LiveTriggerGUID.clear(); DeadTriggerGUID.clear(); @@ -350,7 +350,7 @@ class boss_gothik : public CreatureScript return false; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { uint32 spellId = 0; switch (spell->Id) @@ -367,13 +367,13 @@ class boss_gothik : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { if (!phaseTwo) damage = 0; } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (!me->IsInCombat()) return; @@ -393,7 +393,7 @@ class boss_gothik : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -498,7 +498,7 @@ class boss_gothik : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gothikAI(creature); } @@ -524,25 +524,25 @@ class npc_gothik_minion : public CreatureScript return (liveSide == IN_LIVE_SIDE(who)); } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { gateClose = param; } - void DamageTaken(Unit* attacker, uint32 &damage) + void DamageTaken(Unit* attacker, uint32 &damage) OVERRIDE { if (gateClose && !isOnSameSide(attacker)) damage = 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (me->IsSummon()) if (Unit* owner = me->ToTempSummon()->GetSummoner()) CombatAI::JustDied(owner); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (!gateClose) { @@ -574,7 +574,7 @@ class npc_gothik_minion : public CreatureScript Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (gateClose && (!isOnSameSide(me) || (me->GetVictim() && !isOnSameSide(me->GetVictim())))) { @@ -586,7 +586,7 @@ class npc_gothik_minion : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_gothik_minionAI(creature); } @@ -606,13 +606,13 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_SHADOW_MARK)); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gothik_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gothik_shadow_bolt_volley_SpellScript(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index e8991be4dfc..8371a5ad9a0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -49,9 +49,9 @@ class boss_grobbulus : public CreatureScript public: boss_grobbulus() : CreatureScript("boss_grobbulus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_grobbulusAI (creature); + return new boss_grobbulusAI(creature); } struct boss_grobbulusAI : public BossAI @@ -61,7 +61,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_ID, SPELL_POISON_CLOUD_ADD, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_CLOUD, 15000); @@ -70,7 +70,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 12*60000); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { if (spell->Id == uint32(SPELL_SLIME_SPRAY)) { @@ -79,7 +79,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -121,7 +121,7 @@ class npc_grobbulus_poison_cloud : public CreatureScript public: npc_grobbulus_poison_cloud() : CreatureScript("npc_grobbulus_poison_cloud") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_grobbulus_poison_cloudAI(creature); } @@ -135,13 +135,13 @@ public: uint32 Cloud_Timer; - void Reset() + void Reset() OVERRIDE { Cloud_Timer = 1000; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Cloud_Timer <= diff) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 7515321a3f6..14a7a03bd70 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -48,17 +48,20 @@ enum Phases PHASE_DANCE, }; -#define ACTION_SAFETY_DANCE_FAIL 1 -#define DATA_SAFETY_DANCE 19962139 +enum Misc +{ + ACTION_SAFETY_DANCE_FAIL = 1, + DATA_SAFETY_DANCE = 19962139 +}; class boss_heigan : public CreatureScript { public: boss_heigan() : CreatureScript("boss_heigan") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_heiganAI (creature); + return new boss_heiganAI(creature); } struct boss_heiganAI : public BossAI @@ -70,7 +73,7 @@ public: bool safetyDance; Phases phase; - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (!(rand()%5)) Talk(SAY_SLAY); @@ -78,13 +81,13 @@ public: safetyDance = false; } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { if (id == DATA_SAFETY_DANCE) safetyDance = data ? true : false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_SAFETY_DANCE) return safetyDance ? 1 : 0; @@ -92,13 +95,13 @@ public: return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -133,7 +136,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -199,13 +202,13 @@ class spell_heigan_eruption : public SpellScriptLoader Heigan->AI()->SetData(DATA_SAFETY_DANCE, 0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_heigan_eruption_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_heigan_eruption_SpellScript(); } @@ -218,7 +221,7 @@ class achievement_safety_dance : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index f7a7f233c8c..5578d199ec3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -283,7 +283,7 @@ public: SummonList spawns; // adds spawn by the trigger. kept in separated list (i.e. not in summons) - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -330,12 +330,12 @@ public: nWeaver = 0; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -349,7 +349,7 @@ public: chained.clear(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->setFaction(uiFaction); @@ -382,7 +382,7 @@ public: KTTriggerGUID = instance ? instance->GetData64(DATA_KELTHUZAD_TRIGGER) : 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -647,9 +647,9 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_kelthuzadAI (creature); + return new boss_kelthuzadAI(creature); } }; @@ -658,7 +658,7 @@ class at_kelthuzad_center : public AreaTriggerScript public: at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { if (player->IsGameMaster()) return false; @@ -728,14 +728,14 @@ class npc_kelthuzad_abomination : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(2000, 5000)); DoCast(me, SPELL_FRENZY, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -756,7 +756,7 @@ class npc_kelthuzad_abomination : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (_instance) _instance->SetData(DATA_ABOMINATION_KILLED, _instance->GetData(DATA_ABOMINATION_KILLED) + 1); @@ -767,7 +767,7 @@ class npc_kelthuzad_abomination : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kelthuzad_abominationAI(creature); } @@ -782,7 +782,7 @@ class spell_kelthuzad_detonate_mana : public SpellScriptLoader { PrepareAuraScript(spell_kelthuzad_detonate_mana_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MANA_DETONATION_DAMAGE)) return false; @@ -801,13 +801,13 @@ class spell_kelthuzad_detonate_mana : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_kelthuzad_detonate_mana_AuraScript::HandleScript, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_kelthuzad_detonate_mana_AuraScript(); } @@ -818,7 +818,7 @@ class achievement_just_cant_get_enough : public AchievementCriteriaScript public: achievement_just_cant_get_enough() : AchievementCriteriaScript("achievement_just_cant_get_enough") { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 3664a166a9f..93575e6367f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -64,14 +64,14 @@ class boss_loatheb : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); _doomCounter = 0; _sporeLoserData = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_NECROTIC_AURA, 17000); @@ -80,12 +80,12 @@ class boss_loatheb : public CreatureScript events.ScheduleEvent(EVENT_INEVITABLE_DOOM, 120000); } - void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) + void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) OVERRIDE { _sporeLoserData = false; } - uint32 GetData(uint32 id) const + uint32 GetData(uint32 id) const OVERRIDE { if (id != DATA_ACHIEVEMENT_SPORE_LOSER) return 0; @@ -93,7 +93,7 @@ class boss_loatheb : public CreatureScript return uint32(_sporeLoserData); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -139,7 +139,7 @@ class boss_loatheb : public CreatureScript uint8 _doomCounter; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_loathebAI(creature); } @@ -150,7 +150,7 @@ class achievement_spore_loser : public AchievementCriteriaScript public: achievement_spore_loser() : AchievementCriteriaScript("achievement_spore_loser") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_ACHIEVEMENT_SPORE_LOSER); } @@ -167,7 +167,7 @@ class spell_loatheb_necrotic_aura_warning : public SpellScriptLoader { PrepareAuraScript(spell_loatheb_necrotic_aura_warning_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellStore.LookupEntry(SPELL_WARN_NECROTIC_AURA)) return false; @@ -186,14 +186,14 @@ class spell_loatheb_necrotic_aura_warning : public SpellScriptLoader CAST_AI(LoathebAI, GetTarget()->GetAI())->Talk(SAY_NECROTIC_AURA_REMOVED); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_loatheb_necrotic_aura_warning_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_loatheb_necrotic_aura_warning_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_loatheb_necrotic_aura_warning_AuraScript(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index ae04de9db0f..468739894f6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -63,9 +63,9 @@ class boss_maexxna : public CreatureScript public: boss_maexxna() : CreatureScript("boss_maexxna") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_maexxnaAI (creature); + return new boss_maexxnaAI(creature); } struct boss_maexxnaAI : public BossAI @@ -74,7 +74,7 @@ public: bool enraged; - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); enraged = false; @@ -85,7 +85,7 @@ public: events.ScheduleEvent(EVENT_SUMMON, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -154,9 +154,9 @@ class npc_webwrap : public CreatureScript public: npc_webwrap() : CreatureScript("npc_webwrap") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_webwrapAI (creature); + return new npc_webwrapAI(creature); } struct npc_webwrapAI : public NullCreatureAI @@ -165,7 +165,7 @@ public: uint64 victimGUID; - void SetGUID(uint64 guid, int32 /*param*/) + void SetGUID(uint64 guid, int32 /*param*/) OVERRIDE { victimGUID = guid; if (me->m_spells[0] && victimGUID) @@ -173,7 +173,7 @@ public: victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID()); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (me->m_spells[0] && victimGUID) if (Unit* victim = Unit::GetUnit(*me, victimGUID)) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 09f80482e75..e01417574bb 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -73,9 +73,9 @@ class boss_noth : public CreatureScript public: boss_noth() : CreatureScript("boss_noth") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_nothAI (creature); + return new boss_nothAI(creature); } struct boss_nothAI : public BossAI @@ -84,14 +84,14 @@ public: uint32 waveCount, balconyCount; - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_AGGRESSIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -116,20 +116,20 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); summon->setActive(true); summon->AI()->DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -145,7 +145,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 831e74097d2..935d29ff783 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -55,9 +55,9 @@ class boss_patchwerk : public CreatureScript public: boss_patchwerk() : CreatureScript("boss_patchwerk") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_patchwerkAI (creature); + return new boss_patchwerkAI(creature); } struct boss_patchwerkAI : public BossAI @@ -66,7 +66,7 @@ public: bool Enraged; - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -74,19 +74,19 @@ public: instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT); } - void KilledUnit(Unit* /*Victim*/) + void KilledUnit(Unit* /*Victim*/) OVERRIDE { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Enraged = false; @@ -98,7 +98,7 @@ public: instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index abd3fb35a51..5505b83d411 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -39,10 +39,13 @@ #define SOUND_DEATH 8860 #define SOUND_AGGROMIX 8847 -#define SPELL_UNBALANCING_STRIKE 26613 -#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107, 55543) -#define SPELL_JAGGED_KNIFE 55550 -#define SPELL_HOPELESS 29125 +enum Spells +{ + SPELL_UNBALANCING_STRIKE = 26613, + SPELL_DISRUPTING_SHOUT = 29107, + SPELL_JAGGED_KNIFE = 55550, + SPELL_HOPELESS = 29125 +}; enum Events { @@ -58,22 +61,22 @@ class boss_razuvious : public CreatureScript public: boss_razuvious() : CreatureScript("boss_razuvious") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_razuviousAI (creature); + return new boss_razuviousAI(creature); } struct boss_razuviousAI : public BossAI { boss_razuviousAI(Creature* creature) : BossAI(creature, BOSS_RAZUVIOUS) {} - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!(rand()%3)) DoPlaySoundToSet(me, SOUND_SLAY); } - void DamageTaken(Unit* pDone_by, uint32& uiDamage) + void DamageTaken(Unit* pDone_by, uint32& uiDamage) OVERRIDE { // Damage done by the controlled Death Knight understudies should also count toward damage done by players if (pDone_by->GetTypeId() == TYPEID_UNIT && (pDone_by->GetEntry() == 16803 || pDone_by->GetEntry() == 29941)) @@ -82,14 +85,14 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); DoPlaySoundToSet(me, SOUND_DEATH); me->CastSpell(me, SPELL_HOPELESS, true); /// @todo this may affect other creatures } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); DoPlaySoundToSet(me, SOUND_AGGRO); @@ -99,7 +102,7 @@ public: events.ScheduleEvent(EVENT_KNIFE, 10000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 3f5a1021729..60620804db8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -94,7 +94,7 @@ class boss_sapphiron : public CreatureScript _map(me->GetMap()) { } - void InitializeAI() + void InitializeAI() OVERRIDE { float x, y, z; me->GetPosition(x, y, z); @@ -106,7 +106,7 @@ class boss_sapphiron : public CreatureScript BossAI::InitializeAI(); } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -119,7 +119,7 @@ class boss_sapphiron : public CreatureScript _checkFrostResistTimer = 5 * IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -131,7 +131,7 @@ class boss_sapphiron : public CreatureScript CheckPlayersFrostResist(); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_ICEBOLT) { @@ -144,7 +144,7 @@ class boss_sapphiron : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); me->CastSpell(me, SPELL_DIES, true); @@ -152,13 +152,13 @@ class boss_sapphiron : public CreatureScript CheckPlayersFrostResist(); } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { if (id == 1) events.ScheduleEvent(EVENT_LIFTOFF, 0); } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { if (param == DATA_SAPPHIRON_BIRTH) { @@ -208,7 +208,7 @@ class boss_sapphiron : public CreatureScript _iceblocks.clear(); } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { if (data == DATA_THE_HUNDRED_CLUB) return _canTheHundredClub; @@ -216,7 +216,7 @@ class boss_sapphiron : public CreatureScript return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!_phase) return; @@ -401,9 +401,9 @@ class boss_sapphiron : public CreatureScript Map* _map; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_sapphironAI (creature); + return new boss_sapphironAI(creature); } }; @@ -412,7 +412,7 @@ class achievement_the_hundred_club : public AchievementCriteriaScript public: achievement_the_hundred_club() : AchievementCriteriaScript("achievement_the_hundred_club") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_THE_HUNDRED_CLUB); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 7a086ac95e6..3d121887471 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -108,9 +108,9 @@ class boss_thaddius : public CreatureScript public: boss_thaddius() : CreatureScript("boss_thaddius") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_thaddiusAI (creature); + return new boss_thaddiusAI(creature); } struct boss_thaddiusAI : public BossAI @@ -147,19 +147,19 @@ public: bool polaritySwitch; uint32 uiAddsTimer; - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!(rand()%5)) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -190,7 +190,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -199,18 +199,18 @@ public: events.ScheduleEvent(EVENT_BERSERK, 360000); } - void DamageTaken(Unit* /*pDoneBy*/, uint32 & /*uiDamage*/) + void DamageTaken(Unit* /*pDoneBy*/, uint32 & /*uiDamage*/) OVERRIDE { me->SetReactState(REACT_AGGRESSIVE); } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { if (id == DATA_POLARITY_SWITCH) polaritySwitch = data ? true : false; } - uint32 GetData(uint32 id) const + uint32 GetData(uint32 id) const OVERRIDE { if (id != DATA_POLARITY_SWITCH) return 0; @@ -218,7 +218,7 @@ public: return uint32(polaritySwitch); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (checkFeugenAlive && checkStalaggAlive) uiAddsTimer = 0; @@ -283,7 +283,7 @@ class npc_stalagg : public CreatureScript public: npc_stalagg() : CreatureScript("npc_stalagg") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stalaggAI(creature); } @@ -300,7 +300,7 @@ public: uint32 powerSurgeTimer; uint32 magneticPullTimer; - void Reset() + void Reset() OVERRIDE { if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) @@ -310,19 +310,19 @@ public: magneticPullTimer = 20000; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!(rand()%5)) Talk(SAY_STAL_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_STAL_AGGRO); DoCast(SPELL_STALAGG_TESLA); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_STAL_DEATH); if (instance) @@ -331,7 +331,7 @@ public: pThaddius->AI()->DoAction(ACTION_STALAGG_DIED); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -377,7 +377,7 @@ class npc_feugen : public CreatureScript public: npc_feugen() : CreatureScript("npc_feugen") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_feugenAI(creature); } @@ -393,7 +393,7 @@ public: uint32 staticFieldTimer; - void Reset() + void Reset() OVERRIDE { if (instance) if (Creature* pThaddius = me->GetCreature(*me, instance->GetData64(DATA_THADDIUS))) @@ -402,19 +402,19 @@ public: staticFieldTimer = 5000; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!(rand()%5)) Talk(SAY_FEUG_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_FEUG_AGGRO); DoCast(SPELL_FEUGEN_TESLA); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_FEUG_DEATH); if (instance) @@ -423,7 +423,7 @@ public: pThaddius->AI()->DoAction(ACTION_FEUGEN_DIED); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -449,7 +449,7 @@ class spell_thaddius_pos_neg_charge : public SpellScriptLoader { PrepareSpellScript(spell_thaddius_pos_neg_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE)) return false; @@ -462,7 +462,7 @@ class spell_thaddius_pos_neg_charge : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -506,14 +506,14 @@ class spell_thaddius_pos_neg_charge : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_thaddius_pos_neg_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_thaddius_pos_neg_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_thaddius_pos_neg_charge_SpellScript(); } @@ -528,7 +528,7 @@ class spell_thaddius_polarity_shift : public SpellScriptLoader { PrepareSpellScript(spell_thaddius_polarity_shift_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_POLARITY) || !sSpellMgr->GetSpellInfo(SPELL_NEGATIVE_POLARITY)) return false; @@ -542,13 +542,13 @@ class spell_thaddius_polarity_shift : public SpellScriptLoader target->CastSpell(target, roll_chance_i(50) ? SPELL_POSITIVE_POLARITY : SPELL_NEGATIVE_POLARITY, true, NULL, NULL, caster->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_thaddius_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_thaddius_polarity_shift_SpellScript(); } @@ -559,7 +559,7 @@ class achievement_polarity_switch : public AchievementCriteriaScript public: achievement_polarity_switch() : AchievementCriteriaScript("achievement_polarity_switch") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_POLARITY_SWITCH); } diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index e55de3e3dcb..fa50e478d5a 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -256,7 +256,7 @@ class instance_naxxramas : public InstanceMapScript } } - void SetData(uint32 id, uint32 value) + void SetData(uint32 id, uint32 value) OVERRIDE { switch (id) { @@ -292,7 +292,7 @@ class instance_naxxramas : public InstanceMapScript } } - uint32 GetData(uint32 id) const + uint32 GetData(uint32 id) const OVERRIDE { switch (id) { @@ -305,7 +305,7 @@ class instance_naxxramas : public InstanceMapScript return 0; } - uint64 GetData64(uint32 id) const + uint64 GetData64(uint32 id) const OVERRIDE { switch (id) { @@ -513,7 +513,7 @@ class instance_naxxramas : public InstanceMapScript uint32 playerDied; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_naxxramas_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 06b34487c7d..ef3162d892e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -346,7 +346,7 @@ public: _flySpeed = me->GetSpeed(MOVE_FLIGHT); // Get initial fly speed, otherwise on each wipe fly speed would add up if we get it } - void Reset() + void Reset() OVERRIDE { // EnterEvadeMode and Reset() links are cut for the sake of properly functioning despawner. if (!_despawned) @@ -380,7 +380,7 @@ public: instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { switch (data) { @@ -393,7 +393,7 @@ public: return 0; } - void SetData(uint32 data, uint32 value) + void SetData(uint32 data, uint32 value) OVERRIDE { if (data == DATA_SUMMON_DEATHS && _phase == PHASE_TWO && !_despawned) { @@ -418,7 +418,7 @@ public: } } - uint64 GetGUID(int32 type) const + uint64 GetGUID(int32 type) const OVERRIDE { if (type >= DATA_FIRST_SURGE_TARGET_GUID && type < DATA_FIRST_SURGE_TARGET_GUID + NUM_MAX_SURGE_TARGETS) return _surgeTargetGUID[type - DATA_FIRST_SURGE_TARGET_GUID]; @@ -428,7 +428,7 @@ public: return 0; } - void SetGUID(uint64 guid, int32 type) + void SetGUID(uint64 guid, int32 type) OVERRIDE { switch (type) { @@ -445,7 +445,7 @@ public: } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -557,13 +557,13 @@ public: } // There are moments where boss will do nothing while being attacked - void AttackStart(Unit* target) + void AttackStart(Unit* target) OVERRIDE { if (_canAttack) BossAI::AttackStart(target); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { // We can't call full function here since it includes DoZoneInCombat(), // if someone does it will be returned with a warning. @@ -585,7 +585,7 @@ public: instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (instance) instance->SetBossState(DATA_MALYGOS_EVENT, FAIL); @@ -632,7 +632,7 @@ public: instance->SetBossState(DATA_MALYGOS_EVENT, NOT_STARTED); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -660,7 +660,7 @@ public: } } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_POWER_SPARK_MALYGOS) { @@ -673,7 +673,8 @@ public: sCreatureTextMgr->SendChat(me, EMOTE_HIT_BERSERKER_TIMER, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_MAP); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->IsInCombat() || _phase != PHASE_ONE) return; @@ -683,7 +684,7 @@ public: who->CastSpell(me, SPELL_POWER_SPARK_MALYGOS, true); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE) return; @@ -752,7 +753,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance || (!UpdateVictim() && _phase != PHASE_NOT_STARTED && _phase != PHASE_TWO)) return; @@ -995,7 +996,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -1071,7 +1072,7 @@ public: float _flySpeed; // Used to store base fly speed to prevent stacking on each evade. }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_malygosAI(creature); } @@ -1089,7 +1090,7 @@ public: _instance = creature->GetInstanceScript(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_PORTAL_OPENED) { @@ -1101,7 +1102,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { // When duration of opened riff visual ends, closed one should be cast if (!me->HasAura(SPELL_PORTAL_VISUAL_CLOSED) && !me->HasAura(SPELL_PORTAL_OPENED)) @@ -1124,7 +1125,7 @@ public: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_portal_eoeAI(creature); } @@ -1154,7 +1155,7 @@ public: me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!_instance) return; @@ -1178,7 +1179,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->CastSpell(me, SPELL_POWER_SPARK_DEATH, true); // not supposed to hide the fact it's there by not selectable } @@ -1187,7 +1188,7 @@ public: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_power_sparkAI(creature); } @@ -1208,14 +1209,14 @@ public: me->SetSpeed(MOVE_FLIGHT, 1.25f); } - void Reset() + void Reset() OVERRIDE { VehicleAI::Reset(); _wpCount = 0; } - void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) + void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) OVERRIDE { if (apply) { @@ -1248,7 +1249,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -1256,7 +1257,7 @@ public: me->GetMotionMaster()->MovePoint(eventId, MeleeHoverDisksWaypoints[eventId]); } - void DoAction(int32 /*action*/) + void DoAction(int32 /*action*/) OVERRIDE { if (Vehicle* vehicleTemp = me->GetVehicleKit()) if (vehicleTemp->GetPassenger(0) && vehicleTemp->GetPassenger(0)->GetTypeId() == TYPEID_PLAYER) @@ -1268,7 +1269,7 @@ public: me->DespawnOrUnsummon(3*IN_MILLISECONDS); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -1289,7 +1290,7 @@ public: EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_melee_hover_diskAI(creature); } @@ -1311,16 +1312,16 @@ public: me->SetSpeed(MOVE_FLIGHT, 0.45f); } - void Reset() + void Reset() OVERRIDE { VehicleAI::Reset(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { } - void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) + void PassengerBoarded(Unit* unit, int8 /*seat*/, bool apply) OVERRIDE { if (apply) { @@ -1336,7 +1337,7 @@ public: } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action < ACTION_DELAYED_DESPAWN) { @@ -1371,7 +1372,7 @@ public: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_caster_hover_diskAI(creature); } @@ -1389,23 +1390,23 @@ class npc_nexus_lord : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { } - void DoAction(int32 /*action*/) + void DoAction(int32 /*action*/) OVERRIDE { _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1); _events.ScheduleEvent(EVENT_ARCANE_SHOCK, 2*IN_MILLISECONDS); _events.ScheduleEvent(EVENT_HASTE_BUFF, 12*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1436,7 +1437,7 @@ class npc_nexus_lord : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* malygos = me->GetMap()->GetCreature(_instance->GetData64(DATA_MALYGOS))) malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS) + 1); @@ -1447,7 +1448,7 @@ class npc_nexus_lord : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nexus_lordAI(creature); } @@ -1465,29 +1466,29 @@ class npc_scion_of_eternity : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(14, 29)*IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void AttackStart(Unit* /*target*/) + void AttackStart(Unit* /*target*/) OVERRIDE { } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -1503,7 +1504,7 @@ class npc_scion_of_eternity : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* malygos = me->GetMap()->GetCreature(_instance->GetData64(DATA_MALYGOS))) malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS) + 1); @@ -1514,7 +1515,7 @@ class npc_scion_of_eternity : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scion_of_eternityAI(creature); } @@ -1533,7 +1534,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { if (Creature* creature = summoner->ToCreature()) { @@ -1542,11 +1543,11 @@ public: } } - void UpdateAI (uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) { } - void DoAction(int32 /*action*/) + void DoAction(int32 /*action*/) OVERRIDE { if (Creature* malygos = me->GetMap()->GetCreature(_instance->GetData64(DATA_MALYGOS))) { @@ -1558,7 +1559,7 @@ public: } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_ARCANE_BOMB_TRIGGER) { @@ -1572,9 +1573,9 @@ public: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_arcane_overloadAI (creature); + return new npc_arcane_overloadAI(creature); } }; @@ -1590,7 +1591,7 @@ public: { } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { _summoner = NULL; if (Player* player = summoner->ToPlayer()) @@ -1600,7 +1601,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { VehicleAI::UpdateAI(diff); _events.Update(diff); @@ -1616,7 +1617,7 @@ public: } } - void PassengerBoarded(Unit* /*unit*/, int8 /*seat*/, bool apply) + void PassengerBoarded(Unit* /*unit*/, int8 /*seat*/, bool apply) OVERRIDE { if (!apply) { @@ -1637,9 +1638,9 @@ public: EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_wyrmrest_skytalonAI (creature); + return new npc_wyrmrest_skytalonAI(creature); } }; @@ -1656,16 +1657,16 @@ class npc_static_field : public CreatureScript { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { // For some great reason the spell doesn't time it... me->DespawnOrUnsummon(30*IN_MILLISECONDS); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_static_fieldAI (creature); + return new npc_static_fieldAI(creature); } }; @@ -1678,12 +1679,12 @@ class spell_malygos_portal_beam : public SpellScriptLoader { PrepareAuraScript(spell_malygos_portal_beam_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PORTAL_OPENED)) return false; @@ -1703,14 +1704,14 @@ class spell_malygos_portal_beam : public SpellScriptLoader target->RemoveAura(SPELL_PORTAL_OPENED); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_malygos_portal_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_portal_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_malygos_portal_beam_AuraScript(); } @@ -1725,7 +1726,7 @@ class spell_malygos_random_portal : public SpellScriptLoader { PrepareSpellScript(spell_malygos_random_portal_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1742,13 +1743,13 @@ class spell_malygos_random_portal : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_malygos_random_portal_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_malygos_random_portal_SpellScript(); } @@ -1781,12 +1782,12 @@ class spell_malygos_arcane_storm : public SpellScriptLoader { PrepareSpellScript(spell_malygos_arcane_storm_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ARCANE_STORM_EXTRA_VISUAL)) return false; @@ -1819,14 +1820,14 @@ class spell_malygos_arcane_storm : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), SPELL_ARCANE_STORM_EXTRA_VISUAL, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_arcane_storm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectLaunchTarget += SpellEffectFn(spell_malygos_arcane_storm_SpellScript::HandleVisual, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_malygos_arcane_storm_SpellScript(); } @@ -1841,7 +1842,7 @@ public: { PrepareSpellScript(spell_malygos_vortex_dummy_SpellScript) - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1857,13 +1858,13 @@ public: // the rest of the vortex execution continues when SPELL_VORTEX_2 is removed. } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_malygos_vortex_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_malygos_vortex_dummy_SpellScript(); } @@ -1878,12 +1879,12 @@ class spell_malygos_vortex_visual : public SpellScriptLoader { PrepareAuraScript(spell_malygos_vortex_visual_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_VORTEX_1) || !sSpellMgr->GetSpellInfo(SPELL_VORTEX_6)) return false; @@ -1921,13 +1922,13 @@ class spell_malygos_vortex_visual : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_vortex_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_malygos_vortex_visual_AuraScript(); } @@ -1957,7 +1958,7 @@ class spell_arcane_overload : public SpellScriptLoader { PrepareSpellScript(spell_arcane_overload_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1969,13 +1970,13 @@ class spell_arcane_overload : public SpellScriptLoader GetSpellInfo()->Effects[EFFECT_0].CalcRadius(arcaneOverload) * arcaneOverload->GetFloatValue(OBJECT_FIELD_SCALE_X))); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arcane_overload_SpellScript::ResizeEffectRadiusTargetChecker, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_arcane_overload_SpellScript(); } @@ -1990,7 +1991,7 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader { PrepareSpellScript(spell_nexus_lord_align_disk_aggro_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2002,13 +2003,13 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader target->GetMotionMaster()->MoveChase(caster->GetVictim()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_nexus_lord_align_disk_aggro_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_nexus_lord_align_disk_aggro_SpellScript(); } @@ -2041,7 +2042,7 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader { PrepareSpellScript(spell_scion_of_eternity_arcane_barrage_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT && GetCaster()->GetInstanceScript() != NULL; } @@ -2103,14 +2104,14 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_scion_of_eternity_arcane_barrage_SpellScript::FilterMeleeHoverDiskPassangers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnHit += SpellHitFn(spell_scion_of_eternity_arcane_barrage_SpellScript::TriggerDamageSpellFromPlayer); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_scion_of_eternity_arcane_barrage_SpellScript(); } @@ -2125,12 +2126,12 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader { PrepareAuraScript(spell_malygos_destroy_platform_channel_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DESTROY_PLATFORM_BOOM_VISUAL)) return false; @@ -2146,13 +2147,13 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader platformTrigger->CastSpell(platformTrigger, SPELL_DESTROY_PLATFORM_BOOM_VISUAL); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_destroy_platform_channel_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_malygos_destroy_platform_channel_AuraScript(); } @@ -2167,12 +2168,12 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL { PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DESTROY_PLATFORM_EVENT)) return false; @@ -2186,13 +2187,13 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL target->CastSpell(target, SPELL_DESTROY_PLATFORM_EVENT); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript(); } @@ -2207,7 +2208,7 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader { PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_event_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2225,14 +2226,14 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, SPELL_SUMMON_RED_DRAGON_BUDDY_F_CAST); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_alexstrasza_bunny_destroy_platform_event_SpellScript(); } @@ -2247,7 +2248,7 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScriptLoader { PrepareSpellScript(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -2262,13 +2263,13 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript(); } @@ -2283,7 +2284,7 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript { PrepareSpellScript(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2294,13 +2295,13 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript target->CastSpell(GetCaster(), GetEffectValue(), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript(); } @@ -2315,12 +2316,12 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade { PrepareSpellScript(spell_malygos_surge_of_power_warning_selector_25_SpellScript) - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SURGE_OF_POWER_PHASE_3_25)) return false; @@ -2359,14 +2360,14 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade GetCaster()->ToCreature()->AI()->DoCastAOE(SPELL_SURGE_OF_POWER_PHASE_3_25); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_surge_of_power_warning_selector_25_SpellScript::SendThreeTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); AfterHit += SpellHitFn(spell_malygos_surge_of_power_warning_selector_25_SpellScript::ExecuteMainSpell); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_malygos_surge_of_power_warning_selector_25_SpellScript(); } @@ -2381,7 +2382,7 @@ class spell_malygos_surge_of_power_25 : public SpellScriptLoader { PrepareSpellScript(spell_malygos_surge_of_power_25_SpellScript) - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2411,13 +2412,13 @@ class spell_malygos_surge_of_power_25 : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_surge_of_power_25_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_malygos_surge_of_power_25_SpellScript(); } @@ -2432,12 +2433,12 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader { PrepareAuraScript(spell_alexstrasza_gift_beam_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ALEXSTRASZAS_GIFT_BEAM_VISUAL)) return false; @@ -2457,14 +2458,14 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader target->RemoveAura(SPELL_ALEXSTRASZAS_GIFT_BEAM_VISUAL); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_alexstrasza_gift_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_alexstrasza_gift_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_alexstrasza_gift_beam_AuraScript(); } @@ -2479,7 +2480,7 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader { PrepareAuraScript(spell_alexstrasza_gift_beam_visual_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2511,7 +2512,7 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_alexstrasza_gift_beam_visual_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_alexstrasza_gift_beam_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -2520,7 +2521,7 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader GameObject* _alexstraszaGift; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_alexstrasza_gift_beam_visual_AuraScript(); } @@ -2531,7 +2532,7 @@ class achievement_denyin_the_scion : public AchievementCriteriaScript public: achievement_denyin_the_scion() : AchievementCriteriaScript("achievement_denyin_the_scion") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { // Only melee disks can be used if (Unit* disk = source->GetVehicleBase()) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 696ef48ba93..15d86cc9f25 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -26,7 +26,7 @@ class instance_eye_of_eternity : public InstanceMapScript public: instance_eye_of_eternity() : InstanceMapScript("instance_eye_of_eternity", 616) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_eye_of_eternity_InstanceMapScript(map); } @@ -239,7 +239,7 @@ public: } } - void SetData(uint32 data, uint32 /*value*/) + void SetData(uint32 data, uint32 /*value*/) OVERRIDE { switch (data) { @@ -255,7 +255,7 @@ public: } } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 2f79f138f42..fdc4927763e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -61,7 +61,10 @@ Position const RiftLocation[6] = { 651.72f, -297.44f, -9.37f, 0.0f } }; -#define DATA_CHAOS_THEORY 1 +enum Misc +{ + DATA_CHAOS_THEORY = 1 +}; class boss_anomalus : public CreatureScript { @@ -83,7 +86,7 @@ class boss_anomalus : public CreatureScript uint64 uiChaoticRiftGUID; bool chaosTheory; - void Reset() + void Reset() OVERRIDE { Phase = 0; uiSparkTimer = 5000; @@ -94,7 +97,7 @@ class boss_anomalus : public CreatureScript instance->SetData(DATA_ANOMALUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -102,7 +105,7 @@ class boss_anomalus : public CreatureScript instance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -110,7 +113,7 @@ class boss_anomalus : public CreatureScript instance->SetData(DATA_ANOMALUS_EVENT, DONE); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_CHAOS_THEORY) return chaosTheory ? 1 : 0; @@ -118,13 +121,13 @@ class boss_anomalus : public CreatureScript return 0; } - void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) + void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) OVERRIDE { if (summoned->GetEntry() == NPC_CHAOTIC_RIFT) chaosTheory = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -180,7 +183,7 @@ class boss_anomalus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_anomalusAI(creature); } @@ -204,7 +207,7 @@ class npc_chaotic_rift : public CreatureScript uint32 uiChaoticEnergyBurstTimer; uint32 uiSummonCrazedManaWraithTimer; - void Reset() + void Reset() OVERRIDE { uiChaoticEnergyBurstTimer = 1000; uiSummonCrazedManaWraithTimer = 5000; @@ -212,7 +215,7 @@ class npc_chaotic_rift : public CreatureScript DoCast(me, SPELL_ARCANEFORM, false); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -248,7 +251,7 @@ class npc_chaotic_rift : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_chaotic_riftAI(creature); } @@ -261,7 +264,7 @@ class achievement_chaos_theory : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp index 7f32b2bc4a5..175816e3ae7 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp @@ -26,11 +26,15 @@ Script Data End */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SPELL_BATTLE_SHOUT 31403 -#define SPELL_CHARGE 60067 -#define SPELL_FRIGHTENING_SHOUT 19134 -#define SPELL_WHIRLWIND_1 38619 -#define SPELL_WHIRLWIND_2 38618 +enum Spells +{ + SPELL_BATTLE_SHOUT = 31403, + SPELL_CHARGE = 60067, + SPELL_FRIGHTENING_SHOUT = 19134, + SPELL_WHIRLWIND_1 = 38619, + SPELL_WHIRLWIND_2 = 38618 + +}; //not used //Yell @@ -43,20 +47,21 @@ class boss_commander_kolurg : public CreatureScript public: boss_commander_kolurg() : CreatureScript("boss_commander_kolurg") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_commander_kolurgAI (creature); + return new boss_commander_kolurgAI(creature); } struct boss_commander_kolurgAI : public ScriptedAI { boss_commander_kolurgAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 /*diff*/) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -64,7 +69,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) {} + void JustDied(Unit* /*killer*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp index e257b898426..2f73c85a9cd 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp @@ -41,19 +41,20 @@ class boss_commander_stoutbeard : public CreatureScript public: boss_commander_stoutbeard() : CreatureScript("boss_commander_stoutbeard") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_commander_stoutbeardAI (creature); + return new boss_commander_stoutbeardAI(creature); } struct boss_commander_stoutbeardAI : public ScriptedAI { boss_commander_stoutbeardAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) + void Reset() OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 /*diff*/) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 422560f52b8..ef8f5c2d3c4 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -58,9 +58,9 @@ class boss_keristrasza : public CreatureScript public: boss_keristrasza() : CreatureScript("boss_keristrasza") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_keristraszaAI (creature); + return new boss_keristraszaAI(creature); } struct boss_keristraszaAI : public ScriptedAI @@ -80,7 +80,7 @@ public: bool intenseCold; bool bEnrage; - void Reset() + void Reset() OVERRIDE { uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); @@ -98,7 +98,7 @@ public: instance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DoCastAOE(SPELL_INTENSE_COLD); @@ -107,7 +107,7 @@ public: instance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -115,7 +115,7 @@ public: instance->SetData(DATA_KERISTRASZA_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } @@ -161,13 +161,13 @@ public: } } - void SetGUID(uint64 guid, int32 id/* = 0 */) + void SetGUID(uint64 guid, int32 id/* = 0 */) OVERRIDE { if (id == DATA_INTENSE_COLD) intenseColdList.push_back(guid); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -212,7 +212,7 @@ class containment_sphere : public GameObjectScript public: containment_sphere() : GameObjectScript("containment_sphere") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); @@ -250,13 +250,13 @@ class spell_intense_cold : public SpellScriptLoader caster->GetAI()->SetGUID(GetTarget()->GetGUID(), DATA_INTENSE_COLD); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_intense_cold_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_intense_cold_AuraScript(); } @@ -269,7 +269,7 @@ class achievement_intense_cold : public AchievementCriteriaScript { } - bool OnCheck(Player* player, Unit* target) + bool OnCheck(Player* player, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 248a039b228..8a01c40186e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -50,8 +50,11 @@ enum Yells SAY_SPLIT = 4 }; -#define ACTION_MAGUS_DEAD 1 -#define DATA_SPLIT_PERSONALITY 2 +enum Misc +{ + ACTION_MAGUS_DEAD = 1, + DATA_SPLIT_PERSONALITY = 2 +}; const Position CenterOfRoom = {504.80f, 89.07f, -16.12f, 6.27f}; @@ -60,9 +63,9 @@ class boss_magus_telestra : public CreatureScript public: boss_magus_telestra() : CreatureScript("boss_magus_telestra") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_magus_telestraAI (creature); + return new boss_magus_telestraAI(creature); } struct boss_magus_telestraAI : public ScriptedAI @@ -93,7 +96,7 @@ public: uint8 splitPersonality; time_t time[3]; - void Reset() + void Reset() OVERRIDE { Phase = 0; //These times are probably wrong @@ -119,7 +122,7 @@ public: instance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -127,7 +130,7 @@ public: instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -135,12 +138,12 @@ public: instance->SetData(DATA_MAGUS_TELESTRA_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_MAGUS_DEAD) { @@ -154,7 +157,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_SPLIT_PERSONALITY) return splitPersonality; @@ -191,7 +194,7 @@ public: return 0; } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->IsAlive()) return; @@ -213,7 +216,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -344,7 +347,7 @@ class achievement_split_personality : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 0f480b1d101..f26e70d6838 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -69,7 +69,7 @@ public: { boss_ormorokAI(Creature* creature) : BossAI(creature, DATA_ORMOROK_EVENT) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -85,7 +85,7 @@ public: instance->SetData(DATA_ORMOROK_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!frenzy && HealthBelowPct(25)) { @@ -94,7 +94,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -104,12 +104,12 @@ public: instance->SetData(DATA_ORMOROK_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -155,9 +155,9 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_ormorokAI (creature); + return new boss_ormorokAI(creature); } }; @@ -190,7 +190,7 @@ public: { npc_crystal_spike_triggerAI(Creature* creature) : ScriptedAI(creature) {} - void IsSummonedBy(Unit* owner) + void IsSummonedBy(Unit* owner) OVERRIDE { switch (me->GetEntry()) { @@ -214,12 +214,12 @@ public: _despawntimer = 2000; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { return type == DATA_COUNT ? _count : 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_despawntimer <= diff) { @@ -239,7 +239,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crystal_spike_triggerAI(creature); } @@ -266,13 +266,13 @@ class spell_crystal_spike : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_crystal_spike_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_crystal_spike_AuraScript(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 03d97ebf33d..507e75b95f4 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -33,7 +33,7 @@ class instance_nexus : public InstanceMapScript public: instance_nexus() : InstanceMapScript("instance_nexus", 576) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_nexus_InstanceMapScript(map); } @@ -154,7 +154,7 @@ public: } } - uint32 GetData(uint32 identifier) const + uint32 GetData(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -166,7 +166,7 @@ public: return 0; } - void SetData(uint32 identifier, uint32 data) + void SetData(uint32 identifier, uint32 data) OVERRIDE { switch (identifier) { @@ -221,7 +221,7 @@ public: } } - uint64 GetData64(uint32 uiIdentifier) const + uint64 GetData64(uint32 uiIdentifier) const OVERRIDE { switch (uiIdentifier) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index 7f3c96bcb33..58abfb3b63e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -18,7 +18,7 @@ #ifndef DEF_NEXUS_H #define DEF_NEXUS_H -enum eTypes +enum DataTypes { DATA_MAGUS_TELESTRA_EVENT, DATA_ANOMALUS_EVENT, diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 1a820cd3727..59652a7d4a1 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -55,16 +55,16 @@ class boss_drakos : public CreatureScript public: boss_drakos() : CreatureScript("boss_drakos") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_drakosAI (creature); + return new boss_drakosAI(creature); } struct boss_drakosAI : public BossAI { boss_drakosAI(Creature* creature) : BossAI(creature, DATA_DRAKOS_EVENT) {} - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -75,13 +75,13 @@ public: postPull = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -125,7 +125,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -135,7 +135,7 @@ public: instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } @@ -149,16 +149,16 @@ class npc_unstable_sphere : public CreatureScript public: npc_unstable_sphere() : CreatureScript("npc_unstable_sphere") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_unstable_sphereAI (creature); + return new npc_unstable_sphereAI(creature); } struct npc_unstable_sphereAI : public ScriptedAI { npc_unstable_sphereAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); me->GetMotionMaster()->MoveRandom(40.0f); @@ -170,7 +170,7 @@ public: deathTimer = 19000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (pulseTimer <= diff) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index f8469d6b78e..abf0d6537c3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -83,16 +83,16 @@ class boss_eregos : public CreatureScript public: boss_eregos() : CreatureScript("boss_eregos") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_eregosAI (creature); + return new boss_eregosAI(creature); } struct boss_eregosAI : public BossAI { boss_eregosAI(Creature* creature) : BossAI(creature, DATA_EREGOS_EVENT) { } - void Reset() + void Reset() OVERRIDE { _Reset(); _phase = PHASE_NORMAL; @@ -104,12 +104,12 @@ public: DoAction(ACTION_SET_NORMAL_EVENTS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -125,7 +125,7 @@ public: _amberVoid = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -141,7 +141,7 @@ public: return 0; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_SET_NORMAL_EVENTS) return; @@ -152,7 +152,7 @@ public: events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { BossAI::JustSummoned(summon); @@ -164,7 +164,7 @@ public: summon->GetMotionMaster()->MoveRandom(100.0f); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetEntry() != NPC_PLANAR_ANOMALY) return; @@ -173,7 +173,7 @@ public: summon->CastSpell(summon, SPELL_PLANAR_BLAST, true); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!me->GetMap()->IsHeroic()) return; @@ -194,7 +194,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -233,7 +233,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -264,13 +264,13 @@ class spell_eregos_planar_shift : public SpellScriptLoader creatureCaster->AI()->DoAction(ACTION_SET_NORMAL_EVENTS); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_eregos_planar_shift_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_eregos_planar_shift_AuraScript(); } @@ -281,7 +281,7 @@ class achievement_gen_eregos_void : public AchievementCriteriaScript public: achievement_gen_eregos_void(char const* name, uint32 data) : AchievementCriteriaScript(name), _data(data) { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(_data); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 1f1954cb00c..436a978d15e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -55,7 +55,7 @@ enum Yells SAY_PLAYER_KILL = 7 }; -enum eCreature +enum Creatures { NPC_PHANTASMAL_CLOUDSCRAPER = 27645, NPC_PHANTASMAL_MAMMOTH = 27642, @@ -92,16 +92,16 @@ class boss_urom : public CreatureScript public: boss_urom() : CreatureScript("boss_urom") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_uromAI (creature); + return new boss_uromAI(creature); } struct boss_uromAI : public BossAI { boss_uromAI(Creature* creature) : BossAI(creature, DATA_UROM_EVENT) {} - void Reset() + void Reset() OVERRIDE { me->CastSpell(me, SPELL_EVOCATE); @@ -127,7 +127,7 @@ public: timeBombTimer = urand(20000, 25000); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -139,7 +139,7 @@ public: instance->SetData(DATA_UROM_PLATAFORM, instance->GetData(DATA_UROM_PLATAFORM)+1); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -235,12 +235,12 @@ public: DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_PLAYER_KILL); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -308,7 +308,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -322,7 +322,7 @@ public: me->DeleteThreatList(); } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE { switch (pSpell->Id) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index b5525334f5d..fbf39a705ee 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -57,9 +57,9 @@ class boss_varos : public CreatureScript public: boss_varos() : CreatureScript("boss_varos") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_varosAI (creature); + return new boss_varosAI(creature); } struct boss_varosAI : public BossAI @@ -70,7 +70,7 @@ public: DoCast(me, SPELL_CENTRIFUGE_SHIELD); } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -83,7 +83,7 @@ public: coreEnergizeOrientation = 0.0f; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -95,7 +95,7 @@ public: return coreEnergizeOrientation; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -143,7 +143,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -167,7 +167,7 @@ class npc_azure_ring_captain : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { targetGUID = 0; @@ -177,7 +177,7 @@ class npc_azure_ring_captain : public CreatureScript me->SetReactState(REACT_AGGRESSIVE); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_ICE_BEAM) { @@ -186,7 +186,7 @@ class npc_azure_ring_captain : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -194,7 +194,7 @@ class npc_azure_ring_captain : public CreatureScript DoMeleeAttackIfReady(); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE || id != ACTION_CALL_DRAGON_EVENT) @@ -206,7 +206,7 @@ class npc_azure_ring_captain : public CreatureScript DoCast(target, SPELL_ICE_BEAM); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -233,7 +233,7 @@ class npc_azure_ring_captain : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_azure_ring_captainAI(creature); } @@ -248,7 +248,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader { PrepareAuraScript(spell_varos_centrifuge_shield_AuraScript); - bool Load() + bool Load() OVERRIDE { Unit* caster = GetCaster(); return (caster && caster->ToCreature()); @@ -277,14 +277,14 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_varos_centrifuge_shield_AuraScript(); } @@ -325,13 +325,13 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_varos_energize_core_area_enemySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_varos_energize_core_area_enemySpellScript(); } @@ -372,13 +372,13 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_varos_energize_core_area_entrySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_varos_energize_core_area_entrySpellScript(); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 94f08d82f94..4101fb7af33 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -34,7 +34,7 @@ class instance_oculus : public InstanceMapScript public: instance_oculus() : InstanceMapScript("instance_oculus", 578) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_oculus_InstanceMapScript(map); } @@ -222,7 +222,7 @@ public: return true; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -232,7 +232,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -244,7 +244,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index e9e9cf65e1f..52ffc12f154 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -110,7 +110,7 @@ class npc_verdisa_beglaristrasz_eternos : public CreatureScript public: npc_verdisa_beglaristrasz_eternos() : CreatureScript("npc_verdisa_beglaristrasz_eternos") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (creature->GetEntry()) @@ -216,7 +216,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -237,7 +237,7 @@ public: { npc_verdisa_beglaristrasz_eternosAI(Creature* creature) : ScriptedAI(creature) { } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { if (id) return; @@ -251,7 +251,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_verdisa_beglaristrasz_eternosAI(creature); } @@ -266,7 +266,7 @@ public: { npc_image_belgaristraszAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { if (summoner->GetEntry() == NPC_VAROS) { @@ -281,7 +281,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_image_belgaristraszAI(creature); } @@ -314,7 +314,7 @@ public: bool HealthWarningOff; bool DisableTakeOff; - void Reset() + void Reset() OVERRIDE { summonerGUID = 0; WelcomeTimer = 4500; @@ -330,7 +330,7 @@ public: DisableTakeOff = false; } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { if (instance->GetBossState(DATA_EREGOS_EVENT) == IN_PROGRESS) if (Creature* eregos = me->FindNearestCreature(NPC_EREGOS, 450.0f, true)) @@ -351,7 +351,7 @@ public: me->GetMotionMaster()->MovePoint(0, pos); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 0) { @@ -359,7 +359,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!(instance->GetBossState(DATA_VAROS_EVENT) == DONE)) { @@ -451,7 +451,7 @@ public: }; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ruby_emerald_amber_drakeAI(creature); } @@ -476,13 +476,13 @@ public: caster->CastSpell(target, SPELL_SHOCK_CHARGE, false); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_gen_stop_time_AuraScript::Apply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_stop_time_AuraScript(); } @@ -514,14 +514,14 @@ public: const_cast<WorldLocation*>(GetExplTargetDest())->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_call_ruby_emerald_amber_drake_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); OnEffectLaunch += SpellEffectFn(spell_call_ruby_emerald_amber_drake_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_call_ruby_emerald_amber_drake_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 08072e7f7a3..2077049641f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -27,9 +27,8 @@ EndScriptData */ #include "ScriptedCreature.h" #include "halls_of_lightning.h" -enum eEnums +enum Yells { - //Yell SAY_AGGRO = 0, SAY_DEFENSIVE_STANCE = 1, SAY_BATTLE_STANCE = 2, @@ -38,8 +37,11 @@ enum eEnums SAY_DEATH = 5, EMOTE_DEFENSIVE_STANCE = 6, EMOTE_BATTLE_STANCE = 7, - EMOTE_BERSEKER_STANCE = 8, + EMOTE_BERSEKER_STANCE = 8 +}; +enum Spells +{ SPELL_DEFENSIVE_STANCE = 53790, //SPELL_DEFENSIVE_AURA = 41105, SPELL_SPELL_REFLECTION = 36096, @@ -62,15 +64,25 @@ enum eEnums //SPELL_CHARGE_UP = 52098, // only used when starting walk from one platform to the other SPELL_TEMPORARY_ELECTRICAL_CHARGE = 52092, // triggered part of above - NPC_STORMFORGED_LIEUTENANT = 29240, SPELL_ARC_WELD = 59085, SPELL_RENEW_STEEL_N = 52774, - SPELL_RENEW_STEEL_H = 59160, + SPELL_RENEW_STEEL_H = 59160 +}; +enum Creatures +{ + NPC_STORMFORGED_LIEUTENANT = 29240 +}; + +enum Equips +{ EQUIP_SWORD = 37871, EQUIP_SHIELD = 35642, - EQUIP_MACE = 43623, + EQUIP_MACE = 43623 +}; +enum Stanges +{ STANCE_DEFENSIVE = 0, STANCE_BERSERKER = 1, STANCE_BATTLE = 2 @@ -85,7 +97,7 @@ class boss_bjarngrim : public CreatureScript public: boss_bjarngrim() : CreatureScript("boss_bjarngrim") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_bjarngrimAI(creature); } @@ -125,7 +137,7 @@ public: uint64 m_auiStormforgedLieutenantGUID[2]; - void Reset() + void Reset() OVERRIDE { if (canBuff) if (!me->HasAura(SPELL_TEMPORARY_ELECTRICAL_CHARGE)) @@ -172,7 +184,7 @@ public: instance->SetData(TYPE_BJARNGRIM, NOT_STARTED); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (me->HasAura(SPELL_TEMPORARY_ELECTRICAL_CHARGE)) canBuff = true; @@ -182,7 +194,7 @@ public: ScriptedAI::EnterEvadeMode(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -193,12 +205,12 @@ public: instance->SetData(TYPE_BJARNGRIM, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -223,7 +235,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -377,7 +389,7 @@ class npc_stormforged_lieutenant : public CreatureScript public: npc_stormforged_lieutenant() : CreatureScript("npc_stormforged_lieutenant") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stormforged_lieutenantAI(creature); } @@ -394,13 +406,13 @@ public: uint32 m_uiArcWeld_Timer; uint32 m_uiRenewSteel_Timer; - void Reset() + void Reset() OVERRIDE { m_uiArcWeld_Timer = urand(20000, 21000); m_uiRenewSteel_Timer = urand(10000, 11000); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -412,7 +424,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index cc6e1079b5d..dfb21edf9af 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -70,7 +70,7 @@ class boss_ionar : public CreatureScript public: boss_ionar() : CreatureScript("boss_ionar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ionarAI(creature); } @@ -96,7 +96,7 @@ public: uint32 uiDisperseHealth; - void Reset() + void Reset() OVERRIDE { lSparkList.DespawnAll(); @@ -119,7 +119,7 @@ public: instance->SetData(TYPE_IONAR, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -127,7 +127,7 @@ public: instance->SetData(TYPE_IONAR, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -137,12 +137,12 @@ public: instance->SetData(TYPE_IONAR, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_DISPERSE) { @@ -184,13 +184,13 @@ public: } } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) OVERRIDE { if (!me->IsVisible()) uiDamage = 0; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_SPARK_OF_IONAR) { @@ -207,13 +207,13 @@ public: } } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_SPARK_OF_IONAR) lSparkList.Despawn(summoned); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -299,7 +299,7 @@ class npc_spark_of_ionar : public CreatureScript public: npc_spark_of_ionar() : CreatureScript("npc_spark_of_ionar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spark_of_ionarAI(creature); } @@ -315,13 +315,13 @@ public: uint32 uiCheckTimer; - void Reset() + void Reset() OVERRIDE { uiCheckTimer = 2*IN_MILLISECONDS; me->SetReactState(REACT_PASSIVE); } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE { if (uiType != POINT_MOTION_TYPE || !instance) return; @@ -330,12 +330,12 @@ public: me->DespawnOrUnsummon(); } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) OVERRIDE { uiDamage = 0; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { // Despawn if the encounter is not running if (instance && instance->GetData(TYPE_IONAR) != IN_PROGRESS) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index fe6c1c27155..d8ab71870a8 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -28,10 +28,8 @@ EndScriptData */ #include "SpellScript.h" #include "halls_of_lightning.h" -enum eEnums +enum Yells { - ACHIEV_TIMELY_DEATH_START_EVENT = 20384, - SAY_INTRO_1 = 0, SAY_INTRO_2 = 1, SAY_AGGRO = 2, @@ -41,8 +39,11 @@ enum eEnums SAY_50HEALTH = 6, SAY_25HEALTH = 7, SAY_DEATH = 8, - EMOTE_NOVA = 9, + EMOTE_NOVA = 9 +}; +enum Spells +{ SPELL_ARC_LIGHTNING = 52921, SPELL_LIGHTNING_NOVA_N = 52960, SPELL_LIGHTNING_NOVA_H = 59835, @@ -52,6 +53,11 @@ enum eEnums SPELL_PULSING_SHOCKWAVE_AURA = 59414 }; +enum Misc +{ + ACHIEV_TIMELY_DEATH_START_EVENT = 20384 +}; + /*###### ## Boss Loken ######*/ @@ -61,7 +67,7 @@ class boss_loken : public CreatureScript public: boss_loken() : CreatureScript("boss_loken") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lokenAI(creature); } @@ -81,7 +87,7 @@ public: uint32 m_uiHealthAmountModifier; - void Reset() + void Reset() OVERRIDE { m_uiArcLightning_Timer = 15000; m_uiLightningNova_Timer = 20000; @@ -96,7 +102,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -107,7 +113,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -118,12 +124,12 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -203,13 +209,13 @@ class spell_loken_pulsing_shockwave : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * distance)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_loken_pulsing_shockwave_SpellScript::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_loken_pulsing_shockwave_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 71333571cf3..725293a7e60 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -73,7 +73,7 @@ class boss_volkhan : public CreatureScript public: boss_volkhan() : CreatureScript("boss_volkhan") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_volkhanAI(creature); } @@ -102,7 +102,7 @@ public: uint32 m_uiHealthAmountModifier; - void Reset() + void Reset() OVERRIDE { m_bIsStriking = false; m_bHasTemper = false; @@ -124,7 +124,7 @@ public: instance->SetData(TYPE_VOLKHAN, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -132,7 +132,7 @@ public: instance->SetData(TYPE_VOLKHAN, IN_PROGRESS); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->Attack(who, true)) { @@ -145,7 +145,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); DespawnGolem(); @@ -154,7 +154,7 @@ public: instance->SetData(TYPE_VOLKHAN, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } @@ -195,7 +195,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_MOLTEN_GOLEM) { @@ -209,7 +209,7 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (m_uiSummonPhase == 2) { @@ -218,7 +218,7 @@ public: } } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { if (data == DATA_SHATTER_RESISTANT) return GolemsShattered; @@ -226,7 +226,7 @@ public: return 0; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -307,7 +307,7 @@ public: case 2: // 2 - Check if reached Anvil - // This is handled in: void JustReachedHome() + // This is handled in: void JustReachedHome() OVERRIDE break; case 3: @@ -363,7 +363,7 @@ class npc_molten_golem : public CreatureScript public: npc_molten_golem() : CreatureScript("npc_molten_golem") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_molten_golemAI(creature); } @@ -378,7 +378,7 @@ public: uint32 m_uiDeathDelay_Timer; uint32 m_uiImmolation_Timer; - void Reset() + void Reset() OVERRIDE { m_bIsFrozen = false; @@ -387,7 +387,7 @@ public: m_uiImmolation_Timer = 5000; } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->Attack(who, true)) { @@ -400,7 +400,7 @@ public: } } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) OVERRIDE { if (uiDamage > me->GetHealth()) { @@ -419,7 +419,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE { // This is the dummy effect of the spells if (pSpell->Id == SPELL_SHATTER_N || pSpell->Id == SPELL_SHATTER_H) @@ -427,7 +427,7 @@ public: me->DespawnOrUnsummon(); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { // Return since we have no target or if we are frozen if (!UpdateVictim() || m_bIsFrozen) @@ -459,7 +459,7 @@ class achievement_shatter_resistant : public AchievementCriteriaScript public: achievement_shatter_resistant() : AchievementCriteriaScript("achievement_shatter_resistant") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_SHATTER_RESISTANT) < 5; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h index 9968a27da93..c45feab1e8a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -19,7 +19,7 @@ #ifndef DEF_HALLS_OF_LIGHTNING_H #define DEF_HALLS_OF_LIGHTNING_H -enum eTypes +enum Types { MAX_ENCOUNTER = 4, @@ -32,12 +32,18 @@ enum eTypes TYPE_IONAR = 11, TYPE_LOKEN = 12, TYPE_VOLKHAN = 13, +}; +enum CreaturesIds +{ NPC_BJARNGRIM = 28586, NPC_VOLKHAN = 28587, NPC_IONAR = 28546, - NPC_LOKEN = 28923, + NPC_LOKEN = 28923 +}; +enum GameObjectIds +{ GO_BJARNGRIM_DOOR = 191416, //_doors10 GO_VOLKHAN_DOOR = 191325, //_doors07 GO_IONAR_DOOR = 191326, //_doors05 diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index ddc0b7376ac..ab92d3e4616 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -39,7 +39,7 @@ class instance_halls_of_lightning : public InstanceMapScript public: instance_halls_of_lightning() : InstanceMapScript("instance_halls_of_lightning", 602) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_halls_of_lightning_InstanceMapScript(map); } @@ -134,7 +134,7 @@ public: } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) OVERRIDE { switch (uiType) { @@ -174,7 +174,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 uiType) const + uint32 GetData(uint32 uiType) const OVERRIDE { switch (uiType) { @@ -190,7 +190,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) const + uint64 GetData64(uint32 uiData) const OVERRIDE { switch (uiData) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 23e99980508..e1c9dec8540 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -56,9 +56,9 @@ class boss_krystallus : public CreatureScript public: boss_krystallus() : CreatureScript("boss_krystallus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_krystallusAI (creature); + return new boss_krystallusAI(creature); } struct boss_krystallusAI : public ScriptedAI @@ -78,7 +78,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { bIsSlam = false; @@ -91,7 +91,7 @@ public: if (instance) instance->SetData(DATA_KRYSTALLUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -99,7 +99,7 @@ public: instance->SetData(DATA_KRYSTALLUS_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -144,7 +144,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -152,7 +152,7 @@ public: instance->SetData(DATA_KRYSTALLUS_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -160,7 +160,7 @@ public: Talk(SAY_KILL); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) OVERRIDE { //this part should be in the core if (pSpell->Id == SPELL_SHATTER || pSpell->Id == H_SPELL_SHATTER) @@ -202,13 +202,13 @@ class spell_krystallus_shatter : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_krystallus_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_krystallus_shatter_SpellScript(); } @@ -237,13 +237,13 @@ class spell_krystallus_shatter_effect : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_krystallus_shatter_effect_SpellScript::CalculateDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_krystallus_shatter_effect_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 8fe7e17adf7..5b34db663d5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -56,9 +56,9 @@ class boss_maiden_of_grief : public CreatureScript public: boss_maiden_of_grief() : CreatureScript("boss_maiden_of_grief") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_maiden_of_griefAI (creature); + return new boss_maiden_of_griefAI(creature); } struct boss_maiden_of_griefAI : public ScriptedAI @@ -75,7 +75,7 @@ public: uint32 ShockOfSorrowTimer; uint32 PillarOfWoeTimer; - void Reset() + void Reset() OVERRIDE { PartingSorrowTimer = urand(25000, 30000); StormOfGriefTimer = 10000; @@ -89,7 +89,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -107,7 +107,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -153,7 +153,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -161,7 +161,7 @@ public: instance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 377a9363fad..185d8e5fd0c 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -59,7 +59,12 @@ enum SjonnirCreatures CREATURE_IRON_SLUDGE = 28165 }; -#define DATA_TIME_BEFORE_OOZE 150000 //2min 30 secs +enum Misc +{ + DATA_TIME_BEFORE_OOZE = 150000, // 2min 30 secs + ACTION_OOZE_DEAD = 1, + DATA_ABUSE_THE_OOZE = 2 +}; struct Locations { @@ -72,9 +77,6 @@ static Locations PipeLocations[] = {1297.7f, 595.6f, 199.9f} //right }; -#define ACTION_OOZE_DEAD 1 -#define DATA_ABUSE_THE_OOZE 2 - static Locations CenterPoint = {1295.21f, 667.157f, 189.691f}; class boss_sjonnir : public CreatureScript @@ -82,9 +84,9 @@ class boss_sjonnir : public CreatureScript public: boss_sjonnir() : CreatureScript("boss_sjonnir") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_sjonnirAI (creature); + return new boss_sjonnirAI(creature); } struct boss_sjonnirAI : public ScriptedAI @@ -109,7 +111,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { bIsFrenzy = false; @@ -128,7 +130,7 @@ public: instance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -147,7 +149,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -205,7 +207,7 @@ public: DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->GetMotionMaster()->MovePoint(0, CenterPoint.x, CenterPoint.y, CenterPoint.z); /*if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -213,7 +215,7 @@ public: lSummons.Summon(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); lSummons.DespawnAll(); @@ -222,7 +224,7 @@ public: instance->SetData(DATA_SJONNIR_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -230,13 +232,13 @@ public: Talk(SAY_SLAY); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_OOZE_DEAD) ++abuseTheOoze; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_ABUSE_THE_OOZE) return abuseTheOoze; @@ -252,7 +254,7 @@ class npc_malformed_ooze : public CreatureScript public: npc_malformed_ooze() : CreatureScript("npc_malformed_ooze") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_malformed_oozeAI(creature); } @@ -263,12 +265,12 @@ public: uint32 uiMergeTimer; - void Reset() + void Reset() OVERRIDE { uiMergeTimer = 10000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiMergeTimer <= diff) { @@ -295,7 +297,7 @@ class npc_iron_sludge : public CreatureScript public: npc_iron_sludge() : CreatureScript("npc_iron_sludge") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_iron_sludgeAI(creature); } @@ -309,7 +311,7 @@ public: InstanceScript* instance; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) if (Creature* Sjonnir = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SJONNIR))) @@ -326,7 +328,7 @@ class achievement_abuse_the_ooze : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index ebc72f91938..7b5c7f2e061 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -85,41 +85,46 @@ enum Texts TEXT_ID_PROGRESS = 13101 }; -enum BrannCreatures +enum Creatures { - CREATURE_TRIBUNAL_OF_THE_AGES = 28234, - CREATURE_BRANN_BRONZEBEARD = 28070, - CREATURE_DARK_MATTER_TARGET = 28237, - CREATURE_SEARING_GAZE_TARGET = 28265, - CREATURE_DARK_RUNE_PROTECTOR = 27983, - CREATURE_DARK_RUNE_STORMCALLER = 27984, - CREATURE_IRON_GOLEM_CUSTODIAN = 27985, + NPC_TRIBUNAL_OF_THE_AGES = 28234, + NPC_BRANN_BRONZEBEARD = 28070, + NPC_DARK_MATTER_TARGET = 28237, + NPC_SEARING_GAZE_TARGET = 28265, + NPC_DARK_RUNE_PROTECTOR = 27983, + NPC_DARK_RUNE_STORMCALLER = 27984, + NPC_IRON_GOLEM_CUSTODIAN = 27985, }; enum Spells { SPELL_STEALTH = 58506, - //Kadrak + + // Kadrak SPELL_GLARE_OF_THE_TRIBUNAL = 50988, H_SPELL_GLARE_OF_THE_TRIBUNAL = 59868, - //Marnak + + // Marnak SPELL_DARK_MATTER = 51012, H_SPELL_DARK_MATTER = 59868, - //Abedneum + + // Abedneum SPELL_SEARING_GAZE = 51136, H_SPELL_SEARING_GAZE = 59867, SPELL_REWARD_ACHIEVEMENT = 59046, }; -enum Quests +enum Misc { - QUEST_HALLS_OF_STONE = 13207 + QUEST_HALLS_OF_STONE = 13207, + + DATA_BRANN_SPARKLIN_NEWS = 1 + }; #define GOSSIP_ITEM_START "Brann, it would be our honor!" #define GOSSIP_ITEM_PROGRESS "Let's move Brann, enough of the history lessons!" -#define DATA_BRANN_SPARKLIN_NEWS 1 static Position SpawnLocations[]= { @@ -132,7 +137,7 @@ class npc_tribuna_controller : public CreatureScript public: npc_tribuna_controller() : CreatureScript("npc_tribuna_controller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tribuna_controllerAI(creature); } @@ -157,7 +162,7 @@ public: std::list<uint64> KaddrakGUIDList; - void Reset() + void Reset() OVERRIDE { uiKaddrakEncounterTimer = 1500; uiMarnakEncounterTimer = 10000; @@ -204,7 +209,7 @@ public: }*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bKaddrakActivated) { @@ -229,7 +234,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* summon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(NPC_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { summon->SetDisplayId(11686); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -245,7 +250,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* summon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(NPC_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { summon->SetDisplayId(11686); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -265,7 +270,7 @@ class npc_brann_hos : public CreatureScript public: npc_brann_hos() : CreatureScript("npc_brann_hos") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1 || action == GOSSIP_ACTION_INFO_DEF+2) @@ -277,7 +282,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -288,7 +293,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_brann_hosAI(creature); } @@ -312,7 +317,7 @@ public: bool bIsLowHP; bool brannSparklinNews; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -343,12 +348,12 @@ public: lDwarfGUIDList.clear(); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { case 7: - if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f)) + if (Creature* creature = GetClosestCreatureWithEntry(me, NPC_TRIBUNAL_OF_THE_AGES, 100.0f)) { if (!creature->IsAlive()) creature->Respawn(); @@ -383,21 +388,21 @@ public: { uint32 uiSpawnNumber = DUNGEON_MODE(2, 3); for (uint8 i = 0; i < uiSpawnNumber; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; } case 2: for (uint8 i = 0; i < 2; ++i) - me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; case 3: - me->SummonCreature(CREATURE_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); + me->SummonCreature(NPC_IRON_GOLEM_CUSTODIAN, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); break; } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { lDwarfGUIDList.push_back(summoned->GetGUID()); summoned->AddThreat(me, 0.0f); @@ -418,13 +423,13 @@ public: Start(); } - void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) + void DamageTaken(Unit* /*done_by*/, uint32 & /*damage*/) OVERRIDE { if (brannSparklinNews) brannSparklinNews = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_BRANN_SPARKLIN_NEWS) return brannSparklinNews ? 1 : 0; @@ -432,7 +437,7 @@ public: return 0; } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) OVERRIDE { if (uiPhaseTimer <= uiDiff) { @@ -739,7 +744,7 @@ class achievement_brann_spankin_new : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h index d7c0b37b14e..d00649e409b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h @@ -24,6 +24,7 @@ enum Data DATA_SJONNIR_EVENT, DATA_BRANN_EVENT }; + enum Data64 { DATA_KRYSTALLUS, @@ -40,7 +41,8 @@ enum Data64 DATA_SJONNIR_DOOR, DATA_MAIDEN_DOOR }; -enum Creatures + +enum CreaturesIds { CREATURE_MAIDEN = 27975, CREATURE_KRYSTALLUS = 27977, @@ -50,7 +52,8 @@ enum Creatures CREATURE_ABEDNEUM = 30899, CREATURE_BRANN = 28070 }; -enum GameObjects + +enum GameObjectIds { GO_ABEDNEUM = 191669, GO_MARNAK = 192170, @@ -62,4 +65,5 @@ enum GameObjects GO_TRIBUNAL_CHEST = 190586, GO_TRIBUNAL_CHEST_HERO = 193996 }; + #endif diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 41339c9346d..b84d96a6712 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -33,7 +33,7 @@ class instance_halls_of_stone : public InstanceMapScript public: instance_halls_of_stone() : InstanceMapScript("instance_halls_of_stone", 599) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_halls_of_stone_InstanceMapScript(map); } @@ -153,7 +153,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -186,7 +186,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -199,7 +199,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index d1e13be3f60..8f69d905d6f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -305,7 +305,7 @@ class boss_algalon_the_observer : public CreatureScript _fedOnTears = false; } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -314,7 +314,7 @@ class boss_algalon_the_observer : public CreatureScript _hasYelled = false; } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_UNIT) { @@ -328,7 +328,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -375,12 +375,12 @@ class boss_algalon_the_observer : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { return type == DATA_HAS_FED_ON_TEARS ? _fedOnTears : 1; } - void EnterCombat(Unit* /*target*/) + void EnterCombat(Unit* /*target*/) OVERRIDE { uint32 introDelay = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_NPC); @@ -422,7 +422,7 @@ class boss_algalon_the_observer : public CreatureScript (*itr)->m_Events.KillAllEvents(true); } - void MovementInform(uint32 movementType, uint32 pointId) + void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE { if (movementType != POINT_MOTION_TYPE) return; @@ -444,7 +444,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); switch (summon->GetEntry()) @@ -486,7 +486,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { instance->SetBossState(BOSS_ALGALON, FAIL); BossAI::EnterEvadeMode(); @@ -494,7 +494,7 @@ class boss_algalon_the_observer : public CreatureScript me->SetSheath(SHEATH_STATE_UNARMED); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (_fightWon) { @@ -537,7 +537,7 @@ class boss_algalon_the_observer : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((!(events.IsInPhase(PHASE_ROLE_PLAY) || events.IsInPhase(PHASE_BIG_BANG)) && !UpdateVictim()) || !CheckInRoom()) return; @@ -701,7 +701,7 @@ class boss_algalon_the_observer : public CreatureScript bool _hasYelled; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_algalon_the_observerAI>(creature); } @@ -718,19 +718,19 @@ class npc_living_constellation : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 2500); _isActive = false; } - uint32 GetData(uint32 /*type*/) const + uint32 GetData(uint32 /*type*/) const OVERRIDE { return _isActive ? 1 : 0; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -755,7 +755,7 @@ class npc_living_constellation : public CreatureScript } } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id != SPELL_CONSTELLATION_PHASE_EFFECT || caster->GetTypeId() != TYPEID_UNIT) return; @@ -767,7 +767,7 @@ class npc_living_constellation : public CreatureScript caster->ToCreature()->DespawnOrUnsummon(1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!(_events.IsInPhase(PHASE_ROLE_PLAY) || _events.IsInPhase(PHASE_BIG_BANG)) && !UpdateVictim()) return; @@ -794,7 +794,7 @@ class npc_living_constellation : public CreatureScript bool _isActive; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_living_constellationAI>(creature); } @@ -812,7 +812,7 @@ class npc_collapsing_star : public CreatureScript _dying = false; } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() != NPC_BLACK_HOLE) return; @@ -824,7 +824,7 @@ class npc_collapsing_star : public CreatureScript me->DespawnOrUnsummon(1); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (_dying) { @@ -844,7 +844,7 @@ class npc_collapsing_star : public CreatureScript bool _dying; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_collapsing_starAI>(creature); } @@ -861,7 +861,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript { } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -883,7 +883,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript } } - void MovementInform(uint32 movementType, uint32 pointId) + void MovementInform(uint32 movementType, uint32 pointId) OVERRIDE { if (movementType != POINT_MOTION_TYPE) return; @@ -912,7 +912,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript _events.ScheduleEvent(EVENT_BRANN_MOVE_INTRO, delay); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { UpdateVictim(); @@ -948,7 +948,7 @@ class npc_brann_bronzebeard_algalon : public CreatureScript uint32 _currentPoint; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_brann_bronzebeard_algalonAI>(creature); } @@ -965,7 +965,7 @@ class go_celestial_planetarium_access : public GameObjectScript { } - bool GossipHello(Player* player) + bool GossipHello(Player* player) OVERRIDE { bool hasKey = true; if (LockEntry const* lock = sLockStore.LookupEntry(go->GetGOInfo()->goober.lockId)) @@ -1006,7 +1006,7 @@ class go_celestial_planetarium_access : public GameObjectScript return false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_events.Empty()) return; @@ -1027,7 +1027,7 @@ class go_celestial_planetarium_access : public GameObjectScript EventMap _events; }; - GameObjectAI* GetAI(GameObject* go) const + GameObjectAI* GetAI(GameObject* go) const OVERRIDE { return GetUlduarAI<go_celestial_planetarium_accessAI>(go); } @@ -1058,14 +1058,14 @@ class spell_algalon_phase_punch : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(PhasePunchAlphaId[GetStackAmount() - 1]); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_phase_punch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); OnEffectRemove += AuraEffectRemoveFn(spell_algalon_phase_punch_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_algalon_phase_punch_AuraScript(); } @@ -1101,13 +1101,13 @@ class spell_algalon_arcane_barrage : public SpellScriptLoader targets.remove_if(NotVictimFilter(GetCaster())); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_arcane_barrage_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_algalon_arcane_barrage_SpellScript(); } @@ -1146,13 +1146,13 @@ class spell_algalon_trigger_3_adds : public SpellScriptLoader target->AI()->DoAction(ACTION_ACTIVATE_STAR); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_trigger_3_adds_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_algalon_trigger_3_adds_SpellScript(); } @@ -1173,13 +1173,13 @@ class spell_algalon_collapse : public SpellScriptLoader GetTarget()->DealDamage(GetTarget(), GetTarget()->CountPctFromMaxHealth(1), NULL, NODAMAGE); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_collapse_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_algalon_collapse_AuraScript(); } @@ -1194,7 +1194,7 @@ class spell_algalon_big_bang : public SpellScriptLoader { PrepareSpellScript(spell_algalon_big_bang_SpellScript); - bool Load() + bool Load() OVERRIDE { _targetCount = 0; return true; @@ -1211,7 +1211,7 @@ class spell_algalon_big_bang : public SpellScriptLoader GetCaster()->GetAI()->DoAction(ACTION_ASCEND); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_big_bang_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); AfterCast += SpellCastFn(spell_algalon_big_bang_SpellScript::CheckTargets); @@ -1220,7 +1220,7 @@ class spell_algalon_big_bang : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_algalon_big_bang_SpellScript(); } @@ -1241,13 +1241,13 @@ class spell_algalon_remove_phase : public SpellScriptLoader GetTarget()->RemoveAurasByType(SPELL_AURA_PHASE); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_remove_phase_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_algalon_remove_phase_AuraScript(); } @@ -1269,13 +1269,13 @@ class spell_algalon_cosmic_smash : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectLaunch += SpellEffectFn(spell_algalon_cosmic_smash_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_algalon_cosmic_smash_SpellScript(); } @@ -1300,13 +1300,13 @@ class spell_algalon_cosmic_smash_damage : public SpellScriptLoader SetHitDamage(int32(float(GetHitDamage()) / distance) * 2); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_algalon_cosmic_smash_damage_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_algalon_cosmic_smash_damage_SpellScript(); } @@ -1329,13 +1329,13 @@ class spell_algalon_supermassive_fail : public SpellScriptLoader GetHitPlayer()->ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, ACHIEVEMENT_CRITERIA_CONDITION_NO_SPELL_HIT, GetSpellInfo()->Id, true); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_algalon_supermassive_fail_SpellScript::RecalculateDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_algalon_supermassive_fail_SpellScript(); } @@ -1346,7 +1346,7 @@ class achievement_he_feeds_on_your_tears : public AchievementCriteriaScript public: achievement_he_feeds_on_your_tears() : AchievementCriteriaScript("achievement_he_feeds_on_your_tears") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return !target->GetAI()->GetData(DATA_HAS_FED_ON_TEARS); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 74308245114..cf33906d6f1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -143,14 +143,14 @@ class boss_steelbreaker : public CreatureScript uint32 phase; - void Reset() + void Reset() OVERRIDE { _Reset(); phase = 0; me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_STEELBREAKER_AGGRO); @@ -160,7 +160,7 @@ class boss_steelbreaker : public CreatureScript events.ScheduleEvent(EVENT_FUSION_PUNCH, 15000); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_PHASE_3) return (phase >= 3) ? 1 : 0; @@ -168,7 +168,7 @@ class boss_steelbreaker : public CreatureScript return 0; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -188,7 +188,7 @@ class boss_steelbreaker : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -213,7 +213,7 @@ class boss_steelbreaker : public CreatureScript } } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_STEELBREAKER_SLAY); @@ -222,7 +222,7 @@ class boss_steelbreaker : public CreatureScript DoCast(me, SPELL_ELECTRICAL_CHARGE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -263,7 +263,7 @@ class boss_steelbreaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_steelbreakerAI>(creature); } @@ -280,14 +280,14 @@ class boss_runemaster_molgeim : public CreatureScript uint32 phase; - void Reset() + void Reset() OVERRIDE { _Reset(); phase = 0; me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_MOLGEIM_AGGRO); @@ -297,7 +297,7 @@ class boss_runemaster_molgeim : public CreatureScript events.ScheduleEvent(EVENT_RUNE_OF_POWER, 20000); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_PHASE_3) return (phase >= 3) ? 1 : 0; @@ -305,7 +305,7 @@ class boss_runemaster_molgeim : public CreatureScript return 0; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -325,7 +325,7 @@ class boss_runemaster_molgeim : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -350,13 +350,13 @@ class boss_runemaster_molgeim : public CreatureScript } } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_MOLGEIM_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -420,7 +420,7 @@ class boss_runemaster_molgeim : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_runemaster_molgeimAI>(creature); } @@ -437,7 +437,7 @@ class boss_stormcaller_brundir : public CreatureScript uint32 phase; - void Reset() + void Reset() OVERRIDE { _Reset(); phase = 0; @@ -447,7 +447,7 @@ class boss_stormcaller_brundir : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_STUN, false); // Reset immumity, Brundir should be stunnable by default } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_PHASE_3) return (phase >= 3) ? 1 : 0; @@ -455,7 +455,7 @@ class boss_stormcaller_brundir : public CreatureScript return 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_BRUNDIR_AGGRO); @@ -466,7 +466,7 @@ class boss_stormcaller_brundir : public CreatureScript events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 120000)); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -490,7 +490,7 @@ class boss_stormcaller_brundir : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -519,13 +519,13 @@ class boss_stormcaller_brundir : public CreatureScript me->GetMotionMaster()->MoveFall(); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_BRUNDIR_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -620,7 +620,7 @@ class boss_stormcaller_brundir : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_stormcaller_brundirAI>(creature); } @@ -642,13 +642,13 @@ class spell_shield_of_runes : public SpellScriptLoader caster->CastSpell(caster, SPELL_SHIELD_OF_RUNES_BUFF, false); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_shield_of_runes_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_shield_of_runes_AuraScript(); } @@ -670,13 +670,13 @@ class spell_assembly_meltdown : public SpellScriptLoader Steelbreaker->AI()->DoAction(ACTION_ADD_CHARGE); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_assembly_meltdown_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_assembly_meltdown_SpellScript(); } @@ -691,7 +691,7 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader { PrepareAuraScript(spell_assembly_rune_of_summoning_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RUNE_OF_SUMMONING_SUMMON)) return false; @@ -710,14 +710,14 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader summ->DespawnOrUnsummon(1); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_assembly_rune_of_summoning_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); OnEffectRemove += AuraEffectRemoveFn(spell_assembly_rune_of_summoning_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_assembly_rune_of_summoning_AuraScript(); } @@ -728,7 +728,7 @@ class achievement_assembly_i_choose_you : public AchievementCriteriaScript public: achievement_assembly_i_choose_you() : AchievementCriteriaScript("achievement_assembly_i_choose_you") { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_PHASE_3); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index b2d6dbca7b1..e2a8ab25cac 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -91,8 +91,12 @@ enum AuriayaActions }; #define SENTRY_NUMBER RAID_MODE<uint8>(2, 4) -#define DATA_NINE_LIVES 30763077 -#define DATA_CRAZY_CAT_LADY 30063007 + +enum Mis +{ + DATA_NINE_LIVES = 30763077, + DATA_CRAZY_CAT_LADY = 30063007 +}; class boss_auriaya : public CreatureScript { @@ -105,7 +109,7 @@ class boss_auriaya : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); DefenderGUID = 0; @@ -114,7 +118,7 @@ class boss_auriaya : public CreatureScript nineLives = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -127,13 +131,13 @@ class boss_auriaya : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summons.Summon(summoned); @@ -154,7 +158,7 @@ class boss_auriaya : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -175,7 +179,7 @@ class boss_auriaya : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -188,7 +192,7 @@ class boss_auriaya : public CreatureScript return 0; } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { switch (id) { @@ -201,13 +205,13 @@ class boss_auriaya : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -275,7 +279,7 @@ class boss_auriaya : public CreatureScript bool nineLives; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_auriayaAI>(creature); } @@ -293,13 +297,13 @@ class npc_auriaya_seeping_trigger : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { me->DespawnOrUnsummon(600000); DoCast(me, SPELL_SEEPING_ESSENCE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (instance->GetBossState(BOSS_AURIAYA) != IN_PROGRESS) me->DespawnOrUnsummon(); @@ -309,7 +313,7 @@ class npc_auriaya_seeping_trigger : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_auriaya_seeping_triggerAI(creature); } @@ -327,18 +331,18 @@ class npc_sanctum_sentry : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.ScheduleEvent(EVENT_RIP, urand(4000, 8000)); events.ScheduleEvent(EVENT_POUNCE, urand(12000, 15000)); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_STRENGHT_PACK, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -373,7 +377,7 @@ class npc_sanctum_sentry : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA))) Auriaya->AI()->DoAction(ACTION_CRAZY_CAT_LADY); @@ -384,7 +388,7 @@ class npc_sanctum_sentry : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sanctum_sentryAI(creature); } @@ -402,13 +406,13 @@ class npc_feral_defender : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.ScheduleEvent(EVENT_FERAL_POUNCE, 5000); events.ScheduleEvent(EVENT_RUSH, 10000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -448,7 +452,7 @@ class npc_feral_defender : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_SUMMON_ESSENCE); if (Creature* Auriaya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_AURIAYA))) @@ -460,7 +464,7 @@ class npc_feral_defender : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_feral_defenderAI(creature); } @@ -492,13 +496,13 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader unitList.remove_if(SanctumSentryCheck()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_strenght_of_the_pack_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_auriaya_strenght_of_the_pack_SpellScript(); } @@ -518,14 +522,14 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader unitList.remove_if(PlayerOrPetCheck()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_auriaya_sentinel_blast_SpellScript(); } @@ -539,7 +543,7 @@ class achievement_nine_lives : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; @@ -559,7 +563,7 @@ class achievement_crazy_cat_lady : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 00d1aac8e76..dfaa8028d2d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -141,10 +141,14 @@ enum Vehicles VEHICLE_DEMOLISHER = 33109, }; -#define DATA_SHUTOUT 29112912 // 2911, 2912 are achievement IDs -#define DATA_ORBIT_ACHIEVEMENTS 1 -#define VEHICLE_SPAWNS 5 -#define FREYA_SPAWNS 4 +enum Misc +{ + DATA_SHUTOUT = 29112912, // 2911, 2912 are achievement IDs + DATA_ORBIT_ACHIEVEMENTS = 1, + VEHICLE_SPAWNS = 5, + FREYA_SPAWNS = 4 + +}; enum Yells { @@ -224,7 +228,7 @@ class boss_flame_leviathan : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { ASSERT(vehicle); if (!me->isDead()) @@ -257,7 +261,7 @@ class boss_flame_leviathan : public CreatureScript bool Shutout; bool Unbroken; - void Reset() + void Reset() OVERRIDE { _Reset(); //resets shutdown counter to 0. 2 or 4 depending on raid mode @@ -267,7 +271,7 @@ class boss_flame_leviathan : public CreatureScript me->SetReactState(REACT_DEFENSIVE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); me->SetReactState(REACT_PASSIVE); @@ -317,7 +321,7 @@ class boss_flame_leviathan : public CreatureScript Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); // Set Field Flags 67108928 = 64 | 67108864 = UNIT_FLAG_UNK_6 | UNIT_FLAG_SKINNABLE @@ -326,7 +330,7 @@ class boss_flame_leviathan : public CreatureScript Talk(SAY_DEATH); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_START_THE_ENGINE) vehicle->InstallAllAccessories(false); @@ -338,7 +342,7 @@ class boss_flame_leviathan : public CreatureScript ++Shutdown; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -356,13 +360,13 @@ class boss_flame_leviathan : public CreatureScript return 0; } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { if (id == DATA_UNBROKEN) Unbroken = data ? true : false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -461,13 +465,13 @@ class boss_flame_leviathan : public CreatureScript DoBatteringRamIfReady(); } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_PURSUED) _pursueTarget = target->GetGUID(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action && action <= 4) // Tower destruction, debuff leviathan loot and reduce active tower count { @@ -549,7 +553,7 @@ class boss_flame_leviathan : public CreatureScript uint64 _pursueTarget; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_flame_leviathanAI>(creature); } @@ -573,7 +577,7 @@ class boss_flame_leviathan_seat : public CreatureScript InstanceScript* instance; Vehicle* vehicle; - void PassengerBoarded(Unit* who, int8 seatId, bool apply) + void PassengerBoarded(Unit* who, int8 seatId, bool apply) OVERRIDE { if (!me->GetVehicle()) return; @@ -613,7 +617,7 @@ class boss_flame_leviathan_seat : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_flame_leviathan_seatAI(creature); } @@ -632,13 +636,13 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript uint32 NapalmTimer; - void Reset() + void Reset() OVERRIDE { NapalmTimer = 5*IN_MILLISECONDS; DoCast(me, AURA_STEALTH_DETECTION); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -655,7 +659,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript NapalmTimer -= diff; } - bool CanAIAttack(Unit const* who) const + bool CanAIAttack(Unit const* who) const OVERRIDE { if (who->GetTypeId() != TYPEID_PLAYER || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() == NPC_SEAT) return false; @@ -663,7 +667,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_flame_leviathan_defense_cannonAI(creature); } @@ -678,13 +682,13 @@ class boss_flame_leviathan_defense_turret : public CreatureScript { boss_flame_leviathan_defense_turretAI(Creature* creature) : TurretAI(creature) {} - void DamageTaken(Unit* who, uint32 &damage) + void DamageTaken(Unit* who, uint32 &damage) OVERRIDE { if (!CanAIAttack(who)) damage = 0; } - bool CanAIAttack(Unit const* who) const + bool CanAIAttack(Unit const* who) const OVERRIDE { if (who->GetTypeId() != TYPEID_PLAYER || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() != NPC_SEAT) return false; @@ -692,7 +696,7 @@ class boss_flame_leviathan_defense_turret : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_flame_leviathan_defense_turretAI(creature); } @@ -709,7 +713,7 @@ class boss_flame_leviathan_overload_device : public CreatureScript { } - void OnSpellClick(Unit* /*clicker*/, bool& result) + void OnSpellClick(Unit* /*clicker*/, bool& result) OVERRIDE { if (!result) return; @@ -729,7 +733,7 @@ class boss_flame_leviathan_overload_device : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_flame_leviathan_overload_deviceAI(creature); } @@ -746,7 +750,7 @@ class boss_flame_leviathan_safety_container : public CreatureScript { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { float x, y, z; me->GetPosition(x, y, z); @@ -755,12 +759,12 @@ class boss_flame_leviathan_safety_container : public CreatureScript me->SetPosition(x, y, z, 0); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_flame_leviathan_safety_containerAI(creature); } @@ -780,13 +784,13 @@ class npc_mechanolift : public CreatureScript uint32 MoveTimer; - void Reset() + void Reset() OVERRIDE { MoveTimer = 0; me->GetMotionMaster()->MoveRandom(50); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->GetMotionMaster()->MoveTargetedHome(); DoCast(SPELL_DUSTY_EXPLOSION); @@ -798,14 +802,14 @@ class npc_mechanolift : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 1) if (Creature* container = me->FindNearestCreature(NPC_CONTAINER, 5, true)) container->EnterVehicle(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (MoveTimer <= diff) { @@ -823,7 +827,7 @@ class npc_mechanolift : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mechanoliftAI(creature); } @@ -843,21 +847,21 @@ class npc_pool_of_tar : public CreatureScript me->CastSpell(me, SPELL_TAR_PASSIVE, true); } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { damage = 0; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->SchoolMask & SPELL_SCHOOL_MASK_FIRE && !me->HasAura(SPELL_BLAZE)) me->CastSpell(me, SPELL_BLAZE, true); } - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_pool_of_tarAI(creature); } @@ -877,13 +881,13 @@ class npc_colossus : public CreatureScript InstanceScript* instance; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (me->GetHomePosition().IsInDist(&Center, 50.f)) instance->SetData(DATA_COLOSSUS, instance->GetData(DATA_COLOSSUS)+1); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -892,7 +896,7 @@ class npc_colossus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_colossusAI(creature); } @@ -911,7 +915,8 @@ class npc_thorims_hammer : public CreatureScript me->CastSpell(me, AURA_DUMMY_BLUE, true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who, 0, 10, false)) { @@ -920,7 +925,7 @@ class npc_thorims_hammer : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!me->HasAura(AURA_DUMMY_BLUE)) me->CastSpell(me, AURA_DUMMY_BLUE, true); @@ -929,7 +934,7 @@ class npc_thorims_hammer : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_thorims_hammerAI(creature); } @@ -940,7 +945,7 @@ class npc_mimirons_inferno : public CreatureScript public: npc_mimirons_inferno() : CreatureScript("npc_mimirons_inferno") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mimirons_infernoAI(creature); } @@ -954,19 +959,19 @@ public: me->SetReactState(REACT_PASSIVE); } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } - void Reset() + void Reset() OVERRIDE { infernoTimer = 2000; } uint32 infernoTimer; - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -1006,7 +1011,8 @@ class npc_hodirs_fury : public CreatureScript me->CastSpell(me, AURA_DUMMY_GREEN, true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who, 0, 5, false)) { @@ -1015,7 +1021,7 @@ class npc_hodirs_fury : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!me->HasAura(AURA_DUMMY_GREEN)) me->CastSpell(me, AURA_DUMMY_GREEN, true); @@ -1024,7 +1030,7 @@ class npc_hodirs_fury : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hodirs_furyAI(creature); } @@ -1044,12 +1050,12 @@ class npc_freyas_ward : public CreatureScript uint32 summonTimer; - void Reset() + void Reset() OVERRIDE { summonTimer = 5000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (summonTimer <= diff) { @@ -1067,7 +1073,7 @@ class npc_freyas_ward : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_freyas_wardAI(creature); } @@ -1087,12 +1093,12 @@ class npc_freya_ward_summon : public CreatureScript uint32 lashTimer; - void Reset() + void Reset() OVERRIDE { lashTimer = 5000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1109,7 +1115,7 @@ class npc_freya_ward_summon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_freya_ward_summonAI(creature); } @@ -1130,7 +1136,7 @@ class npc_lorekeeper : public CreatureScript { } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { // Start encounter if (action == ACTION_SPAWN_VEHICLES) @@ -1146,7 +1152,7 @@ class npc_lorekeeper : public CreatureScript } }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); InstanceScript* instance = creature->GetInstanceScript(); @@ -1189,7 +1195,7 @@ class npc_lorekeeper : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetData(BOSS_LEVIATHAN) !=DONE && player) @@ -1202,7 +1208,7 @@ class npc_lorekeeper : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lorekeeperAI(creature); } @@ -1219,7 +1225,7 @@ class npc_brann_bronzebeard : public CreatureScript public: npc_brann_bronzebeard() : CreatureScript("npc_brann_bronzebeard") { } - //bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) + //bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) OVERRIDE //{ // player->PlayerTalkClass->ClearMenus(); // switch (action) @@ -1242,7 +1248,7 @@ public: // } // return true; //} - //bool OnGossipHello(Player* player, Creature* creature) + //bool OnGossipHello(Player* player, Creature* creature) OVERRIDE //{ // InstanceScript* instance = creature->GetInstanceScript(); // if (instance && instance->GetData(BOSS_LEVIATHAN) !=DONE) @@ -1263,7 +1269,7 @@ class go_ulduar_tower : public GameObjectScript public: go_ulduar_tower() : GameObjectScript("go_ulduar_tower") { } - void OnDestroyed(GameObject* go, Player* /*player*/) + void OnDestroyed(GameObject* go, Player* /*player*/) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); if (!instance) @@ -1296,7 +1302,7 @@ class achievement_three_car_garage_demolisher : public AchievementCriteriaScript public: achievement_three_car_garage_demolisher() : AchievementCriteriaScript("achievement_three_car_garage_demolisher") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -1313,7 +1319,7 @@ class achievement_three_car_garage_chopper : public AchievementCriteriaScript public: achievement_three_car_garage_chopper() : AchievementCriteriaScript("achievement_three_car_garage_chopper") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -1330,7 +1336,7 @@ class achievement_three_car_garage_siege : public AchievementCriteriaScript public: achievement_three_car_garage_siege() : AchievementCriteriaScript("achievement_three_car_garage_siege") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -1347,7 +1353,7 @@ class achievement_shutout : public AchievementCriteriaScript public: achievement_shutout() : AchievementCriteriaScript("achievement_shutout") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (target) if (Creature* leviathan = target->ToCreature()) @@ -1363,7 +1369,7 @@ class achievement_unbroken : public AchievementCriteriaScript public: achievement_unbroken() : AchievementCriteriaScript("achievement_unbroken") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (target) if (InstanceScript* instance = target->GetInstanceScript()) @@ -1378,7 +1384,7 @@ class achievement_orbital_bombardment : public AchievementCriteriaScript public: achievement_orbital_bombardment() : AchievementCriteriaScript("achievement_orbital_bombardment") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; @@ -1396,7 +1402,7 @@ class achievement_orbital_devastation : public AchievementCriteriaScript public: achievement_orbital_devastation() : AchievementCriteriaScript("achievement_orbital_devastation") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; @@ -1414,7 +1420,7 @@ class achievement_nuked_from_orbit : public AchievementCriteriaScript public: achievement_nuked_from_orbit() : AchievementCriteriaScript("achievement_nuked_from_orbit") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; @@ -1432,7 +1438,7 @@ class achievement_orbit_uary : public AchievementCriteriaScript public: achievement_orbit_uary() : AchievementCriteriaScript("achievement_orbit_uary") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; @@ -1477,14 +1483,14 @@ class spell_load_into_catapult : public SpellScriptLoader owner->RemoveAurasDueToSpell(SPELL_PASSENGER_LOADED); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_load_into_catapult_AuraScript::OnApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_load_into_catapult_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_load_into_catapult_AuraScript(); } @@ -1543,14 +1549,14 @@ class spell_auto_repair : public SpellScriptLoader instance->SetData(DATA_UNBROKEN, 0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_auto_repair_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); BeforeHit += SpellHitFn(spell_auto_repair_SpellScript::CheckCooldownForTarget); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_auto_repair_SpellScript(); } @@ -1586,14 +1592,14 @@ class spell_systems_shutdown : public SpellScriptLoader owner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_systems_shutdown_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_systems_shutdown_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_systems_shutdown_AuraScript(); } @@ -1651,7 +1657,7 @@ class spell_pursue : public SpellScriptLoader { PrepareSpellScript(spell_pursue_SpellScript); - bool Load() + bool Load() OVERRIDE { _target = NULL; return true; @@ -1698,7 +1704,7 @@ class spell_pursue : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pursue_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pursue_SpellScript::FilterTargetsSubsequently, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -1708,7 +1714,7 @@ class spell_pursue : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pursue_SpellScript(); } @@ -1767,13 +1773,13 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_vehicle_throw_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_vehicle_throw_passenger_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 09298de1698..549d496f19d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -229,7 +229,7 @@ class npc_iron_roots : public CreatureScript summonerGUID = 0; } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { if (summoner->GetTypeId() != TYPEID_PLAYER) return; @@ -239,7 +239,7 @@ class npc_iron_roots : public CreatureScript me->SetInCombatWith(summoner); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* target = ObjectAccessor::GetPlayer(*me, summonerGUID)) { @@ -254,7 +254,7 @@ class npc_iron_roots : public CreatureScript uint64 summonerGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_iron_rootsAI(creature); } @@ -284,7 +284,7 @@ class boss_freya : public CreatureScript bool trioDefeated[2]; bool random[3]; - void Reset() + void Reset() OVERRIDE { _Reset(); trioWaveCount = 0; @@ -307,13 +307,13 @@ class boss_freya : public CreatureScript random[n] = false; } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void DamageTaken(Unit* who, uint32& damage) + void DamageTaken(Unit* who, uint32& damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -322,7 +322,7 @@ class boss_freya : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { _EnterCombat(); DoZoneInCombat(); @@ -373,7 +373,7 @@ class boss_freya : public CreatureScript events.ScheduleEvent(EVENT_SUNBEAM, urand(5000, 15000)); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -386,7 +386,7 @@ class boss_freya : public CreatureScript return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -578,7 +578,7 @@ class boss_freya : public CreatureScript waveCount++; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { //! Freya's chest is dynamically spawned on death by different spells. const uint32 summonSpell[2][4] = @@ -616,7 +616,7 @@ class boss_freya : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -645,7 +645,7 @@ class boss_freya : public CreatureScript } } - void SummonedCreatureDies(Creature* summoned, Unit* who) + void SummonedCreatureDies(Creature* summoned, Unit* who) OVERRIDE { switch (summoned->GetEntry()) { @@ -664,7 +664,7 @@ class boss_freya : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_freyaAI>(creature); } @@ -681,7 +681,7 @@ class boss_elder_brightleaf : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); if (me->HasAura(SPELL_DRAINED_OF_POWER)) @@ -693,13 +693,13 @@ class boss_elder_brightleaf : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_ELDER_SLAY); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { _JustDied(); Talk(SAY_ELDER_DEATH); @@ -714,14 +714,14 @@ class boss_elder_brightleaf : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -764,7 +764,7 @@ class boss_elder_brightleaf : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -785,7 +785,7 @@ class boss_elder_brightleaf : public CreatureScript bool lumberjack; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_elder_brightleafAI>(creature); } @@ -802,7 +802,7 @@ class boss_elder_stonebark : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); if (me->HasAura(SPELL_DRAINED_OF_POWER)) @@ -814,13 +814,13 @@ class boss_elder_stonebark : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_ELDER_SLAY); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { _JustDied(); Talk(SAY_ELDER_DEATH); @@ -835,14 +835,14 @@ class boss_elder_stonebark : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } - void DamageTaken(Unit* who, uint32& damage) + void DamageTaken(Unit* who, uint32& damage) OVERRIDE { if (who == me) return; @@ -855,7 +855,7 @@ class boss_elder_stonebark : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -891,7 +891,7 @@ class boss_elder_stonebark : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -912,7 +912,7 @@ class boss_elder_stonebark : public CreatureScript bool lumberjack; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_elder_stonebarkAI>(creature); } @@ -929,7 +929,7 @@ class boss_elder_ironbranch : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); if (me->HasAura(SPELL_DRAINED_OF_POWER)) @@ -941,13 +941,13 @@ class boss_elder_ironbranch : public CreatureScript lumberjack = false; } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_ELDER_SLAY); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { _JustDied(); Talk(SAY_ELDER_DEATH); @@ -962,14 +962,14 @@ class boss_elder_ironbranch : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); if (!me->HasAura(SPELL_DRAINED_OF_POWER)) Talk(SAY_ELDER_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasAura(SPELL_DRAINED_OF_POWER)) return; @@ -1005,7 +1005,7 @@ class boss_elder_ironbranch : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -1026,7 +1026,7 @@ class boss_elder_ironbranch : public CreatureScript bool lumberjack; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_elder_ironbranchAI>(creature); } @@ -1044,13 +1044,13 @@ class npc_detonating_lasher : public CreatureScript me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); } - void Reset() + void Reset() OVERRIDE { lashTimer = 5000; changeTargetTimer = 7500; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1084,7 +1084,7 @@ class npc_detonating_lasher : public CreatureScript uint32 changeTargetTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_detonating_lasherAI(creature); } @@ -1104,12 +1104,12 @@ class npc_ancient_water_spirit : public CreatureScript waveCount = CAST_AI(boss_freya::boss_freyaAI, Freya->AI())->trioWaveCount; } - void Reset() + void Reset() OVERRIDE { tidalWaveTimer = 10000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1129,7 +1129,7 @@ class npc_ancient_water_spirit : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_FREYA))) { @@ -1144,7 +1144,7 @@ class npc_ancient_water_spirit : public CreatureScript uint8 waveCount; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ancient_water_spiritAI(creature); } @@ -1164,13 +1164,13 @@ class npc_storm_lasher : public CreatureScript waveCount = CAST_AI(boss_freya::boss_freyaAI, Freya->AI())->trioWaveCount; } - void Reset() + void Reset() OVERRIDE { lightningLashTimer = 10000; stormboltTimer = 5000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1195,7 +1195,7 @@ class npc_storm_lasher : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_FREYA))) { @@ -1211,7 +1211,7 @@ class npc_storm_lasher : public CreatureScript uint8 waveCount; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_storm_lasherAI(creature); } @@ -1231,7 +1231,7 @@ class npc_snaplasher : public CreatureScript waveCount = CAST_AI(boss_freya::boss_freyaAI, Freya->AI())->trioWaveCount; } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -1242,7 +1242,7 @@ class npc_snaplasher : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_FREYA))) { @@ -1256,7 +1256,7 @@ class npc_snaplasher : public CreatureScript uint8 waveCount; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_snaplasherAI(creature); } @@ -1273,7 +1273,7 @@ class npc_ancient_conservator : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { natureFuryTimer = 7500; healthySporeTimer = 3500; @@ -1291,12 +1291,12 @@ class npc_ancient_conservator : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoCast(who, SPELL_CONSERVATOR_GRIP, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1327,7 +1327,7 @@ class npc_ancient_conservator : public CreatureScript uint32 healthySporeTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ancient_conservatorAI(creature); } @@ -1349,7 +1349,7 @@ class npc_sun_beam : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sun_beamAI(creature); } @@ -1373,7 +1373,7 @@ class npc_healthy_spore : public CreatureScript lifeTimer = urand(22000, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (lifeTimer <= diff) { @@ -1389,7 +1389,7 @@ class npc_healthy_spore : public CreatureScript uint32 lifeTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_healthy_sporeAI(creature); } @@ -1412,7 +1412,7 @@ class npc_eonars_gift : public CreatureScript DoCast(me, SPELL_EONAR_VISUAL, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (lifeBindersGiftTimer <= diff) { @@ -1429,7 +1429,7 @@ class npc_eonars_gift : public CreatureScript uint32 lifeBindersGiftTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_eonars_giftAI(creature); } @@ -1450,7 +1450,7 @@ class npc_nature_bomb : public CreatureScript DoCast(SPELL_OBJECT_BOMB); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bombTimer <= diff) { @@ -1471,7 +1471,7 @@ class npc_nature_bomb : public CreatureScript uint32 bombTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nature_bombAI(creature); } @@ -1495,7 +1495,7 @@ class npc_unstable_sun_beam : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (despawnTimer <= diff) { @@ -1506,7 +1506,7 @@ class npc_unstable_sun_beam : public CreatureScript despawnTimer -= diff; } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (target && spell->Id == SPELL_UNSTABLE_ENERGY) { @@ -1520,7 +1520,7 @@ class npc_unstable_sun_beam : public CreatureScript uint32 despawnTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_unstable_sun_beamAI(creature); } @@ -1561,13 +1561,13 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_freya_attuned_to_nature_dose_reduction_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_freya_attuned_to_nature_dose_reduction_SpellScript(); } @@ -1594,13 +1594,13 @@ class spell_freya_iron_roots : public SpellScriptLoader GetCaster()->NearTeleportTo(Roots->GetPositionX(), Roots->GetPositionY(), Roots->GetPositionZ(), GetCaster()->GetOrientation()); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_freya_iron_roots_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_freya_iron_roots_SpellScript(); } @@ -1611,7 +1611,7 @@ class achievement_getting_back_to_nature : public AchievementCriteriaScript public: achievement_getting_back_to_nature() : AchievementCriteriaScript("achievement_getting_back_to_nature") { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_GETTING_BACK_TO_NATURE) >= 25; } @@ -1622,7 +1622,7 @@ class achievement_knock_on_wood : public AchievementCriteriaScript public: achievement_knock_on_wood() : AchievementCriteriaScript("achievement_knock_on_wood") { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) >= 1; } @@ -1633,7 +1633,7 @@ class achievement_knock_knock_on_wood : public AchievementCriteriaScript public: achievement_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_on_wood") { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) >= 2; } @@ -1644,7 +1644,7 @@ class achievement_knock_knock_knock_on_wood : public AchievementCriteriaScript public: achievement_knock_knock_knock_on_wood() : AchievementCriteriaScript("achievement_knock_knock_knock_on_wood") { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->GetAI()->GetData(DATA_KNOCK_ON_WOOD) == 3; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 5ee55febba3..38864effe9f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -90,8 +90,11 @@ enum VezaxEvents EVENT_RANDOM_MOVE = 8, }; -#define DATA_SMELL_SARONITE 31813188 -#define DATA_SHADOWDODGER 29962997 +enum Misc +{ + DATA_SMELL_SARONITE = 31813188, + DATA_SHADOWDODGER = 29962997 +}; class boss_general_vezax : public CreatureScript { @@ -109,7 +112,7 @@ class boss_general_vezax : public CreatureScript bool animusDead; // Check against getting a HardMode achievement before killing Saronite Animus uint8 vaporCount; - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -119,7 +122,7 @@ class boss_general_vezax : public CreatureScript vaporCount = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -135,7 +138,7 @@ class boss_general_vezax : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -204,19 +207,19 @@ class boss_general_vezax : public CreatureScript DoMeleeAttackIfReady(); } - void SpellHitTarget(Unit* who, SpellInfo const* spell) + void SpellHitTarget(Unit* who, SpellInfo const* spell) OVERRIDE { if (who && who->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_SHADOW_CRASH_HIT) shadowDodger = false; } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -237,7 +240,7 @@ class boss_general_vezax : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -250,7 +253,7 @@ class boss_general_vezax : public CreatureScript return 0; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -302,7 +305,7 @@ class boss_general_vezax : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_general_vezaxAI>(creature); } @@ -320,20 +323,20 @@ class boss_saronite_animus : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_VISUAL_SARONITE_ANIMUS); events.Reset(); events.ScheduleEvent(EVENT_PROFOUND_OF_DARKNESS, 3000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Vezax = me->GetCreature(*me, instance->GetData64(BOSS_VEZAX))) Vezax->AI()->DoAction(ACTION_ANIMUS_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -364,7 +367,7 @@ class boss_saronite_animus : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_saronite_animusAI(creature); } @@ -386,13 +389,13 @@ class npc_saronite_vapors : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_RANDOM_MOVE, urand(5000, 7500)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -410,7 +413,7 @@ class npc_saronite_vapors : public CreatureScript } } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { // This can't be on JustDied. In 63322 dummy handler caster needs to be this NPC // if caster == target then damage mods will increase the damage taken @@ -434,7 +437,7 @@ class npc_saronite_vapors : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_saronite_vaporsAI(creature); } @@ -455,13 +458,13 @@ class spell_mark_of_the_faceless : public SpellScriptLoader caster->CastCustomSpell(SPELL_MARK_OF_THE_FACELESS_DAMAGE, SPELLVALUE_BASE_POINT1, aurEff->GetAmount(), GetTarget(), true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_the_faceless_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mark_of_the_faceless_AuraScript(); } @@ -476,7 +479,7 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader { PrepareAuraScript(spell_general_vezax_saronite_vapors_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SARONITE_VAPORS_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_SARONITE_VAPORS_DAMAGE)) return false; @@ -494,13 +497,13 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_general_vezax_saronite_vapors_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_general_vezax_saronite_vapors_AuraScript(); } @@ -513,7 +516,7 @@ class achievement_shadowdodger : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; @@ -533,7 +536,7 @@ class achievement_smell_saronite : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 19c80fd7d0e..2fb165b935e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -142,7 +142,11 @@ enum HodirActions #define ACHIEVEMENT_THIS_CACHE_WAS_RARE RAID_MODE<uint8>(3182, 3184) #define ACHIEVEMENT_COOLEST_FRIENDS RAID_MODE<uint8>(2963, 2965) #define FRIENDS_COUNT RAID_MODE<uint8>(4, 8) -#define DATA_GETTING_COLD_IN_HERE 29672968 // 2967, 2968 are achievement IDs + +enum Misc +{ + DATA_GETTING_COLD_IN_HERE = 29672968 // 2967, 2968 are achievement IDs +}; Position const SummonPositions[8] = { @@ -187,13 +191,13 @@ class npc_flash_freeze : public CreatureScript uint64 targetGUID; uint32 checkDespawnTimer; - void Reset() + void Reset() OVERRIDE { targetGUID = 0; checkDespawnTimer = 1000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->GetVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->GetVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) return; @@ -212,7 +216,7 @@ class npc_flash_freeze : public CreatureScript checkDespawnTimer -= diff; } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { targetGUID = summoner->GetGUID(); me->SetInCombatWith(summoner); @@ -229,7 +233,7 @@ class npc_flash_freeze : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_flash_freezeAI(creature); } @@ -254,7 +258,7 @@ class npc_ice_block : public CreatureScript uint64 targetGUID; - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { targetGUID = summoner->GetGUID(); summoner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_STUNNED | UNIT_FLAG_PACIFIED); @@ -269,7 +273,7 @@ class npc_ice_block : public CreatureScript } } - void DamageTaken(Unit* who, uint32& /*damage*/) + void DamageTaken(Unit* who, uint32& /*damage*/) OVERRIDE { if (Creature* Helper = ObjectAccessor::GetCreature(*me, targetGUID)) { @@ -290,7 +294,7 @@ class npc_ice_block : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ice_blockAI(creature); } @@ -315,7 +319,7 @@ class boss_hodir : public CreatureScript bool iHaveTheCoolestFriends; bool iCouldSayThatThisCacheWasRare; - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -325,7 +329,7 @@ class boss_hodir : public CreatureScript FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -345,13 +349,13 @@ class boss_hodir : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 480000); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -381,7 +385,7 @@ class boss_hodir : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -460,7 +464,7 @@ class boss_hodir : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -498,7 +502,7 @@ class boss_hodir : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_hodirAI>(creature); }; @@ -520,12 +524,12 @@ class npc_icicle : public CreatureScript uint32 icicleTimer; - void Reset() + void Reset() OVERRIDE { icicleTimer = 2500; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (icicleTimer <= diff) { @@ -546,7 +550,7 @@ class npc_icicle : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_icicleAI>(creature); }; @@ -568,12 +572,12 @@ class npc_snowpacked_icicle : public CreatureScript uint32 despawnTimer; - void Reset() + void Reset() OVERRIDE { despawnTimer = 12000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (despawnTimer <= diff) { @@ -586,7 +590,7 @@ class npc_snowpacked_icicle : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_snowpacked_icicleAI>(creature); }; @@ -604,14 +608,14 @@ class npc_hodir_priest : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_HEAL, urand(4000, 8000)); events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -652,7 +656,7 @@ class npc_hodir_priest : public CreatureScript DoSpellAttackIfReady(SPELL_SMITE); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -663,7 +667,7 @@ class npc_hodir_priest : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_hodir_priestAI>(creature); }; @@ -681,13 +685,13 @@ class npc_hodir_shaman : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_STORM_CLOUD, urand(10000, 12500)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -714,7 +718,7 @@ class npc_hodir_shaman : public CreatureScript DoSpellAttackIfReady(SPELL_LAVA_BURST); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -725,7 +729,7 @@ class npc_hodir_shaman : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_hodir_shamanAI>(creature); }; @@ -743,13 +747,13 @@ class npc_hodir_druid : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_STARLIGHT, urand(15000, 17500)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -775,7 +779,7 @@ class npc_hodir_druid : public CreatureScript DoSpellAttackIfReady(SPELL_WRATH); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -786,7 +790,7 @@ class npc_hodir_druid : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_hodir_druidAI>(creature); }; @@ -804,7 +808,7 @@ class npc_hodir_mage : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -812,19 +816,19 @@ class npc_hodir_mage : public CreatureScript events.ScheduleEvent(EVENT_MELT_ICE, 5000); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_TOASTY_FIRE) summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_TOASTY_FIRE) summons.Despawn(summoned); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED)) return; @@ -855,7 +859,7 @@ class npc_hodir_mage : public CreatureScript DoSpellAttackIfReady(SPELL_FIREBALL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); @@ -867,7 +871,7 @@ class npc_hodir_mage : public CreatureScript SummonList summons; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_hodir_mageAI>(creature); }; @@ -885,12 +889,12 @@ class npc_toasty_fire : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_SINGED, true); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) + void SpellHit(Unit* /*who*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_BLOCK_OF_ICE || spell->Id == SPELL_ICE_SHARD || spell->Id == SPELL_ICE_SHARD_HIT) { @@ -901,7 +905,7 @@ class npc_toasty_fire : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_toasty_fireAI>(creature); }; @@ -947,7 +951,7 @@ class spell_biting_cold : public SpellScriptLoader listOfTargets.push_back(std::make_pair(target->GetGUID(), 1)); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_biting_cold_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } @@ -957,7 +961,7 @@ class spell_biting_cold : public SpellScriptLoader TargetList listOfTargets; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_biting_cold_AuraScript(); } @@ -985,13 +989,13 @@ public: caster->RemoveAuraFromStack(SPELL_BITING_COLD_TRIGGERED); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_biting_cold_dot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_biting_cold_dot_AuraScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 2d5ddb50e5d..d8578b31abb 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -121,7 +121,7 @@ class boss_ignis : public CreatureScript ASSERT(_vehicle); } - void Reset() + void Reset() OVERRIDE { _Reset(); if (_vehicle) @@ -130,7 +130,7 @@ class boss_ignis : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -146,13 +146,13 @@ class boss_ignis : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_SHATTERED) return _shattered ? 1 : 0; @@ -160,13 +160,13 @@ class boss_ignis : public CreatureScript return 0; } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_IRON_CONSTRUCT) { @@ -180,7 +180,7 @@ class boss_ignis : public CreatureScript summons.Summon(summon); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_REMOVE_BUFF) return; @@ -193,7 +193,7 @@ class boss_ignis : public CreatureScript _firstConstructKill = secondKill; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -283,7 +283,7 @@ class boss_ignis : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_ignis_AI>(creature); } @@ -301,12 +301,12 @@ class npc_iron_construct : public CreatureScript creature->SetReactState(REACT_PASSIVE); } - void Reset() + void Reset() OVERRIDE { _brittled = false; } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HasAura(SPELL_BRITTLE) && damage >= 5000) { @@ -319,7 +319,7 @@ class npc_iron_construct : public CreatureScript } } - void UpdateAI(uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -350,7 +350,7 @@ class npc_iron_construct : public CreatureScript bool _brittled; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_iron_constructAI>(creature); } @@ -369,7 +369,8 @@ class npc_scorch_ground : public CreatureScript creature->SetDisplayId(16925); //model 2 in db cannot overwrite wdb fields } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!_heat) { @@ -384,7 +385,7 @@ class npc_scorch_ground : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { _heat = false; DoCast(me, SPELL_GROUND); @@ -392,7 +393,7 @@ class npc_scorch_ground : public CreatureScript _heatTimer = 0; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (_heat) { @@ -416,7 +417,7 @@ class npc_scorch_ground : public CreatureScript bool _heat; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_scorch_groundAI>(creature); } @@ -431,7 +432,7 @@ class spell_ignis_slag_pot : public SpellScriptLoader { PrepareAuraScript(spell_ignis_slag_pot_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SLAG_POT_DAMAGE)) return false; @@ -456,14 +457,14 @@ class spell_ignis_slag_pot : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SLAG_IMBUED, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignis_slag_pot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); AfterEffectRemove += AuraEffectRemoveFn(spell_ignis_slag_pot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ignis_slag_pot_AuraScript(); } @@ -474,7 +475,7 @@ class achievement_ignis_shattered : public AchievementCriteriaScript public: achievement_ignis_shattered() : AchievementCriteriaScript("achievement_ignis_shattered") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (target && target->IsAIEnabled) return target->GetAI()->GetData(DATA_SHATTERED); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 7c9f534c27a..dfeeebaae99 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -117,7 +117,7 @@ class boss_kologarn : public CreatureScript bool left, right; uint64 eyebeamTarget; - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -135,14 +135,14 @@ class boss_kologarn : public CreatureScript _EnterCombat(); } - void Reset() + void Reset() OVERRIDE { _Reset(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); eyebeamTarget = 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); DoCast(SPELL_KOLOGARN_PACIFY); @@ -152,13 +152,13 @@ class boss_kologarn : public CreatureScript _JustDied(); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE { bool isEncounterInProgress = instance->GetBossState(BOSS_KOLOGARN) == IN_PROGRESS; if (who->GetEntry() == NPC_LEFT_ARM) @@ -208,7 +208,7 @@ class boss_kologarn : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { switch (summon->GetEntry()) { @@ -242,7 +242,7 @@ class boss_kologarn : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -318,7 +318,7 @@ class boss_kologarn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_kologarnAI>(creature); } @@ -345,13 +345,13 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL, NULL, originalCaster); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ulduar_rubble_summonSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ulduar_rubble_summonSpellScript(); } @@ -387,7 +387,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader { PrepareSpellScript(spell_ulduar_stone_grip_cast_target_SpellScript); - bool Load() + bool Load() OVERRIDE { if (GetCaster()->GetTypeId() != TYPEID_UNIT) return false; @@ -420,7 +420,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader unitList = _unitList; } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -432,7 +432,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader std::list<WorldObject*> _unitList; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ulduar_stone_grip_cast_target_SpellScript(); } @@ -466,13 +466,13 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ulduar_cancel_stone_gripSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ulduar_cancel_stone_gripSpellScript(); } @@ -504,13 +504,13 @@ class spell_ulduar_squeezed_lifeless : public SpellScriptLoader GetHitPlayer()->UpdateObjectVisibility(false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ulduar_squeezed_lifeless_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ulduar_squeezed_lifeless_SpellScript(); } @@ -541,13 +541,13 @@ class spell_ulduar_stone_grip_absorb : public SpellScriptLoader rubbleStalker->CastSpell(rubbleStalker, SPELL_STONE_GRIP_CANCEL, true); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_absorb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ulduar_stone_grip_absorb_AuraScript(); } @@ -594,14 +594,14 @@ class spell_ulduar_stone_grip : public SpellScriptLoader caster->Relocate(oldPos); } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_AuraScript::OnRemoveVehicle, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_AuraScript::OnRemoveStun, EFFECT_2, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ulduar_stone_grip_AuraScript(); } @@ -621,13 +621,13 @@ class spell_kologarn_stone_shout : public SpellScriptLoader unitList.remove_if(PlayerOrPetCheck()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kologarn_stone_shout_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_kologarn_stone_shout_SpellScript(); } @@ -648,14 +648,14 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), GetSpellInfo()->Effects[effIndex].TriggerSpell, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); OnEffectHitTarget += SpellEffectFn(spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_kologarn_summon_focused_eyebeam_SpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index fe7f72e3766..56fd4b310ee 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -97,13 +97,13 @@ class spell_ulduar_proximity_mines : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_TRIGGER_MISSILE, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ulduar_proximity_minesSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ulduar_proximity_minesSpellScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 8f8f05a4018..fb835b5a4d9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -137,8 +137,12 @@ enum Events #define GROUND_Z 391.517f #define GOSSIP_ITEM_1 "Activate Harpoons!" -#define DATA_QUICK_SHAVE 29192921 // 2919, 2921 are achievement IDs -#define DATA_IRON_DWARF_MEDIUM_RARE 29232924 + +enum Misc +{ + DATA_QUICK_SHAVE = 29192921, // 2919, 2921 are achievement IDs + DATA_IRON_DWARF_MEDIUM_RARE = 29232924 +}; const Position PosEngRepair[4] = { @@ -188,13 +192,13 @@ class boss_razorscale_controller : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_PASSIVE); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { switch (spell->Id) { @@ -219,12 +223,12 @@ class boss_razorscale_controller : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (instance->GetBossState(BOSS_RAZORSCALE) != IN_PROGRESS) return; @@ -243,7 +247,7 @@ class boss_razorscale_controller : public CreatureScript } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { events.Update(Diff); @@ -294,7 +298,7 @@ class boss_razorscale_controller : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_razorscale_controllerAI(creature); } @@ -305,7 +309,7 @@ class go_razorscale_harpoon : public GameObjectScript public: go_razorscale_harpoon() : GameObjectScript("go_razorscale_harpoon") {} - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); if (ObjectAccessor::GetCreature(*go, instance ? instance->GetData64(BOSS_RAZORSCALE) : 0)) @@ -335,7 +339,7 @@ class boss_razorscale : public CreatureScript bool PermaGround; bool Enraged; - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetCanFly(true); @@ -347,7 +351,7 @@ class boss_razorscale : public CreatureScript commander->AI()->DoAction(ACTION_COMMANDER_RESET); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); if (Creature* controller = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_RAZORSCALE_CONTROL) : 0)) @@ -362,20 +366,20 @@ class boss_razorscale : public CreatureScript events.ScheduleEvent(EVENT_FLIGHT, 0, 0, PHASE_GROUND); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); if (Creature* controller = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_RAZORSCALE_CONTROL) : 0)) controller->AI()->Reset(); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_HARPOON_TRIGGER) ++HarpoonCounter; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == EFFECT_MOTION_TYPE && id == 1) { @@ -385,7 +389,7 @@ class boss_razorscale : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_QUICK_SHAVE) if (FlyCount <= 2) @@ -394,7 +398,7 @@ class boss_razorscale : public CreatureScript return 0; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; @@ -562,7 +566,7 @@ class boss_razorscale : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -575,7 +579,7 @@ class boss_razorscale : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_razorscaleAI>(creature); } @@ -603,7 +607,7 @@ class npc_expedition_commander : public CreatureScript Creature* Engineer[4]; Creature* Defender[4]; - void Reset() + void Reset() OVERRIDE { AttackStartTimer = 0; Phase = 0; @@ -611,7 +615,8 @@ class npc_expedition_commander : public CreatureScript summons.clear(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!Greet && me->IsWithinDistInMap(who, 10.0f) && who->GetTypeId() == TYPEID_PLAYER) { @@ -620,12 +625,12 @@ class npc_expedition_commander : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summons.push_back(summoned->GetGUID()); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -639,7 +644,7 @@ class npc_expedition_commander : public CreatureScript } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (AttackStartTimer <= Diff) { @@ -699,7 +704,7 @@ class npc_expedition_commander : public CreatureScript } }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -712,7 +717,7 @@ class npc_expedition_commander : public CreatureScript return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); if (instance && instance->GetBossState(BOSS_RAZORSCALE) == NOT_STARTED) @@ -728,7 +733,7 @@ class npc_expedition_commander : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_expedition_commanderAI(creature); } @@ -753,7 +758,7 @@ class npc_mole_machine_trigger : public CreatureScript bool GobSummoned; bool NpcSummoned; - void Reset() + void Reset() OVERRIDE { SummonGobTimer = 2000; SummonNpcTimer = 6000; @@ -762,7 +767,7 @@ class npc_mole_machine_trigger : public CreatureScript NpcSummoned = false; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!GobSummoned && SummonGobTimer <= Diff) { @@ -802,13 +807,13 @@ class npc_mole_machine_trigger : public CreatureScript DissapearTimer -= Diff; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->DoZoneInCombat(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mole_machine_triggerAI(creature); } @@ -827,13 +832,13 @@ class npc_devouring_flame : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_PACIFIED); } - void Reset() + void Reset() OVERRIDE { DoCast(SPELL_FLAME_GROUND); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_devouring_flameAI(creature); } @@ -851,13 +856,13 @@ class npc_darkrune_watcher : public CreatureScript uint32 ChainTimer; uint32 LightTimer; - void Reset() + void Reset() OVERRIDE { ChainTimer = urand(10000, 15000); LightTimer = urand(1000, 3000); } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; @@ -882,7 +887,7 @@ class npc_darkrune_watcher : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_darkrune_watcherAI(creature); } @@ -899,25 +904,25 @@ class npc_darkrune_guardian : public CreatureScript uint32 StormTimer; - void Reset() + void Reset() OVERRIDE { StormTimer = urand(3000, 6000); killedByBreath = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { return type == DATA_IRON_DWARF_MEDIUM_RARE ? killedByBreath : 0; } - void SetData(uint32 type, uint32 value) + void SetData(uint32 type, uint32 value) OVERRIDE { if (type == DATA_IRON_DWARF_MEDIUM_RARE) killedByBreath = value; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; @@ -937,7 +942,7 @@ class npc_darkrune_guardian : public CreatureScript bool killedByBreath; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_darkrune_guardianAI(creature); } @@ -956,14 +961,14 @@ class npc_darkrune_sentinel : public CreatureScript uint32 WhirlTimer; uint32 ShoutTimer; - void Reset() + void Reset() OVERRIDE { HeroicTimer = urand(4000, 8000); WhirlTimer = urand(20000, 25000); ShoutTimer = urand(15000, 30000); } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; @@ -996,7 +1001,7 @@ class npc_darkrune_sentinel : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_darkrune_sentinelAI(creature); } @@ -1023,13 +1028,13 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader caster->SummonCreature(entry, summonLocation->GetPositionX(), summonLocation->GetPositionY(), GROUND_Z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 20000); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_razorscale_devouring_flame_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_razorscale_devouring_flame_SpellScript(); } @@ -1054,13 +1059,13 @@ class spell_razorscale_flame_breath : public SpellScriptLoader target->AI()->SetData(DATA_IRON_DWARF_MEDIUM_RARE, 1); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_razorscale_flame_breath_SpellScript::CheckDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_razorscale_flame_breath_SpellScript(); } @@ -1073,7 +1078,7 @@ class achievement_iron_dwarf_medium_rare : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->IsAIEnabled && target->GetAI()->GetData(DATA_IRON_DWARF_MEDIUM_RARE); } @@ -1084,7 +1089,7 @@ class achievement_quick_shave : public AchievementCriteriaScript public: achievement_quick_shave() : AchievementCriteriaScript("achievement_quick_shave") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (target) if (Creature* razorscale = target->ToCreature()) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 89ce6ab2733..c14cab88d76 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -49,36 +49,36 @@ class boss_thorim : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { Talk(SAY_WIPE); _EnterEvadeMode(); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -91,7 +91,7 @@ class boss_thorim : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_thorimAI>(creature); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 984f96c1461..bed7bd86b91 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -192,7 +192,7 @@ class boss_xt002 : public CreatureScript public: boss_xt002() : CreatureScript("boss_xt002") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_xt002_AI>(creature); } @@ -203,7 +203,7 @@ class boss_xt002 : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -224,7 +224,7 @@ class boss_xt002 : public CreatureScript instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MUST_DECONSTRUCT_FASTER); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); _EnterCombat(); @@ -241,7 +241,7 @@ class boss_xt002 : public CreatureScript instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MUST_DECONSTRUCT_FASTER); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -251,25 +251,25 @@ class boss_xt002 : public CreatureScript } } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!_hardMode && _phase == 1 && !HealthAbovePct(100 - 25 * (_heartExposed+1))) ExposeHeart(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -322,7 +322,7 @@ class boss_xt002 : public CreatureScript DoMeleeAttackIfReady(); } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE { if (apply && who->GetEntry() == NPC_XS013_SCRAPBOT) { @@ -335,7 +335,7 @@ class boss_xt002 : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -350,7 +350,7 @@ class boss_xt002 : public CreatureScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -459,9 +459,9 @@ class npc_xt002_heart : public CreatureScript SetCombatMovement(false); } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Creature* xt002 = _instance ? me->GetCreature(*me, _instance->GetData64(BOSS_XT002)) : NULL; if (!xt002 || !xt002->AI()) @@ -475,7 +475,7 @@ class npc_xt002_heart : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_xt002_heartAI(creature); } @@ -491,7 +491,7 @@ class npc_scrapbot : public CreatureScript public: npc_scrapbot() : CreatureScript("npc_scrapbot") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scrapbotAI(creature); } @@ -503,7 +503,7 @@ class npc_scrapbot : public CreatureScript _instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); @@ -513,7 +513,7 @@ class npc_scrapbot : public CreatureScript me->GetMotionMaster()->MoveFollow(pXT002, 0.0f, 0.0f); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_rangeCheckTimer <= diff) { @@ -548,7 +548,7 @@ class npc_pummeller : public CreatureScript public: npc_pummeller() : CreatureScript("npc_pummeller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_pummellerAI(creature); } @@ -560,7 +560,7 @@ class npc_pummeller : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _arcingSmashTimer = TIMER_ARCING_SMASH; _trampleTimer = TIMER_TRAMPLE; @@ -574,7 +574,7 @@ class npc_pummeller : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -650,7 +650,7 @@ class npc_boombot : public CreatureScript public: npc_boombot() : CreatureScript("npc_boombot") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_boombotAI(creature); } @@ -662,7 +662,7 @@ class npc_boombot : public CreatureScript _instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { _boomed = false; @@ -679,7 +679,7 @@ class npc_boombot : public CreatureScript me->GetMotionMaster()->MoveFollow(pXT002, 0.0f, 0.0f); } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { if (damage >= (me->GetHealth() - me->GetMaxHealth() * 0.5f) && !_boomed) { @@ -704,7 +704,7 @@ class npc_boombot : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -729,7 +729,7 @@ class npc_life_spark : public CreatureScript public: npc_life_spark() : CreatureScript("npc_life_spark") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_life_sparkAI(creature); } @@ -740,13 +740,13 @@ class npc_life_spark : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { DoCast(me, RAID_MODE(SPELL_STATIC_CHARGED_10, SPELL_STATIC_CHARGED_25)); _shockTimer = 0; // first one is immediate. } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -776,7 +776,7 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader { PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_LIFE_SPARK)) return false; @@ -791,13 +791,13 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader player->CastSpell(player, SPELL_SUMMON_LIFE_SPARK, true); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_xt002_searing_light_spawn_life_spark_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_xt002_searing_light_spawn_life_spark_AuraScript(); } @@ -812,7 +812,7 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader { PrepareAuraScript(spell_xt002_gravity_bomb_aura_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_VOID_ZONE)) return false; @@ -842,14 +842,14 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader xt002->GetAI()->SetData(DATA_GRAVITY_BOMB_CASUALTY, 1); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_xt002_gravity_bomb_aura_AuraScript::OnPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); AfterEffectRemove += AuraEffectRemoveFn(spell_xt002_gravity_bomb_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_xt002_gravity_bomb_aura_AuraScript(); } @@ -875,13 +875,13 @@ class spell_xt002_gravity_bomb_damage : public SpellScriptLoader caster->GetAI()->SetData(DATA_GRAVITY_BOMB_CASUALTY, 1); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_xt002_gravity_bomb_damage_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_xt002_gravity_bomb_damage_SpellScript(); } @@ -896,7 +896,7 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader { PrepareSpellScript(spell_xt002_heart_overload_periodic_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ENERGY_ORB)) return false; @@ -942,13 +942,13 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_xt002_heart_overload_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_xt002_heart_overload_periodic_SpellScript(); } @@ -973,7 +973,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(GetHitDamage())); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -981,7 +981,7 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_xt002_tympanic_tantrum_SpellScript(); } @@ -1006,13 +1006,13 @@ class spell_xt002_submerged : public SpellScriptLoader target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_SUBMERGED); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_xt002_submerged_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_xt002_submerged_SpellScript(); } @@ -1037,13 +1037,13 @@ class spell_xt002_stand : public SpellScriptLoader target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_xt002_stand_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_xt002_stand_SpellScript(); } @@ -1054,7 +1054,7 @@ class achievement_nerf_engineering : public AchievementCriteriaScript public: achievement_nerf_engineering() : AchievementCriteriaScript("achievement_nerf_engineering") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target || !target->GetAI()) return false; @@ -1068,7 +1068,7 @@ class achievement_heartbreaker : public AchievementCriteriaScript public: achievement_heartbreaker() : AchievementCriteriaScript("achievement_heartbreaker") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target || !target->GetAI()) return false; @@ -1082,7 +1082,7 @@ class achievement_nerf_gravity_bombs : public AchievementCriteriaScript public: achievement_nerf_gravity_bombs() : AchievementCriteriaScript("achievement_nerf_gravity_bombs") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target || !target->GetAI()) return false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index cd3c059ad24..4c6b3ae8b3f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -430,14 +430,15 @@ class boss_voice_of_yogg_saron : public CreatureScript SetCombatMovement(false); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { // TODO: MoveInLineOfSight doesn't work for such a big distance if (who->GetTypeId() == TYPEID_PLAYER && me->GetDistance2d(who) < 99.0f && !me->IsInCombat()) me->SetInCombatWithZone(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { BossAI::EnterEvadeMode(); @@ -458,7 +459,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { _Reset(); events.SetPhase(PHASE_ONE); @@ -481,7 +482,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Creature* sara = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_SARA))) sara->SetInCombatWith(me); @@ -500,7 +501,7 @@ class boss_voice_of_yogg_saron : public CreatureScript events.ScheduleEvent(EVENT_EXTINGUISH_ALL_LIFE, 900000); // 15 minutes } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { // don't despawn Yogg-Saron's corpse, remove him from SummonList! if (Creature* yogg = ObjectAccessor::GetCreature(*me, instance->GetData64(BOSS_YOGG_SARON))) @@ -509,7 +510,7 @@ class boss_voice_of_yogg_saron : public CreatureScript BossAI::JustDied(killer); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -584,7 +585,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -614,7 +615,7 @@ class boss_voice_of_yogg_saron : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { switch (summon->GetEntry()) { @@ -650,7 +651,7 @@ class boss_voice_of_yogg_saron : public CreatureScript bool _illusionShattered; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_voice_of_yogg_saronAI>(creature); } @@ -686,7 +687,7 @@ class boss_sara : public CreatureScript _linkData.erase(player1); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (_events.IsInPhase(PHASE_ONE) && damage >= me->GetHealth()) { @@ -704,7 +705,7 @@ class boss_sara : public CreatureScript } } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) OVERRIDE { if (!roll_chance_i(30) || _events.IsInPhase(PHASE_TRANSFORM)) return; @@ -725,13 +726,13 @@ class boss_sara : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER && !me->IsInEvadeMode()) Talk(SAY_SARA_KILL); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_SARA_AGGRO); _events.ScheduleEvent(EVENT_SARAS_FERVOR, 5000, 0, PHASE_ONE); @@ -739,7 +740,7 @@ class boss_sara : public CreatureScript _events.ScheduleEvent(EVENT_SARAS_ANGER, urand(15000, 25000), 0, PHASE_ONE); } - void Reset() + void Reset() OVERRIDE { me->RemoveAllAuras(); me->SetReactState(REACT_PASSIVE); @@ -748,7 +749,7 @@ class boss_sara : public CreatureScript _events.SetPhase(PHASE_ONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) return; @@ -825,7 +826,7 @@ class boss_sara : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->SetReactState(REACT_PASSIVE); @@ -854,7 +855,7 @@ class boss_sara : public CreatureScript voice->AI()->JustSummoned(summon); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -872,7 +873,7 @@ class boss_sara : public CreatureScript std::map<uint64, uint64> _linkData; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_saraAI>(creature); } @@ -887,7 +888,7 @@ class boss_yogg_saron : public CreatureScript { boss_yogg_saronAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.SetPhase(PHASE_TWO); @@ -909,13 +910,13 @@ class boss_yogg_saron : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_IN_THE_MAWS_OF_THE_OLD_GOD) me->AddLootMode(32); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_YOGG_SARON_DEATH); @@ -939,7 +940,7 @@ class boss_yogg_saron : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -975,7 +976,7 @@ class boss_yogg_saron : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -999,7 +1000,7 @@ class boss_yogg_saron : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_yogg_saronAI>(creature); } @@ -1014,14 +1015,14 @@ class boss_brain_of_yogg_saron : public CreatureScript { boss_brain_of_yogg_saronAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()), _summons(creature) { } - void Reset() + void Reset() OVERRIDE { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE); DoCast(me, SPELL_MATCH_HEALTH); _summons.DespawnAll(); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(30, damage) && !me->HasAura(SPELL_BRAIN_HURT_VISUAL)) { @@ -1045,9 +1046,9 @@ class boss_brain_of_yogg_saron : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -1084,7 +1085,7 @@ class boss_brain_of_yogg_saron : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { _summons.Summon(summon); } @@ -1095,7 +1096,7 @@ class boss_brain_of_yogg_saron : public CreatureScript uint8 _tentaclesKilled; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_brain_of_yogg_saronAI>(creature); } @@ -1110,7 +1111,7 @@ class npc_ominous_cloud : public CreatureScript { npc_ominous_cloudAI(Creature* creature) : PassiveAI(creature) { } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_OMINOUS_CLOUD_VISUAL); } @@ -1130,9 +1131,9 @@ class npc_ominous_cloud : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { Movement::MoveSplineInit init(me); FillCirclePath(YoggSaronSpawnPos, me->GetDistance2d(YoggSaronSpawnPos.GetPositionX(), YoggSaronSpawnPos.GetPositionY()), me->GetPositionZ(), init.Path(), action); @@ -1142,7 +1143,7 @@ class npc_ominous_cloud : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_ominous_cloudAI>(creature); } @@ -1157,18 +1158,18 @@ class npc_guardian_of_yogg_saron : public CreatureScript { npc_guardian_of_yogg_saronAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCastAOE(SPELL_SHADOW_NOVA); DoCastAOE(SPELL_SHADOW_NOVA_2); } - void Reset() + void Reset() OVERRIDE { _events.ScheduleEvent(EVENT_DARK_VOLLEY, urand(10000, 15000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1194,7 +1195,7 @@ class npc_guardian_of_yogg_saron : public CreatureScript DoMeleeAttackIfReady(); } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { if (summoner->GetEntry() != NPC_OMINOUS_CLOUD) return; @@ -1209,7 +1210,7 @@ class npc_guardian_of_yogg_saron : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_guardian_of_yogg_saronAI>(creature); } @@ -1227,14 +1228,14 @@ class npc_corruptor_tentacle : public CreatureScript SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_TENTACLE_VOID_ZONE); DoCastAOE(SPELL_ERUPT); _events.ScheduleEvent(EVENT_CAST_RANDOM_SPELL, 1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1266,7 +1267,7 @@ class npc_corruptor_tentacle : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_corruptor_tentacleAI>(creature); } @@ -1284,24 +1285,24 @@ class npc_constrictor_tentacle : public CreatureScript SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_TENTACLE_VOID_ZONE_2); DoCastAOE(SPELL_ERUPT); } - void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) OVERRIDE { if (!apply) passenger->RemoveAurasDueToSpell(SPELL_SQUEEZE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { UpdateVictim(); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { if (Creature* voice = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_VOICE_OF_YOGG_SARON))) voice->AI()->JustSummoned(me); @@ -1311,7 +1312,7 @@ class npc_constrictor_tentacle : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_constrictor_tentacleAI>(creature); } @@ -1329,7 +1330,7 @@ class npc_crusher_tentacle : public CreatureScript SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_CRUSH); DoCast(me, SPELL_TENTACLE_VOID_ZONE); @@ -1340,7 +1341,7 @@ class npc_crusher_tentacle : public CreatureScript _events.ScheduleEvent(EVENT_DIMINISH_POWER, urand(6000, 8000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1372,7 +1373,7 @@ class npc_crusher_tentacle : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_crusher_tentacleAI>(creature); } @@ -1387,24 +1388,24 @@ class npc_influence_tentacle : public CreatureScript { npc_influence_tentacleAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { } - void Reset() + void Reset() OVERRIDE { DoCast(me, me->GetEntry() == NPC_SUIT_OF_ARMOR ? SPELL_NONDESCRIPT_1 : SPELL_NONDESCRIPT_2); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* brain = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_BRAIN_OF_YOGG_SARON))) brain->AI()->DoAction(ACTION_TENTACLE_KILLED); } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} private: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_influence_tentacleAI>(creature); } @@ -1421,7 +1422,7 @@ class npc_descend_into_madness : public CreatureScript { npc_descend_into_madnessAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { } - void OnSpellClick(Unit* clicker, bool& result) + void OnSpellClick(Unit* clicker, bool& result) OVERRIDE { if (!result) return; @@ -1429,13 +1430,13 @@ class npc_descend_into_madness : public CreatureScript me->DespawnOrUnsummon(); } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} private: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_descend_into_madnessAI>(creature); } @@ -1450,20 +1451,20 @@ class npc_immortal_guardian : public CreatureScript { npc_immortal_guardianAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_EMPOWERED); DoCast(me, SPELL_RECENTLY_SPAWNED); _events.ScheduleEvent(EVENT_DRAIN_LIFE, urand(3000, 13000)); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(1, damage)) damage = me->GetHealth() - me->CountPctFromMaxHealth(1); // or set immune to damage? should be done here or in SPELL_WEAKENED spell script? } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1493,7 +1494,7 @@ class npc_immortal_guardian : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_immortal_guardianAI>(creature); } @@ -1508,13 +1509,13 @@ class npc_observation_ring_keeper : public CreatureScript { npc_observation_ring_keeperAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { DoCast(SPELL_SIMPLE_TELEPORT_KEEPERS); // not visible here DoCast(SPELL_KEEPER_ACTIVE); } - void sGossipSelect(Player* player, uint32 sender, uint32 /*action*/) + void sGossipSelect(Player* player, uint32 sender, uint32 /*action*/) OVERRIDE { if (sender != 10333) return; @@ -1542,10 +1543,10 @@ class npc_observation_ring_keeper : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_observation_ring_keeperAI>(creature); } @@ -1560,12 +1561,12 @@ class npc_yogg_saron_keeper : public CreatureScript { npc_yogg_saron_keeperAI(Creature* creature) : ScriptedAI(creature) { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { DoCast(SPELL_SIMPLE_TELEPORT_KEEPERS); } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.SetPhase(PHASE_ONE); @@ -1586,7 +1587,7 @@ class npc_yogg_saron_keeper : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { switch (me->GetEntry()) { @@ -1607,7 +1608,7 @@ class npc_yogg_saron_keeper : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) return; @@ -1632,7 +1633,7 @@ class npc_yogg_saron_keeper : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -1668,7 +1669,7 @@ class npc_yogg_saron_keeper : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_yogg_saron_keeperAI>(creature); } @@ -1683,7 +1684,7 @@ class npc_yogg_saron_illusions : public CreatureScript { npc_yogg_saron_illusionsAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { switch (_instance->GetData(DATA_ILLUSION)) { @@ -1716,7 +1717,7 @@ class npc_yogg_saron_illusions : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -1789,7 +1790,7 @@ class npc_yogg_saron_illusions : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_yogg_saron_illusionsAI>(creature); } @@ -1804,7 +1805,7 @@ class npc_garona : public CreatureScript { npc_garonaAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); @@ -1817,7 +1818,7 @@ class npc_garona : public CreatureScript _events.ScheduleEvent(EVENT_STORMWIND_ROLEPLAY_6, 52700); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -1852,7 +1853,7 @@ class npc_garona : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_garonaAI>(creature); } @@ -1867,12 +1868,12 @@ class npc_turned_champion : public CreatureScript { npc_turned_championAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { DoCast(SPELL_VERTEX_COLOR_BLACK); } - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE || pointId != 0) return; @@ -1880,7 +1881,7 @@ class npc_turned_champion : public CreatureScript me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action != ACTION_START_ROLEPLAY) return; @@ -1890,7 +1891,7 @@ class npc_turned_champion : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_turned_championAI>(creature); } @@ -1905,17 +1906,17 @@ class npc_laughing_skull : public CreatureScript { npc_laughing_skullAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); DoCast(me, SPELL_LUNATIC_GAZE_SKULL); } // don't evade, otherwise the Lunatic Gaze aura is removed - void UpdateAI(uint32 /*diff*/) { } + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_laughing_skullAI>(creature); } @@ -1936,13 +1937,13 @@ class spell_yogg_saron_target_selectors : public SpellScriptLoader // 63744, GetCaster()->CastSpell(target, uint32(GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_target_selectors_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_target_selectors_SpellScript(); } @@ -1988,7 +1989,7 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 { PrepareSpellScript(spell_yogg_saron_psychosis_SpellScript); - bool Load() + bool Load() OVERRIDE { _stacks = GetSpellInfo()->Id == SPELL_PSYCHOSIS ? 9 : 12; return true; @@ -2000,7 +2001,7 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_ILLUSION_ROOM)); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -2008,7 +2009,7 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_psychosis_SpellScript(); } @@ -2032,7 +2033,7 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_ILLUSION_ROOM)); } - void Register() + void Register() OVERRIDE { if (m_scriptSpellId == SPELL_MALADY_OF_THE_MIND) { @@ -2049,7 +2050,7 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 { PrepareAuraScript(spell_yogg_saron_malady_of_the_mind_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MALADY_OF_THE_MIND_JUMP)) return false; @@ -2071,18 +2072,18 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 GetTarget()->CastSpell(GetTarget(), SPELL_MALADY_OF_THE_MIND_JUMP); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_malady_of_the_mind_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_MOD_FEAR, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_malady_of_the_mind_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_malady_of_the_mind_AuraScript(); } @@ -2111,7 +2112,7 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 ai->SetLinkBetween(targets.front()->GetGUID(), targets.back()->GetGUID()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_brain_link_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } @@ -2121,7 +2122,7 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 { PrepareAuraScript(spell_yogg_saron_brain_link_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BRAIN_LINK_DAMAGE)) return false; @@ -2168,19 +2169,19 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 GetTarget()->CastSpell(linked, (GetTarget()->GetDistance(linked) > (float)aurEff->GetAmount()) ? SPELL_BRAIN_LINK_DAMAGE : SPELL_BRAIN_LINK_NO_DAMAGE, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_brain_link_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); OnEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_brain_link_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_brain_link_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_brain_link_AuraScript(); } @@ -2198,13 +2199,13 @@ class spell_yogg_saron_brain_link_damage : public SpellScriptLoader // 6380 PrepareSpellScript(spell_yogg_saron_brain_link_damage_SpellScript); - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_brain_link_damage_SpellScript::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_brain_link_damage_SpellScript(); } @@ -2219,7 +2220,7 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030 { PrepareSpellScript(spell_yogg_saron_boil_ominously_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_GUARDIAN_1)) return false; @@ -2238,13 +2239,13 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030 } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_boil_ominously_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_boil_ominously_SpellScript(); } @@ -2271,14 +2272,14 @@ class spell_yogg_saron_shadow_beacon : public SpellScriptLoader // 64465 target->SetEntry(NPC_IMMORTAL_GUARDIAN); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_shadow_beacon_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_shadow_beacon_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_shadow_beacon_AuraScript(); } @@ -2299,13 +2300,13 @@ class spell_yogg_saron_empowering_shadows_range_check : public SpellScriptLoader target->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_empowering_shadows_range_check_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_empowering_shadows_range_check_SpellScript(); } @@ -2320,7 +2321,7 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader { PrepareSpellScript(spell_yogg_saron_empowering_shadows_missile_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_EMPOWERING_SHADOWS)) return false; @@ -2333,13 +2334,13 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader target->CastSpell((Unit*)NULL, SPELL_EMPOWERING_SHADOWS, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_empowering_shadows_missile_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_empowering_shadows_missile_SpellScript(); } @@ -2355,7 +2356,7 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader // 64 { PrepareAuraScript(spell_yogg_saron_constrictor_tentacle_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CONSTRICTOR_TENTACLE_SUMMON)) return false; @@ -2367,13 +2368,13 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader // 64 GetTarget()->CastSpell(GetTarget(), SPELL_CONSTRICTOR_TENTACLE_SUMMON); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_constrictor_tentacle_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_constrictor_tentacle_AuraScript(); } @@ -2388,7 +2389,7 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 { PrepareSpellScript(spell_yogg_saron_lunge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SQUEEZE)) return false; @@ -2404,13 +2405,13 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_lunge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_lunge_SpellScript(); } @@ -2432,13 +2433,13 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125 vehicle->Kill(vehicle); // should tentacle die or just release its target? } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_squeeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_squeeze_AuraScript(); } @@ -2461,13 +2462,13 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader // 64148 GetTarget()->InterruptSpell(CURRENT_CHANNELED_SPELL); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_yogg_saron_diminsh_power_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_diminsh_power_AuraScript(); } @@ -2483,7 +2484,7 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 { PrepareAuraScript(spell_yogg_saron_empowered_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_EMPOWERED_BUFF)) return false; @@ -2512,14 +2513,14 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 target->CastSpell(target, SPELL_WEAKENED, true); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_empowered_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_empowered_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_empowered_AuraScript(); } @@ -2540,13 +2541,13 @@ class spell_yogg_saron_match_health : public SpellScriptLoader // 64069 target->SetHealth(target->CountPctFromMaxHealth((int32)GetCaster()->GetHealthPct())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_match_health_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_match_health_SpellScript(); } @@ -2567,13 +2568,13 @@ class spell_yogg_saron_shattered_illusion : public SpellScriptLoader // 65238 target->RemoveAurasDueToSpell(uint32(GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_shattered_illusion_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_shattered_illusion_SpellScript(); } @@ -2588,7 +2589,7 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader / { PrepareAuraScript(spell_yogg_saron_death_ray_warning_visual_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DEATH_RAY_PERIODIC)) return false; @@ -2608,13 +2609,13 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader / } } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_death_ray_warning_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_death_ray_warning_visual_AuraScript(); } @@ -2629,7 +2630,7 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader / { PrepareSpellScript(spell_yogg_saron_cancel_illusion_room_aura_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TELEPORT_BACK_TO_MAIN_ROOM)) return false; @@ -2645,13 +2646,13 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader / } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_cancel_illusion_room_aura_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_cancel_illusion_room_aura_SpellScript(); } @@ -2671,13 +2672,13 @@ class spell_yogg_saron_nondescript : public SpellScriptLoader // 64010, 6401 GetTarget()->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_nondescript_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_nondescript_AuraScript(); } @@ -2692,7 +2693,7 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader // 64012 { PrepareSpellScript(spell_yogg_saron_revealed_tentacle_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TENTACLE_VOID_ZONE)) return false; @@ -2711,13 +2712,13 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader // 64012 } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_revealed_tentacle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_revealed_tentacle_SpellScript(); } @@ -2732,7 +2733,7 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 { PrepareAuraScript(spell_yogg_saron_grim_reprisal_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GRIM_REPRISAL_DAMAGE)) return false; @@ -2745,13 +2746,13 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 GetTarget()->CastCustomSpell(SPELL_GRIM_REPRISAL_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetDamageInfo()->GetAttacker(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_yogg_saron_grim_reprisal_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_grim_reprisal_AuraScript(); } @@ -2766,7 +2767,7 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader // 64059 { PrepareSpellScript(spell_yogg_saron_induce_madness_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TELEPORT_BACK_TO_MAIN_ROOM)) return false; @@ -2794,14 +2795,14 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader // 64059 voice->AI()->DoAction(ACTION_TOGGLE_SHATTERED_ILLUSION); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_induce_madness_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); AfterCast += SpellCastFn(spell_yogg_saron_induce_madness_SpellScript::ClearShatteredIllusion); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_induce_madness_SpellScript(); } @@ -2823,7 +2824,7 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 GetSpell()->SetSpellValue(SPELLVALUE_AURA_STACK, 100); } - void Register() + void Register() OVERRIDE { BeforeCast += SpellCastFn(spell_yogg_saron_sanity_SpellScript::ModSanityStacks); } @@ -2833,7 +2834,7 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 { PrepareAuraScript(spell_yogg_saron_sanity_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LOW_SANITY_SCREEN_EFFECT)) return false; @@ -2865,19 +2866,19 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 caster->CastSpell(GetTarget(), SPELL_INSANE, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_sanity_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_sanity_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_sanity_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_sanity_AuraScript(); } @@ -2892,7 +2893,7 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 { PrepareAuraScript(spell_yogg_saron_insane_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_INSANE_VISUAL)) return false; @@ -2914,14 +2915,14 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 GetTarget()->Kill(GetTarget()); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_insane_AuraScript::OnApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_insane_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_insane_AuraScript(); } @@ -2942,13 +2943,13 @@ class spell_yogg_saron_insane_periodic : public SpellScriptLoader // 64555 GetCaster()->CastSpell(target, uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_insane_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_insane_periodic_SpellScript(); } @@ -2977,7 +2978,7 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 { PrepareSpellScript(spell_yogg_saron_lunatic_gaze_SpellScript); - bool Load() + bool Load() OVERRIDE { _stacks = GetSpellInfo()->Id == SPELL_LUNATIC_GAZE_DAMAGE ? 4 : 2; return true; @@ -2988,7 +2989,7 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 targets.remove_if(LunaticGazeTargetSelector(GetCaster())); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); @@ -2996,7 +2997,7 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_lunatic_gaze_SpellScript(); } @@ -3018,13 +3019,13 @@ class spell_yogg_saron_keeper_aura : public SpellScriptLoader // 62650, 6267 return true; } - void Register() + void Register() OVERRIDE { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_yogg_saron_keeper_aura_AuraScript::CanApply); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_keeper_aura_AuraScript(); } @@ -3046,13 +3047,13 @@ class spell_yogg_saron_hate_to_zero : public SpellScriptLoader // 63984 target->getThreatManager().modifyThreatPercent(GetCaster(), -100); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_hate_to_zero_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_hate_to_zero_SpellScript(); } @@ -3082,13 +3083,13 @@ class spell_yogg_saron_in_the_maws_of_the_old_god : public SpellScriptLoader return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript(); } @@ -3109,13 +3110,13 @@ class spell_yogg_saron_titanic_storm : public SpellScriptLoader // 64172 GetCaster()->Kill(target); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_titanic_storm_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_yogg_saron_titanic_storm_SpellScript(); } @@ -3130,7 +3131,7 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader // { PrepareAuraScript(spell_yogg_saron_hodirs_protective_gaze_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FLASH_FREEZE)) return false; @@ -3156,14 +3157,14 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader // PreventDefaultAction(); } - void Register() + void Register() OVERRIDE { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_yogg_saron_hodirs_protective_gaze_AuraScript::CanApply); OnEffectAbsorb += AuraEffectAbsorbFn(spell_yogg_saron_hodirs_protective_gaze_AuraScript::OnAbsorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_yogg_saron_hodirs_protective_gaze_AuraScript(); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 4f7cbbff099..fc5a54ffcfb 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -763,7 +763,7 @@ class instance_ulduar : public InstanceMapScript return true; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -811,11 +811,11 @@ class instance_ulduar : public InstanceMapScript } } - void SetData64(uint32 /*type*/, uint64 /*data*/) + void SetData64(uint32 /*type*/, uint64 /*data*/) OVERRIDE { } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -929,7 +929,7 @@ class instance_ulduar : public InstanceMapScript return 0; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -1104,7 +1104,7 @@ class instance_ulduar : public InstanceMapScript uint32 _maxWeaponItemLevel; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_ulduar_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp index e5c617ff786..054a32a75d2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar_teleporter.cpp @@ -50,7 +50,7 @@ class ulduar_teleporter : public GameObjectScript public: ulduar_teleporter() : GameObjectScript("ulduar_teleporter") { } - bool OnGossipSelect(Player* player, GameObject* /*gameObject*/, uint32 sender, uint32 action) + bool OnGossipSelect(Player* player, GameObject* /*gameObject*/, uint32 sender, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (sender != GOSSIP_SENDER_MAIN) @@ -93,7 +93,7 @@ class ulduar_teleporter : public GameObjectScript return true; } - bool OnGossipHello(Player* player, GameObject* gameObject) + bool OnGossipHello(Player* player, GameObject* gameObject) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Expedition Base Camp", GOSSIP_SENDER_MAIN, BASE_CAMP); if (InstanceScript* instance = gameObject->GetInstanceScript()) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 6dcd915e4ee..3dd84c62890 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -28,7 +28,6 @@ EndScriptData */ enum Yells { - //Yells Ingvar YELL_AGGRO_1 = 0, YELL_KILL_1 = 1, YELL_DEAD_1 = 2, @@ -43,6 +42,7 @@ enum Creatures NPC_INGVAR_HUMAN = 23954, NPC_ANNHYLDE_THE_CALLER = 24068, NPC_INGVAR_UNDEAD = 23980, + NPC_THROW_TARGET = 23996, }; enum Events @@ -69,7 +69,7 @@ enum Phases enum Spells { - //Ingvar Spells human form + // Ingvar Spells human form SPELL_CLEAVE = 42724, SPELL_SMASH = 42669, SPELL_STAGGERING_ROAR = 42708, @@ -79,13 +79,18 @@ enum Spells SPELL_SUMMON_BANSHEE = 42912, SPELL_SCOURG_RESURRECTION = 42863, // Spawn resurrect effect around Ingvar - //Ingvar Spells undead form + // Ingvar Spells undead form SPELL_DARK_SMASH = 42723, SPELL_DREADFUL_ROAR = 42729, SPELL_WOE_STRIKE = 42730, - ENTRY_THROW_TARGET = 23996, - SPELL_SHADOW_AXE_SUMMON = 42748 + SPELL_SHADOW_AXE_SUMMON = 42748, + + // Spells for Annhylde + SPELL_SCOURG_RESURRECTION_HEAL = 42704, // Heal Max + DummyAura + SPELL_SCOURG_RESURRECTION_BEAM = 42857, // Channeling Beam of Annhylde + SPELL_SCOURG_RESURRECTION_DUMMY = 42862, // Some Emote Dummy? + SPELL_INGVAR_TRANSFORM = 42796 }; class boss_ingvar_the_plunderer : public CreatureScript @@ -93,7 +98,7 @@ class boss_ingvar_the_plunderer : public CreatureScript public: boss_ingvar_the_plunderer() : CreatureScript("boss_ingvar_the_plunderer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ingvar_the_plundererAI(creature); } @@ -110,7 +115,7 @@ public: bool bIsUndead; - void Reset() + void Reset() OVERRIDE { if (bIsUndead) me->UpdateEntry(NPC_INGVAR_HUMAN); @@ -132,7 +137,7 @@ public: instance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && !bIsUndead) { @@ -166,7 +171,7 @@ public: Talk(YELL_AGGRO_2); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!bIsUndead) Talk(YELL_AGGRO_1); @@ -177,7 +182,7 @@ public: me->SetInCombatWithZone(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(YELL_DEAD_2); @@ -198,12 +203,12 @@ public: events.ScheduleEvent(EVENT_SHADOW_AXE, 30*IN_MILLISECONDS, 0, PHASE_UNDEAD); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(bIsUndead ? YELL_KILL_1 : YELL_KILL_2); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() && !events.IsInPhase(PHASE_EVENT)) return; @@ -274,26 +279,15 @@ public: }; -enum eSpells -{ -//we don't have that text in db so comment it until we get this text -// YELL_RESSURECT = -1574025, - -//Spells for Annhylde - SPELL_SCOURG_RESURRECTION_HEAL = 42704, //Heal Max + DummyAura - SPELL_SCOURG_RESURRECTION_BEAM = 42857, //Channeling Beam of Annhylde - SPELL_SCOURG_RESURRECTION_DUMMY = 42862, //Some Emote Dummy? - SPELL_INGVAR_TRANSFORM = 42796 -}; class npc_annhylde_the_caller : public CreatureScript { public: npc_annhylde_the_caller() : CreatureScript("npc_annhylde_the_caller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_annhylde_the_callerAI (creature); + return new npc_annhylde_the_callerAI(creature); } struct npc_annhylde_the_callerAI : public ScriptedAI @@ -308,7 +302,7 @@ public: uint32 uiResurectTimer; uint32 uiResurectPhase; - void Reset() + void Reset() OVERRIDE { //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->SetHover(true); @@ -325,7 +319,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -350,10 +344,11 @@ public: } } - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void UpdateAI(uint32 diff) OVERRIDE { if (uiResurectTimer) { @@ -391,7 +386,7 @@ public: }; }; -enum eShadowAxe +enum ShadowAxe { SPELL_SHADOW_AXE_DAMAGE = 42750, H_SPELL_SHADOW_AXE_DAMAGE = 59719, @@ -403,9 +398,9 @@ class npc_ingvar_throw_dummy : public CreatureScript public: npc_ingvar_throw_dummy() : CreatureScript("npc_ingvar_throw_dummy") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_ingvar_throw_dummyAI (creature); + return new npc_ingvar_throw_dummyAI(creature); } struct npc_ingvar_throw_dummyAI : public ScriptedAI @@ -414,9 +409,9 @@ public: { } - void Reset() + void Reset() OVERRIDE { - if (Creature* target = me->FindNearestCreature(ENTRY_THROW_TARGET, 50.0f)) + if (Creature* target = me->FindNearestCreature(NPC_THROW_TARGET, 50.0f)) { float x, y, z; target->GetPosition(x, y, z); @@ -424,12 +419,10 @@ public: target->DisappearAndDie(); } else - { me->DisappearAndDie(); - } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == EFFECT_MOTION_TYPE && id == POINT_TARGET) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 90a1a3b1d69..6c7bf6afbe0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -78,7 +78,7 @@ class npc_frost_tomb : public CreatureScript public: npc_frost_tomb() : CreatureScript("npc_frost_tomb") {} - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frost_tombAI(creature); } @@ -94,9 +94,9 @@ public: instance = creature->GetInstanceScript(); } - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) if (Unit* boss = me->GetUnit(*me, instance->GetData64(DATA_PRINCEKELESETH))) @@ -114,16 +114,16 @@ class boss_keleseth : public CreatureScript public: boss_keleseth() : CreatureScript("boss_keleseth") {} - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_kelesethAI (creature); + return new boss_kelesethAI(creature); } struct boss_kelesethAI : public BossAI { boss_kelesethAI(Creature* creature) : BossAI(creature, DATA_PRINCEKELESETH_EVENT){} - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED); @@ -138,7 +138,7 @@ public: onTheRocks = true; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { me->SetInCombatWithZone(); if (instance) @@ -171,7 +171,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); @@ -179,13 +179,13 @@ public: Talk(SAY_DEATH); } - void SetData(uint32 data, uint32 value) + void SetData(uint32 data, uint32 value) OVERRIDE { if (data == DATA_ON_THE_ROCKS) onTheRocks = value; } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { if (data == DATA_ON_THE_ROCKS) return onTheRocks; @@ -193,7 +193,7 @@ public: return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -249,23 +249,23 @@ class npc_vrykul_skeleton : public CreatureScript public: npc_vrykul_skeleton() : CreatureScript("npc_vrykul_skeleton") {} - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_vrykul_skeletonAI (creature); + return new npc_vrykul_skeletonAI(creature); } struct npc_vrykul_skeletonAI : public ScriptedAI { npc_vrykul_skeletonAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_DECREPIFY, urand(4, 6)*IN_MILLISECONDS); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -288,7 +288,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -355,13 +355,13 @@ class spell_frost_tomb : public SpellScriptLoader caster->ToCreature()->DespawnOrUnsummon(1000); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_frost_tomb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_frost_tomb_AuraScript(); } @@ -373,7 +373,7 @@ class achievement_on_the_rocks : public AchievementCriteriaScript public: achievement_on_the_rocks() : AchievementCriteriaScript("achievement_on_the_rocks") {} - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { return target && target->IsAIEnabled && target->GetAI()->GetData(DATA_ON_THE_ROCKS); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 77935949957..4ece79b0f7f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -26,36 +26,43 @@ EndScriptData */ #include "ScriptedCreature.h" #include "utgarde_keep.h" -enum eEnums +enum Yells { - //signed for 24200, but used by 24200, 27390 + // signed for 24200, but used by 24200, 27390 YELL_SKARVALD_AGGRO = 0, YELL_SKARVALD_DAL_DIED = 1, YELL_SKARVALD_SKA_DIEDFIRST = 2, YELL_SKARVALD_KILL = 3, YELL_SKARVALD_DAL_DIEDFIRST = 4, - //signed for 24201, but used by 24201, 27389 + // signed for 24201, but used by 24201, 27389 YELL_DALRONN_AGGRO = 0, YELL_DALRONN_SKA_DIED = 1, YELL_DALRONN_DAL_DIEDFIRST = 2, YELL_DALRONN_KILL = 3, - YELL_DALRONN_SKA_DIEDFIRST = 4, + YELL_DALRONN_SKA_DIEDFIRST = 4 +}; -//Spells of Skarvald and his Ghost - NPC_SKARVALD_THE_CONSTRUCTOR = 24200, +enum Spells +{ + // Spells of Skarvald and his Ghost SPELL_CHARGE = 43651, SPELL_STONE_STRIKE = 48583, SPELL_SUMMON_SKARVALD_GHOST = 48613, SPELL_ENRAGE = 48193, - NPC_SKARVALD_GHOST = 27390, -//Spells of Dalronn and his Ghost - NPC_DALRONN_THE_CONTROLLER = 24201, + // Spells of Dalronn and his Ghost SPELL_SHADOW_BOLT = 43649, H_SPELL_SHADOW_BOLT = 59575, H_SPELL_SUMMON_SKELETONS = 52611, SPELL_DEBILITATE = 43650, SPELL_SUMMON_DALRONN_GHOST = 48612, +}; + +enum Creatures +{ + NPC_SKARVALD_THE_CONSTRUCTOR = 24200, + NPC_SKARVALD_GHOST = 27390, + NPC_DALRONN_THE_CONTROLLER = 24201, NPC_DALRONN_GHOST = 27389 }; @@ -78,9 +85,9 @@ class boss_skarvald_the_constructor : public CreatureScript public: boss_skarvald_the_constructor() : CreatureScript("boss_skarvald_the_constructor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_skarvald_the_constructorAI (creature); + return new boss_skarvald_the_constructorAI(creature); } struct boss_skarvald_the_constructorAI : public ScriptedAI @@ -100,7 +107,7 @@ public: bool Dalronn_isDead; bool Enraged; - void Reset() + void Reset() OVERRIDE { Charge_Timer = 5000; StoneStrike_Timer = 10000; @@ -119,7 +126,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!ghost && instance) { @@ -133,7 +140,7 @@ public: } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (!Enraged && !ghost && me->HealthBelowPctDamaged(15, damage)) { @@ -142,7 +149,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!ghost && instance) { @@ -172,7 +179,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!ghost) { @@ -180,7 +187,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ghost) { @@ -242,9 +249,9 @@ class boss_dalronn_the_controller : public CreatureScript public: boss_dalronn_the_controller() : CreatureScript("boss_dalronn_the_controller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_dalronn_the_controllerAI (creature); + return new boss_dalronn_the_controllerAI(creature); } struct boss_dalronn_the_controllerAI : public ScriptedAI @@ -266,7 +273,7 @@ public: uint32 AggroYell_Timer; bool Skarvald_isDead; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 1000; Debilitate_Timer = 5000; @@ -286,7 +293,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!ghost && instance) { @@ -301,7 +308,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!ghost && instance) { @@ -332,7 +339,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!ghost) { @@ -340,7 +347,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ghost) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 536e7293b69..ad7817daeb0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -55,7 +55,7 @@ class instance_utgarde_keep : public InstanceMapScript public: instance_utgarde_keep() : InstanceMapScript("instance_utgarde_keep", 574) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_utgarde_keep_InstanceMapScript(map); } @@ -166,7 +166,7 @@ public: } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -179,7 +179,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -247,7 +247,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 914d276f696..9c086d8bd81 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -33,7 +33,7 @@ class npc_dragonflayer_forge_master : public CreatureScript public: npc_dragonflayer_forge_master() : CreatureScript("npc_dragonflayer_forge_master") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dragonflayer_forge_masterAI(creature); } @@ -49,7 +49,7 @@ public: InstanceScript* instance; uint8 fm_Type; - void Reset() + void Reset() OVERRIDE { if (fm_Type == 0) fm_Type = GetForgeMasterType(); @@ -78,7 +78,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (fm_Type == 0) fm_Type = GetForgeMasterType(); @@ -102,7 +102,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (fm_Type == 0) fm_Type = GetForgeMasterType(); @@ -146,7 +146,7 @@ public: return near_f > 0 && near_f < 4 ? near_f : 0; } - void UpdateAI(uint32 /* diff */) + void UpdateAI(uint32 /* diff */) OVERRIDE { if (fm_Type == 0) fm_Type = GetForgeMasterType(); @@ -172,7 +172,7 @@ class spell_ticking_time_bomb : public SpellScriptLoader { PrepareAuraScript(spell_ticking_time_bomb_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { return (bool) sSpellMgr->GetSpellInfo(SPELL_TICKING_TIME_BOMB_EXPLODE); } @@ -185,13 +185,13 @@ class spell_ticking_time_bomb : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_ticking_time_bomb_AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ticking_time_bomb_AuraScript(); } @@ -210,7 +210,7 @@ class spell_fixate : public SpellScriptLoader { PrepareSpellScript(spell_fixate_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { return (bool) sSpellMgr->GetSpellInfo(SPELL_FIXATE_TRIGGER); } @@ -221,13 +221,13 @@ class spell_fixate : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_FIXATE_TRIGGER, true, 0, 0, GetHitUnit()->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_fixate_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_fixate_SpellScript(); } @@ -265,7 +265,7 @@ public: _setData = false; } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_REND, urand(2000, 3000)); @@ -273,7 +273,7 @@ public: _events.ScheduleEvent(EVENT_KNOCKAWAY, urand(3500, 6000)); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == WAYPOINT_MOTION_TYPE && id == POINT_LAST) { @@ -281,7 +281,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == TYPE_PROTODRAKE_AT && data == DATA_PROTODRAKE_MOVE && !_setData && me->GetDistance(protodrakeCheckPos) < 5.0f) { @@ -291,7 +291,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -331,7 +331,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enslaved_proto_drakeAI(creature); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 73ff0075aba..b0d9d702db5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -18,17 +18,20 @@ #ifndef DEF_UTGARDE_KEEP_H #define DEF_UTGARDE_KEEP_H -#define DATA_PRINCEKELESETH 1 -#define DATA_SKARVALD 3 -#define DATA_DALRONN 4 -#define DATA_INGVAR 6 +enum DataTypes +{ + DATA_PRINCEKELESETH = 1, + DATA_SKARVALD = 3, + DATA_DALRONN = 4, + DATA_INGVAR = 6, -#define DATA_PRINCEKELESETH_EVENT 2 -#define DATA_SKARVALD_DALRONN_EVENT 5 -#define DATA_INGVAR_EVENT 7 + DATA_PRINCEKELESETH_EVENT = 2, + DATA_SKARVALD_DALRONN_EVENT = 5, + DATA_INGVAR_EVENT = 7, -#define EVENT_FORGE_1 8 -#define EVENT_FORGE_2 9 -#define EVENT_FORGE_3 10 + EVENT_FORGE_1 = 8, + EVENT_FORGE_2 = 9, + EVENT_FORGE_3 = 10 +}; #endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index c1d12c63a0b..0cf7636a86e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -88,9 +88,9 @@ class boss_palehoof : public CreatureScript public: boss_palehoof() : CreatureScript("boss_palehoof") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_palehoofAI (creature); + return new boss_palehoofAI(creature); } struct boss_palehoofAI : public ScriptedAI @@ -110,7 +110,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { /// There is a good reason to store them like this, we are going to shuffle the order. for (uint32 i = PHASE_FRENZIED_WORGEN; i < PHASE_GORTOK_PALEHOOF; ++i) @@ -158,12 +158,12 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -180,7 +180,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (currentPhase != PHASE_GORTOK_PALEHOOF) return; @@ -215,7 +215,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { //Talk(SAY_DEATH); if (instance) @@ -225,7 +225,7 @@ public: temp->DisappearAndDie(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } @@ -253,7 +253,7 @@ public: currentPhase = move; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NOT_ATTACKABLE_1|UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -277,9 +277,9 @@ class npc_ravenous_furbolg : public CreatureScript public: npc_ravenous_furbolg() : CreatureScript("npc_ravenous_furbolg") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_ravenous_furbolgAI (creature); + return new npc_ravenous_furbolgAI(creature); } struct npc_ravenous_furbolgAI : public ScriptedAI @@ -295,7 +295,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiChainLightingTimer = 5000; uiCrazedTimer = 10000; @@ -312,7 +312,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -339,7 +339,7 @@ public: DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -356,7 +356,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -366,7 +366,7 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -390,9 +390,9 @@ class npc_frenzied_worgen : public CreatureScript public: npc_frenzied_worgen() : CreatureScript("npc_frenzied_worgen") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_frenzied_worgenAI (creature); + return new npc_frenzied_worgenAI(creature); } struct npc_frenzied_worgenAI : public ScriptedAI @@ -408,7 +408,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiMortalWoundTimer = 5000; uiEnrage1Timer = 15000; @@ -425,7 +425,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -452,7 +452,7 @@ public: DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -471,7 +471,7 @@ public: instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -481,7 +481,7 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -506,9 +506,9 @@ class npc_ferocious_rhino : public CreatureScript public: npc_ferocious_rhino() : CreatureScript("npc_ferocious_rhino") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_ferocious_rhinoAI (creature); + return new npc_ferocious_rhinoAI(creature); } struct npc_ferocious_rhinoAI : public ScriptedAI @@ -524,7 +524,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiStompTimer = 10000; uiGoreTimer = 15000; @@ -541,7 +541,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -569,7 +569,7 @@ public: DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -586,7 +586,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -596,7 +596,7 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -626,9 +626,9 @@ class npc_massive_jormungar : public CreatureScript public: npc_massive_jormungar() : CreatureScript("npc_massive_jormungar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_massive_jormungarAI (creature); + return new npc_massive_jormungarAI(creature); } struct npc_massive_jormungarAI : public ScriptedAI @@ -644,7 +644,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiAcidSpitTimer = 3000; uiAcidSplatterTimer = 12000; @@ -661,7 +661,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -690,7 +690,7 @@ public: DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -707,7 +707,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -717,7 +717,7 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_IMMUNE_TO_PC); me->SetStandState(UNIT_STAND_STATE_STAND); @@ -732,9 +732,9 @@ class npc_palehoof_orb : public CreatureScript public: npc_palehoof_orb() : CreatureScript("npc_palehoof_orb") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_palehoof_orbAI (creature); + return new npc_palehoof_orbAI(creature); } struct npc_palehoof_orbAI : public ScriptedAI @@ -748,7 +748,7 @@ public: uint32 SummonTimer; Phase currentPhase; - void Reset() + void Reset() OVERRIDE { currentPhase = PHASE_NONE; SummonTimer = 5000; @@ -758,7 +758,7 @@ public: me->SetSpeed(MOVE_FLIGHT, 0.5f); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (currentPhase == PHASE_NONE) return; @@ -792,7 +792,7 @@ public: } else SummonTimer -= diff; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -822,7 +822,7 @@ class go_palehoof_sphere : public GameObjectScript public: go_palehoof_sphere() : GameObjectScript("go_palehoof_sphere") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 3a74eebd947..08670af939a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -31,8 +31,7 @@ Script Data End */ #include "Player.h" #include "SpellInfo.h" -//Yell -enum eYells +enum Yells { SAY_AGGRO = 0, SAY_KILL = 1, @@ -124,15 +123,15 @@ static Position Location[]= {413.9327f, -540.9407f, 138.2614f, 0}, //71 }; -enum eCombatPhase +enum CombatPhase { FLYING, SKADI }; -enum eSpells +enum Spells { - //Skadi Spells + // Skadi Spells SPELL_CRUSH = 50234, SPELL_POISONED_SPEAR = 50225, //isn't being casted =/ SPELL_WHIRLWIND = 50228, //random target, but not the tank approx. every 20s @@ -141,17 +140,17 @@ enum eSpells SPELL_FREEZING_CLOUD = 47579, }; -enum eCreature +enum Creatures { - CREATURE_YMIRJAR_WARRIOR = 26690, - CREATURE_YMIRJAR_WITCH_DOCTOR = 26691, - CREATURE_YMIRJAR_HARPOONER = 26692, - CREATURE_GRAUF = 26893, - CREATURE_TRIGGER = 28351, + NPC_YMIRJAR_WARRIOR = 26690, + NPC_YMIRJAR_WITCH_DOCTOR = 26691, + NPC_YMIRJAR_HARPOONER = 26692, + NPC_GRAUF = 26893, + NPC_TRIGGER = 28351, DATA_MOUNT = 27043, }; -enum eAchievments +enum Achievments { ACHIEV_TIMED_START_EVENT = 17726, }; @@ -161,9 +160,9 @@ class boss_skadi : public CreatureScript public: boss_skadi() : CreatureScript("boss_skadi") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_skadiAI (creature); + return new boss_skadiAI(creature); } struct boss_skadiAI : public ScriptedAI @@ -189,9 +188,9 @@ public: uint8 m_uiSpellHitCount; bool m_bSaidEmote; - eCombatPhase Phase; + CombatPhase Phase; - void Reset() + void Reset() OVERRIDE { triggersGUID.clear(); @@ -208,7 +207,7 @@ public: Summons.DespawnAll(); me->SetSpeed(MOVE_FLIGHT, 3.0f); if ((Unit::GetCreature(*me, m_uiGraufGUID) == NULL) && !me->IsMounted()) - me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); + me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); if (instance) { instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, NOT_STARTED); @@ -216,16 +215,16 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetCanFly(false); me->Dismount(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); if (!Unit::GetCreature(*me, m_uiGraufGUID)) - me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); + me->SummonCreature(NPC_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -243,26 +242,26 @@ public: me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f); me->SetWalk(false); m_uiMountTimer = 1000; - Summons.DespawnEntry(CREATURE_GRAUF); + Summons.DespawnEntry(NPC_GRAUF); } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { - case CREATURE_GRAUF: + case NPC_GRAUF: m_uiGraufGUID = summoned->GetGUID(); break; - case CREATURE_YMIRJAR_WARRIOR: - case CREATURE_YMIRJAR_WITCH_DOCTOR: - case CREATURE_YMIRJAR_HARPOONER: + case NPC_YMIRJAR_WARRIOR: + case NPC_YMIRJAR_WITCH_DOCTOR: + case NPC_YMIRJAR_HARPOONER: summoned->setActive(true); summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); break; - case CREATURE_TRIGGER: + case NPC_TRIGGER: summoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); summoned->DespawnOrUnsummon(10*IN_MILLISECONDS); break; @@ -270,14 +269,14 @@ public: Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { - if (summoned->GetEntry() == CREATURE_GRAUF) + if (summoned->GetEntry() == NPC_GRAUF) m_uiGraufGUID = 0; Summons.Despawn(summoned); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_HARPOON_DAMAGE) { @@ -287,7 +286,7 @@ public: Phase = SKADI; me->SetCanFly(false); me->Dismount(); - if (Creature* pGrauf = me->SummonCreature(CREATURE_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) + if (Creature* pGrauf = me->SummonCreature(NPC_GRAUF, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 3*IN_MILLISECONDS)) { pGrauf->GetMotionMaster()->MoveFall(); pGrauf->HandleEmoteCommand(EMOTE_ONESHOT_FLYDEATH); @@ -303,7 +302,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { switch (Phase) { @@ -408,7 +407,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); Summons.DespawnAll(); @@ -416,7 +415,7 @@ public: instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } @@ -428,15 +427,15 @@ public: switch (urand(0, 2)) { case 0: - me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: - me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 2: - me->SummonCreature(CREATURE_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + me->SummonCreature(NPC_YMIRJAR_HARPOONER, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; } } @@ -459,7 +458,7 @@ public: break; } for (uint32 i = iStart; i < iEnd; ++i) - me->SummonCreature(CREATURE_TRIGGER, Location[i]); + me->SummonCreature(NPC_TRIGGER, Location[i]); } }; @@ -470,7 +469,7 @@ class go_harpoon_launcher : public GameObjectScript public: go_harpoon_launcher() : GameObjectScript("go_harpoon_launcher") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index bd08a27d49d..b8fa87106a4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -73,19 +73,18 @@ enum Yells enum Creatures { - CREATURE_ARTHAS = 29280, // Image of Arthas - CREATURE_SVALA_SORROWGRAVE = 26668, // Svala after transformation - CREATURE_SVALA = 29281, // Svala before transformation - CREATURE_RITUAL_CHANNELER = 27281, - CREATURE_SPECTATOR = 26667, - CREATURE_RITUAL_TARGET = 27327, - CREATURE_FLAME_BRAZIER = 27273, - CREATURE_SCOURGE_HULK = 26555 + NPC_ARTHAS = 29280, // Image of Arthas + NPC_SVALA_SORROWGRAVE = 26668, // Svala after transformation + NPC_RITUAL_CHANNELER = 27281, + NPC_SPECTATOR = 26667, + NPC_RITUAL_TARGET = 27327, + NPC_FLAME_BRAZIER = 27273, + NPC_SCOURGE_HULK = 26555 }; -enum Objects +enum GameObjects { - OBJECT_UTGARDE_MIRROR = 191745 + GO_UTGARDE_MIRROR = 191745 }; enum SvalaPhase @@ -97,7 +96,10 @@ enum SvalaPhase SVALADEAD }; -#define DATA_INCREDIBLE_HULK 2043 +enum Misc +{ + DATA_INCREDIBLE_HULK = 2043 +}; static const float spectatorWP[2][3] = { @@ -112,9 +114,9 @@ class boss_svala : public CreatureScript public: boss_svala() : CreatureScript("boss_svala") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_svalaAI (creature); + return new boss_svalaAI(creature); } struct boss_svalaAI : public ScriptedAI @@ -148,7 +150,7 @@ public: bool sacrificed; - void Reset() + void Reset() OVERRIDE { sacrificed = false; SetCombatMovement(true); @@ -172,7 +174,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -183,20 +185,21 @@ public: instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { - if (summon->GetEntry() == CREATURE_RITUAL_CHANNELER) + if (summon->GetEntry() == NPC_RITUAL_CHANNELER) summon->CastSpell(summon, SPELL_SUMMONED_VIS, true); summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who) return; @@ -206,10 +209,10 @@ public: Phase = INTRO; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (GameObject* mirror = GetClosestGameObjectWithEntry(me, OBJECT_UTGARDE_MIRROR, 100.0f)) + if (GameObject* mirror = GetClosestGameObjectWithEntry(me, GO_UTGARDE_MIRROR, 100.0f)) mirror->SetGoState(GO_STATE_READY); - if (Creature* arthas = me->SummonCreature(CREATURE_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) + if (Creature* arthas = me->SummonCreature(NPC_ARTHAS, ArthasPos, TEMPSUMMON_MANUAL_DESPAWN)) { arthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); arthasGUID = arthas->GetGUID(); @@ -217,13 +220,13 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim != me) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Phase == SACRIFICING) SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE); @@ -238,7 +241,7 @@ public: Talk(SAY_DEATH); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_RITUAL_STRIKE_EFF_1 && Phase != NORMAL && Phase != SVALADEAD) { @@ -250,7 +253,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Phase == IDLE) return; @@ -284,7 +287,7 @@ public: if (instance) { std::list<Creature*> lspectatorList; - GetCreatureListWithEntryInGrid(lspectatorList, me, CREATURE_SPECTATOR, 100.0f); + GetCreatureListWithEntryInGrid(lspectatorList, me, NPC_SPECTATOR, 100.0f); for (std::list<Creature*>::iterator itr = lspectatorList.begin(); itr != lspectatorList.end(); ++itr) { if ((*itr)->IsAlive()) @@ -307,7 +310,7 @@ public: me->CastSpell(me, SPELL_SVALA_TRANSFORMING2, false); arthas->InterruptNonMeleeSpells(true); me->RemoveAllAuras(); - me->UpdateEntry(CREATURE_SVALA_SORROWGRAVE); + me->UpdateEntry(NPC_SVALA_SORROWGRAVE); me->SetFacingToObject(arthas); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ++introPhase; @@ -342,7 +345,7 @@ public: introTimer = 3000; break; case 9: - if (GameObject* mirror = GetClosestGameObjectWithEntry(me, OBJECT_UTGARDE_MIRROR, 100.0f)) + if (GameObject* mirror = GetClosestGameObjectWithEntry(me, GO_UTGARDE_MIRROR, 100.0f)) mirror->SetGoState(GO_STATE_ACTIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); arthas->DespawnOrUnsummon(); @@ -453,7 +456,7 @@ class npc_ritual_channeler : public CreatureScript public: npc_ritual_channeler() : CreatureScript("npc_ritual_channeler") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ritual_channelerAI(creature); } @@ -470,7 +473,7 @@ public: InstanceScript* instance; uint32 paralyzeTimer; - void Reset() + void Reset() OVERRIDE { paralyzeTimer = 1600; if (instance) @@ -478,7 +481,7 @@ public: DoCast(me, SPELL_SHADOWS_IN_THE_DARK); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -502,7 +505,7 @@ class npc_spectator : public CreatureScript public: npc_spectator() : CreatureScript("npc_spectator") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spectatorAI(creature); } @@ -511,9 +514,9 @@ public: { npc_spectatorAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} - void MovementInform(uint32 motionType, uint32 pointId) + void MovementInform(uint32 motionType, uint32 pointId) OVERRIDE { if (motionType == POINT_MOTION_TYPE) { @@ -558,13 +561,13 @@ class spell_paralyze_pinnacle : public SpellScriptLoader unitList.remove_if(RitualTargetCheck(GetCaster())); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_paralyze_pinnacle_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_paralyze_pinnacle_SpellScript(); } @@ -582,25 +585,25 @@ class npc_scourge_hulk : public CreatureScript uint32 mightyBlow; uint32 volatileInfection; - void Reset() + void Reset() OVERRIDE { mightyBlow = urand(4000, 9000); volatileInfection = urand(10000, 14000); killedByRitualStrike = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { return type == DATA_INCREDIBLE_HULK ? killedByRitualStrike : 0; } - void DamageTaken(Unit* attacker, uint32 &damage) + void DamageTaken(Unit* attacker, uint32 &damage) OVERRIDE { - if (damage >= me->GetHealth() && attacker->GetEntry() == CREATURE_SVALA_SORROWGRAVE) + if (damage >= me->GetHealth() && attacker->GetEntry() == NPC_SVALA_SORROWGRAVE) killedByRitualStrike = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -630,7 +633,7 @@ class npc_scourge_hulk : public CreatureScript bool killedByRitualStrike; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scourge_hulkAI(creature); } @@ -641,7 +644,7 @@ class achievement_incredible_hulk : public AchievementCriteriaScript public: achievement_incredible_hulk() : AchievementCriteriaScript("achievement_incredible_hulk") { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { return target && target->IsAIEnabled && target->GetAI()->GetData(DATA_INCREDIBLE_HULK); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 6097e1ab84b..a54a1b6bec7 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -66,16 +66,16 @@ enum Yells enum Creatures { - CREATURE_BJORN = 27303, - CREATURE_BJORN_VISUAL = 27304, - CREATURE_HALDOR = 27307, - CREATURE_HALDOR_VISUAL = 27310, - CREATURE_RANULF = 27308, - CREATURE_RANULF_VISUAL = 27311, - CREATURE_TORGYN = 27309, - CREATURE_TORGYN_VISUAL = 27312, - CREATURE_SPIRIT_FOUNT = 27339, - CREATURE_AVENGING_SPIRIT = 27386 + NPC_BJORN = 27303, + NPC_BJORN_VISUAL = 27304, + NPC_HALDOR = 27307, + NPC_HALDOR_VISUAL = 27310, + NPC_RANULF = 27308, + NPC_RANULF_VISUAL = 27311, + NPC_TORGYN = 27309, + NPC_TORGYN_VISUAL = 27312, + NPC_SPIRIT_FOUNT = 27339, + NPC_AVENGING_SPIRIT = 27386 }; struct ActiveBoatStruct @@ -87,20 +87,23 @@ struct ActiveBoatStruct static ActiveBoatStruct ActiveBoat[4] = { - {CREATURE_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, - {CREATURE_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, - {CREATURE_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, - {CREATURE_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} + {NPC_BJORN_VISUAL, SAY_SUMMON_BJORN, 404.379f, -335.335f, 104.756f, 413.594f, -335.408f, 107.995f, 3.157f}, + {NPC_HALDOR_VISUAL, SAY_SUMMON_HALDOR, 380.813f, -335.069f, 104.756f, 369.994f, -334.771f, 107.995f, 6.232f}, + {NPC_RANULF_VISUAL, SAY_SUMMON_RANULF, 381.546f, -314.362f, 104.756f, 370.841f, -314.426f, 107.995f, 6.232f}, + {NPC_TORGYN_VISUAL, SAY_SUMMON_TORGYN, 404.310f, -314.761f, 104.756f, 413.992f, -314.703f, 107.995f, 3.157f} }; -#define DATA_KINGS_BANE 2157 +enum Misc +{ + DATA_KINGS_BANE = 2157 +}; class boss_ymiron : public CreatureScript { public: boss_ymiron() : CreatureScript("boss_ymiron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ymironAI(creature); } @@ -154,7 +157,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { m_bIsPause = false; m_bIsActiveWithBJORN = false; @@ -185,7 +188,7 @@ public: instance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -193,13 +196,13 @@ public: instance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS); } - void SpellHitTarget(Unit* who, SpellInfo const* spell) + void SpellHitTarget(Unit* who, SpellInfo const* spell) OVERRIDE { if (who && who->GetTypeId() == TYPEID_PLAYER && spell->Id == 59302) kingsBane = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_KINGS_BANE) return kingsBane ? 1 : 0; @@ -207,7 +210,7 @@ public: return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (m_bIsWalking) { @@ -286,7 +289,7 @@ public: if (m_bIsActiveWithBJORN && m_uiAbility_BJORN_Timer <= diff) { //DoCast(me, SPELL_SUMMON_SPIRIT_FOUNT); // works fine, but using summon has better control - if (Creature* temp = me->SummonCreature(CREATURE_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) + if (Creature* temp = me->SummonCreature(NPC_SPIRIT_FOUNT, 385.0f + rand() % 10, -330.0f + rand() % 10, 104.756f, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 180000)) { temp->SetSpeed(MOVE_RUN, 0.4f); temp->CastSpell(temp, DUNGEON_MODE(SPELL_SPIRIT_FOUNT, H_SPELL_SPIRIT_FOUNT), true); @@ -318,7 +321,7 @@ public: for (uint8 i = 0; i < 4; ++i) { //DoCast(me, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control - if (Creature* temp = me->SummonCreature(CREATURE_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) + if (Creature* temp = me->SummonCreature(NPC_AVENGING_SPIRIT, x + rand() % 10, y + rand() % 10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000)) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { @@ -365,7 +368,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -376,7 +379,7 @@ public: instance->SetData(DATA_KING_YMIRON_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } @@ -400,7 +403,7 @@ class achievement_kings_bane : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index 0174f5a0f43..4b73458e72f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -40,7 +40,7 @@ class instance_utgarde_pinnacle : public InstanceMapScript public: instance_utgarde_pinnacle() : InstanceMapScript("instance_utgarde_pinnacle", 575) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_pinnacle(map); } @@ -144,7 +144,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -170,7 +170,7 @@ public: SaveToDB(); } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { switch (type) { @@ -180,7 +180,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -192,7 +192,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 4331b4378be..6166b7c4891 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -25,6 +25,7 @@ enum Data DATA_SKADI_THE_RUTHLESS_EVENT, DATA_KING_YMIRON_EVENT }; + enum Data64 { DATA_SVALA, @@ -42,7 +43,7 @@ enum Data64 DATA_SACRIFICED_PLAYER }; -enum eCreatures +enum CreatureID { BOSS_SVALA_SORROWGRAVE = 26668, BOSS_GORTOK_PALEHOOF = 26687, diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 417b0bdd7fc..e44e0ab0539 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -19,25 +19,32 @@ #include "ScriptedCreature.h" #include "vault_of_archavon.h" -enum +enum Emotes { EMOTE_BERSERK = 0, EMOTE_LEAP = 1 // Not in use }; -//Spells Archavon -#define SPELL_ROCK_SHARDS 58678 -#define SPELL_CRUSHING_LEAP RAID_MODE(58960, 60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. -#define SPELL_STOMP RAID_MODE(58663, 60880) -#define SPELL_IMPALE RAID_MODE(58666, 60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. -#define SPELL_BERSERK 47008 -//Spells Archavon Warders -#define SPELL_ROCK_SHOWER RAID_MODE(60919, 60923) -#define SPELL_SHIELD_CRUSH RAID_MODE(60897, 60899) -#define SPELL_WHIRL RAID_MODE(60902, 60916) +enum Spells +{ + + // Spells Archavon + SPELL_ROCK_SHARDS = 58678, + 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 +}; -//4 Warders spawned -#define ARCHAVON_WARDER 32353 //npc 32353 +enum Creatures +{ + NPC_ARCHAVON_WARDER = 32353 +}; enum Events { @@ -65,7 +72,7 @@ class boss_archavon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000); events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000); @@ -76,7 +83,7 @@ class boss_archavon : public CreatureScript } // Below UpdateAI may need review/debug. - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -121,7 +128,7 @@ class boss_archavon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_archavonAI(creature); } @@ -143,7 +150,7 @@ class npc_archavon_warder : public CreatureScript EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_ROCK_SHOWER, 2000); @@ -151,12 +158,12 @@ class npc_archavon_warder : public CreatureScript events.ScheduleEvent(EVENT_WHIRL, 7500); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -192,7 +199,7 @@ class npc_archavon_warder : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_archavon_warderAI(creature); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index ad8d4d6edf2..1ceddd4bd66 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -20,7 +20,6 @@ #include "SpellAuras.h" #include "vault_of_archavon.h" -//Emalon spells enum Spells { SPELL_OVERCHARGE = 64218, // Cast every 45 sec on a random Tempest Minion @@ -29,32 +28,35 @@ enum Spells SPELL_SHOCK = 64363, SPELL_OVERCHARGED = 64217, SPELL_OVERCHARGED_BLAST = 64219, // Cast when Overcharged reaches 10 stacks. Mob dies after that + SPELL_CHAIN_LIGHTNING = 64213, + SPELL_LIGHTNING_NOVA = 64216 }; -// cannot let SpellDifficulty handle it, no entries for these -#define SPELL_CHAIN_LIGHTNING RAID_MODE(64213, 64215) -#define SPELL_LIGHTNING_NOVA RAID_MODE(64216, 65279) - -enum BossEmotes +enum Emotes { - EMOTE_OVERCHARGE = 0, - EMOTE_MINION_RESPAWN = 1, - EMOTE_BERSERK = 2 + EMOTE_OVERCHARGE = 0, + EMOTE_MINION_RESPAWN = 1, + EMOTE_BERSERK = 2 }; enum Events { - EVENT_CHAIN_LIGHTNING = 1, - EVENT_LIGHTNING_NOVA = 2, - EVENT_OVERCHARGE = 3, - EVENT_BERSERK = 4, - EVENT_SHOCK = 5, + EVENT_CHAIN_LIGHTNING = 1, + EVENT_LIGHTNING_NOVA = 2, + EVENT_OVERCHARGE = 3, + EVENT_BERSERK = 4, + EVENT_SHOCK = 5, }; -//Creatures -#define NPC_TEMPEST_MINION 33998 +enum Npcs +{ + NPC_TEMPEST_MINION = 33998 +}; -#define MAX_TEMPEST_MINIONS 4 +enum Misc +{ + MAX_TEMPEST_MINIONS = 4 +}; struct Position TempestMinions[MAX_TEMPEST_MINIONS] = { @@ -78,7 +80,7 @@ class boss_emalon : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -86,7 +88,7 @@ class boss_emalon : public CreatureScript me->SummonCreature(NPC_TEMPEST_MINION, TempestMinions[i], TEMPSUMMON_CORPSE_DESPAWN, 0); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { BossAI::JustSummoned(summoned); @@ -95,7 +97,7 @@ class boss_emalon : public CreatureScript summoned->AI()->AttackStart(me->GetVictim()); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!summons.empty()) { @@ -115,7 +117,7 @@ class boss_emalon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -164,7 +166,7 @@ class boss_emalon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_emalonAI(creature); } @@ -185,13 +187,13 @@ class npc_tempest_minion : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); OverchargedTimer = 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* emalon = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EMALON) : 0)) { @@ -203,7 +205,7 @@ class npc_tempest_minion : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); @@ -215,7 +217,7 @@ class npc_tempest_minion : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -264,7 +266,7 @@ class npc_tempest_minion : public CreatureScript uint32 OverchargedTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tempest_minionAI(creature); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 7feadad02e1..f259fbf2b78 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -61,7 +61,7 @@ class boss_koralon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_BURNING_FURY); @@ -73,7 +73,7 @@ class boss_koralon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -116,7 +116,7 @@ class boss_koralon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_koralonAI(creature); } @@ -136,12 +136,12 @@ class npc_flame_warder : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { events.Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); @@ -149,7 +149,7 @@ class npc_flame_warder : public CreatureScript events.ScheduleEvent(EVENT_FW_METEOR_FISTS_A, 10000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -184,7 +184,7 @@ class npc_flame_warder : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_flame_warderAI(creature); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 4309f188b10..22174ea2528 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -39,7 +39,6 @@ enum Spells SPELL_FROZEN_ORB_SUMMON = 72093, // summon orb }; -// Events boss enum Events { EVENT_FREEZING_GROUND = 1, @@ -49,8 +48,11 @@ enum Events EVENT_FROST_BLAST = 4, }; -// Mob Frozen Orb -#define NPC_FROZEN_ORB 38456 // 1 in 10 mode and 3 in 25 mode +enum Creatures +{ + NPC_FROZEN_ORB = 38456 // 1 in 10 mode and 3 in 25 mode + +}; class boss_toravon : public CreatureScript { @@ -63,7 +65,7 @@ class boss_toravon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_FROZEN_MALLET); @@ -74,7 +76,7 @@ class boss_toravon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -110,7 +112,7 @@ class boss_toravon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_toravonAI(creature); } @@ -128,12 +130,12 @@ class npc_frost_warder : public CreatureScript { npc_frost_warderAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { events.Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); @@ -142,7 +144,7 @@ class npc_frost_warder : public CreatureScript events.ScheduleEvent(EVENT_FROST_BLAST, 5000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -165,7 +167,7 @@ class npc_frost_warder : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frost_warderAI(creature); } @@ -185,18 +187,18 @@ public: { } - void Reset() + void Reset() OVERRIDE { done = false; killTimer = 60000; // if after this time there is no victim -> destroy! } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!done) { @@ -220,7 +222,7 @@ public: bool done; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frozen_orbAI(creature); } @@ -248,7 +250,7 @@ class npc_frozen_orb_stalker : public CreatureScript SetCombatMovement(false); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (spawned) return; @@ -273,7 +275,7 @@ class npc_frozen_orb_stalker : public CreatureScript bool spawned; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frozen_orb_stalkerAI(creature); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 3534330e6f4..bdb2f7e88f1 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -35,26 +35,23 @@ class instance_archavon : public InstanceMapScript { instance_archavon_InstanceMapScript(Map* map) : InstanceScript(map) { - SetBossNumber(MAX_ENCOUNTER); - } + SetBossNumber(EncounterCount); - void Initialize() - { - EmalonGUID = 0; - ToravonGUID = 0; - ArchavonDeath = 0; - EmalonDeath = 0; - KoralonDeath = 0; + EmalonGUID = 0; + ToravonGUID = 0; + ArchavonDeath = 0; + EmalonDeath = 0; + KoralonDeath = 0; } void OnCreatureCreate(Creature* creature) { switch (creature->GetEntry()) { - case CREATURE_EMALON: + case NPC_EMALON: EmalonGUID = creature->GetGUID(); break; - case CREATURE_TORAVON: + case NPC_TORAVON: ToravonGUID = creature->GetGUID(); break; default: @@ -62,7 +59,7 @@ class instance_archavon : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -136,7 +133,7 @@ class instance_archavon : public InstanceMapScript time_t KoralonDeath; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_archavon_InstanceMapScript(map); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index 03776525174..7b5258fc3fc 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -18,23 +18,23 @@ #ifndef DEF_ARCHAVON_H #define DEF_ARCHAVON_H -enum Creatures -{ - CREATURE_ARCHAVON = 31125, - CREATURE_EMALON = 33993, - CREATURE_KORALON = 35013, - CREATURE_TORAVON = 38433, -}; +uint32 const EncounterCount = 4; enum Data { - DATA_ARCHAVON = 0, - DATA_EMALON = 1, - DATA_KORALON = 2, - DATA_TORAVON = 3, + DATA_ARCHAVON = 0, + DATA_EMALON = 1, + DATA_KORALON = 2, + DATA_TORAVON = 3, }; -#define MAX_ENCOUNTER 4 +enum CreatureIds +{ + NPC_ARCHAVON = 31125, + NPC_EMALON = 33993, + NPC_KORALON = 35013, + NPC_TORAVON = 38433 +}; enum AchievementCriteriaIds { diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 67bac18081f..8f44e47dd74 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -48,9 +48,9 @@ class boss_cyanigosa : public CreatureScript public: boss_cyanigosa() : CreatureScript("boss_cyanigosa") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_cyanigosaAI (creature); + return new boss_cyanigosaAI(creature); } struct boss_cyanigosaAI : public ScriptedAI @@ -68,7 +68,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiArcaneVacuumTimer = 10000; uiBlizzardTimer = 15000; @@ -79,7 +79,7 @@ public: instance->SetData(DATA_CYANIGOSA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -87,9 +87,10 @@ public: instance->SetData(DATA_CYANIGOSA_EVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { if (instance && instance->GetData(DATA_REMOVE_NPC) == 1) { @@ -139,7 +140,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -147,7 +148,7 @@ public: instance->SetData(DATA_CYANIGOSA_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -165,7 +166,7 @@ class achievement_defenseless : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index b4bd30449cc..0052d7bc87e 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -47,9 +47,9 @@ class boss_erekem : public CreatureScript public: boss_erekem() : CreatureScript("boss_erekem") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_erekemAI (creature); + return new boss_erekemAI(creature); } struct boss_erekemAI : public ScriptedAI @@ -67,7 +67,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiBloodlustTimer = 15000; uiChainHealTimer = 0; @@ -94,7 +94,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -121,7 +121,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DoCast(me, SPELL_EARTH_SHIELD); @@ -142,9 +142,10 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -205,7 +206,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -224,7 +225,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -263,9 +264,9 @@ class npc_erekem_guard : public CreatureScript public: npc_erekem_guard() : CreatureScript("npc_erekem_guard") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_erekem_guardAI (creature); + return new npc_erekem_guardAI(creature); } struct npc_erekem_guardAI : public ScriptedAI @@ -281,14 +282,14 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiStrikeTimer = urand(4000, 8000); uiHowlingScreechTimer = urand(8000, 13000); uiGushingWoundTimer = urand(1000, 3000); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -302,9 +303,10 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 8fc5dfcadc8..efaa9a8644b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -66,16 +66,19 @@ static Position SpawnLoc[MAX_SPAWN_LOC]= {1935.50f, 796.224f, 52.492f, 4.224f}, }; -#define DATA_DEHYDRATION 1 +enum Misc +{ + DATA_DEHYDRATION = 1 +}; class boss_ichoron : public CreatureScript { public: boss_ichoron() : CreatureScript("boss_ichoron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_ichoronAI (creature); + return new boss_ichoronAI(creature); } struct boss_ichoronAI : public ScriptedAI @@ -96,7 +99,7 @@ public: SummonList m_waterElements; - void Reset() + void Reset() OVERRIDE { bIsExploded = false; bIsFrenzy = false; @@ -116,7 +119,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -137,7 +140,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -151,7 +154,7 @@ public: } } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { if (!me->IsAlive()) return; @@ -195,7 +198,7 @@ public: me->GetMotionMaster()->MoveChase(me->GetVictim()); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_DEHYDRATION) return dehydration ? 1 : 0; @@ -203,9 +206,10 @@ public: return 0; } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -273,7 +277,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -300,7 +304,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned) { @@ -311,7 +315,7 @@ public: } } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { if (summoned) { @@ -320,7 +324,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -336,9 +340,9 @@ class npc_ichor_globule : public CreatureScript public: npc_ichor_globule() : CreatureScript("npc_ichor_globule") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_ichor_globuleAI (creature); + return new npc_ichor_globuleAI(creature); } struct npc_ichor_globuleAI : public ScriptedAI @@ -352,18 +356,18 @@ public: uint32 uiRangeCheck_Timer; - void Reset() + void Reset() OVERRIDE { uiRangeCheck_Timer = 1000; DoCast(me, SPELL_WATER_GLOBULE); } - void AttackStart(Unit* /*who*/) + void AttackStart(Unit* /*who*/) OVERRIDE { return; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiRangeCheck_Timer < uiDiff) { @@ -384,7 +388,7 @@ public: else uiRangeCheck_Timer -= uiDiff; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_SPLASH); if (Creature* pIchoron = Unit::GetCreature(*me, instance->GetData64(DATA_ICHORON))) @@ -402,7 +406,7 @@ class achievement_dehydration : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 35711d34709..5eaeaab8dc0 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -35,9 +35,9 @@ class boss_lavanthor : public CreatureScript public: boss_lavanthor() : CreatureScript("boss_lavanthor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_lavanthorAI (creature); + return new boss_lavanthorAI(creature); } struct boss_lavanthorAI : public ScriptedAI @@ -54,7 +54,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiFireboltTimer = 1000; uiFlameBreathTimer = 5000; @@ -69,7 +69,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) { @@ -86,7 +86,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -100,9 +100,10 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -138,7 +139,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 6519ccfbde0..2d53fdebde7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -31,9 +31,9 @@ class boss_moragg : public CreatureScript public: boss_moragg() : CreatureScript("boss_moragg") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_moraggAI (creature); + return new boss_moraggAI(creature); } struct boss_moraggAI : public ScriptedAI @@ -48,7 +48,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiOpticLinkTimer = 10000; uiCorrosiveSalivaTimer = 5000; @@ -62,7 +62,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) { @@ -79,7 +79,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -93,9 +93,10 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -116,7 +117,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index cce7776cecc..20f7e7952fe 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -61,9 +61,9 @@ class boss_xevozz : public CreatureScript public: boss_xevozz() : CreatureScript("boss_xevozz") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_xevozzAI (creature); + return new boss_xevozzAI(creature); } struct boss_xevozzAI : public ScriptedAI @@ -79,7 +79,7 @@ public: uint32 uiArcaneBarrageVolley_Timer; uint32 uiArcaneBuffet_Timer; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -110,7 +110,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->SetSpeed(MOVE_RUN, 0.5f); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -120,7 +120,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -134,7 +134,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) @@ -152,9 +152,10 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 uiDiff) + + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -192,7 +193,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -212,7 +213,7 @@ public: } } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -228,9 +229,9 @@ class npc_ethereal_sphere : public CreatureScript public: npc_ethereal_sphere() : CreatureScript("npc_ethereal_sphere") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_ethereal_sphereAI (creature); + return new npc_ethereal_sphereAI(creature); } struct npc_ethereal_sphereAI : public ScriptedAI @@ -245,13 +246,13 @@ public: uint32 uiSummonPlayers_Timer; uint32 uiRangeCheck_Timer; - void Reset() + void Reset() OVERRIDE { uiSummonPlayers_Timer = urand(33000, 35000); uiRangeCheck_Timer = 1000; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 7b8641b1b32..a3c84e248e7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -31,9 +31,9 @@ enum Spells H_SPELL_ZURAMAT_ADD_2 = 59747 }; -enum ZuramatCreatures +enum Creatures { - CREATURE_VOID_SENTRY = 29364 + NPC_VOID_SENTRY = 29364 }; enum Yells @@ -46,16 +46,19 @@ enum Yells SAY_WHISPER = 5 }; -#define DATA_VOID_DANCE 2153 +enum Misc +{ + DATA_VOID_DANCE = 2153 +}; class boss_zuramat : public CreatureScript { public: boss_zuramat() : CreatureScript("boss_zuramat") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new boss_zuramatAI (creature); + return new boss_zuramatAI(creature); } struct boss_zuramatAI : public ScriptedAI @@ -72,7 +75,7 @@ public: uint32 SpellShroudOfDarknessTimer; bool voidDance; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -88,7 +91,7 @@ public: voidDance = true; } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -102,7 +105,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) @@ -120,9 +123,10 @@ public: } } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -150,13 +154,13 @@ public: DoMeleeAttackIfReady(); } - void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) + void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) OVERRIDE { - if (summoned->GetEntry() == CREATURE_VOID_SENTRY) + if (summoned->GetEntry() == NPC_VOID_SENTRY) voidDance = false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_VOID_DANCE) return voidDance ? 1 : 0; @@ -164,7 +168,7 @@ public: return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -183,7 +187,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -191,7 +195,7 @@ public: Talk(SAY_SLAY); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->AI()->AttackStart(me->GetVictim()); summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); @@ -208,7 +212,7 @@ class achievement_void_dance : public AchievementCriteriaScript { } - bool OnCheck(Player* /*player*/, Unit* target) + bool OnCheck(Player* /*player*/, Unit* target) OVERRIDE { if (!target) return false; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index ef96b1ea86f..2c65300cd4c 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -109,7 +109,7 @@ class instance_violet_hold : public InstanceMapScript public: instance_violet_hold() : InstanceMapScript("instance_violet_hold", 608) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_violet_hold_InstanceMapScript(map); } @@ -314,7 +314,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -407,7 +407,7 @@ public: } } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { switch (type) { @@ -420,7 +420,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -441,7 +441,7 @@ public: return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index de0aee10bfe..d168a7277b9 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -123,7 +123,7 @@ enum Spells SPELL_CRYSTALL_ACTIVATION = 57804 }; -enum eSinclari +enum Sinclari { SAY_SINCLARI_1 = 0 }; @@ -256,7 +256,7 @@ class npc_sinclari_vh : public CreatureScript public: npc_sinclari_vh() : CreatureScript("npc_sinclari_vh") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -278,7 +278,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -301,7 +301,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sinclariAI(creature); } @@ -318,7 +318,7 @@ public: uint8 uiPhase; uint32 uiTimer; - void Reset() + void Reset() OVERRIDE { uiPhase = 0; uiTimer = 0; @@ -342,7 +342,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { ScriptedAI::UpdateAI(uiDiff); @@ -422,9 +422,9 @@ class npc_azure_saboteur : public CreatureScript public: npc_azure_saboteur() : CreatureScript("npc_azure_saboteur") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_saboteurAI (creature); + return new npc_azure_saboteurAI(creature); } struct npc_azure_saboteurAI : public npc_escortAI @@ -441,7 +441,7 @@ public: bool bHasGotMovingPoints; uint32 uiBoss; - void Reset() + void Reset() OVERRIDE { if (instance && !uiBoss) uiBoss = instance->GetData(DATA_WAVE_COUNT) == 6 ? instance->GetData(DATA_FIRST_BOSS) : instance->GetData(DATA_SECOND_BOSS); @@ -450,7 +450,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (uiBoss) { @@ -481,7 +481,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); @@ -546,7 +546,7 @@ class npc_teleportation_portal_vh : public CreatureScript public: npc_teleportation_portal_vh() : CreatureScript("npc_teleportation_portal_vh") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_teleportation_portalAI(creature); } @@ -568,17 +568,18 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiSpawnTimer = 10000; bPortalGuardianOrKeeperOrEliteSpawn = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) //Massive usage of instance, global check return; @@ -653,13 +654,13 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_WAVE_COUNT, instance->GetData(DATA_WAVE_COUNT)+1); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { listOfMobs.Summon(summoned); if (summoned) @@ -693,7 +694,7 @@ struct violet_hold_trashAI : public npc_escortAI uint32 portalLocationID; uint32 secondPortalRouteID; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (portalLocationID) { @@ -724,7 +725,7 @@ struct violet_hold_trashAI : public npc_escortAI } } - void UpdateAI(uint32) + void UpdateAI(uint32) OVERRIDE { if (instance && instance->GetData(DATA_MAIN_EVENT_PHASE) != IN_PROGRESS) me->CastStop(); @@ -781,7 +782,7 @@ struct violet_hold_trashAI : public npc_escortAI } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -807,9 +808,9 @@ class npc_azure_invader : public CreatureScript public: npc_azure_invader() : CreatureScript("npc_azure_invader") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_invaderAI (creature); + return new npc_azure_invaderAI(creature); } struct npc_azure_invaderAI : public violet_hold_trashAI @@ -824,7 +825,7 @@ public: uint32 uiBrutalStrikeTimer; uint32 uiSunderArmorTimer; - void Reset() + void Reset() OVERRIDE { uiCleaveTimer = 5000; uiImpaleTimer = 4000; @@ -832,7 +833,7 @@ public: uiSunderArmorTimer = 4000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -885,9 +886,9 @@ class npc_azure_binder : public CreatureScript public: npc_azure_binder() : CreatureScript("npc_azure_binder") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_binderAI (creature); + return new npc_azure_binderAI(creature); } struct npc_azure_binderAI : public violet_hold_trashAI @@ -902,7 +903,7 @@ public: uint32 uiFrostNovaTimer; uint32 uiFrostboltTimer; - void Reset() + void Reset() OVERRIDE { uiArcaneExplosionTimer = 5000; uiArcainBarrageTimer = 4000; @@ -910,7 +911,7 @@ public: uiFrostboltTimer = 4000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -963,9 +964,9 @@ class npc_azure_mage_slayer : public CreatureScript public: npc_azure_mage_slayer() : CreatureScript("npc_azure_mage_slayer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_mage_slayerAI (creature); + return new npc_azure_mage_slayerAI(creature); } struct npc_azure_mage_slayerAI : public violet_hold_trashAI @@ -978,13 +979,13 @@ public: uint32 uiArcaneEmpowermentTimer; uint32 uiSpellLockTimer; - void Reset() + void Reset() OVERRIDE { uiArcaneEmpowermentTimer = 5000; uiSpellLockTimer = 5000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1023,9 +1024,9 @@ class npc_azure_raider : public CreatureScript public: npc_azure_raider() : CreatureScript("npc_azure_raider") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_raiderAI (creature); + return new npc_azure_raiderAI(creature); } struct npc_azure_raiderAI : public violet_hold_trashAI @@ -1038,13 +1039,13 @@ public: uint32 uiConcussionBlowTimer; uint32 uiMagicReflectionTimer; - void Reset() + void Reset() OVERRIDE { uiConcussionBlowTimer = 5000; uiMagicReflectionTimer = 8000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1075,9 +1076,9 @@ class npc_azure_stalker : public CreatureScript public: npc_azure_stalker() : CreatureScript("npc_azure_stalker") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_stalkerAI (creature); + return new npc_azure_stalkerAI(creature); } struct npc_azure_stalkerAI : public violet_hold_trashAI @@ -1090,14 +1091,14 @@ public: uint32 uiTacticalBlinkTimer; bool TacticalBlinkCasted; - void Reset() + void Reset() OVERRIDE { uiBackstabTimer = 1300; uiTacticalBlinkTimer = 8000; TacticalBlinkCasted =false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1151,7 +1152,7 @@ public: uint32 uiChainsOfIceTimer; uint32 uiConeOfColdTimer; - void Reset() + void Reset() OVERRIDE { uiArcaneBlastTimer = 5000; uiSlowTimer = 4000; @@ -1159,7 +1160,7 @@ public: uiConeOfColdTimer = 4000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1207,9 +1208,9 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_spellbreakerAI (creature); + return new npc_azure_spellbreakerAI(creature); } }; @@ -1218,9 +1219,9 @@ class npc_azure_captain : public CreatureScript public: npc_azure_captain() : CreatureScript("npc_azure_captain") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_captainAI (creature); + return new npc_azure_captainAI(creature); } struct npc_azure_captainAI : public violet_hold_trashAI @@ -1233,13 +1234,13 @@ public: uint32 uiMortalStrikeTimer; uint32 uiWhirlwindTimer; - void Reset() + void Reset() OVERRIDE { uiMortalStrikeTimer = 5000; uiWhirlwindTimer = 8000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); @@ -1270,9 +1271,9 @@ class npc_azure_sorceror : public CreatureScript public: npc_azure_sorceror() : CreatureScript("npc_azure_sorceror") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_azure_sorcerorAI (creature); + return new npc_azure_sorcerorAI(creature); } struct npc_azure_sorcerorAI : public violet_hold_trashAI @@ -1286,14 +1287,14 @@ public: uint32 uiArcaneStreamTimerStartingValueHolder; uint32 uiManaDetonationTimer; - void Reset() + void Reset() OVERRIDE { uiArcaneStreamTimer = 4000; uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer; uiManaDetonationTimer = 5000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { violet_hold_trashAI::UpdateAI(diff); npc_escortAI::UpdateAI(diff); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index e6a7553e81b..014d3edff77 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -18,24 +18,6 @@ #ifndef DEF_VIOLET_HOLD_H #define DEF_VIOLET_HOLD_H -enum Creatures -{ - CREATURE_TELEPORTATION_PORTAL = 31011, - CREATURE_PORTAL_GUARDIAN = 30660, - CREATURE_PORTAL_KEEPER = 30695, - CREATURE_XEVOZZ = 29266, - CREATURE_LAVANTHOR = 29312, - CREATURE_ICHORON = 29313, - CREATURE_ZURAMAT = 29314, - CREATURE_EREKEM = 29315, - CREATURE_EREKEM_GUARD = 29395, - CREATURE_MORAGG = 29316, - CREATURE_CYANIGOSA = 31134, - CREATURE_SINCLARI = 30658, - CREATURE_SABOTEOUR = 31079, - NPC_VIOLET_HOLD_GUARD = 30659 -}; - enum Data { DATA_1ST_BOSS_EVENT, @@ -95,7 +77,25 @@ enum Bosses BOSS_CYANIGOSA }; -enum VHWorldStates +enum CreaturesIds +{ + CREATURE_TELEPORTATION_PORTAL = 31011, + CREATURE_PORTAL_GUARDIAN = 30660, + CREATURE_PORTAL_KEEPER = 30695, + CREATURE_XEVOZZ = 29266, + CREATURE_LAVANTHOR = 29312, + CREATURE_ICHORON = 29313, + CREATURE_ZURAMAT = 29314, + CREATURE_EREKEM = 29315, + CREATURE_EREKEM_GUARD = 29395, + CREATURE_MORAGG = 29316, + CREATURE_CYANIGOSA = 31134, + CREATURE_SINCLARI = 30658, + CREATURE_SABOTEOUR = 31079, + NPC_VIOLET_HOLD_GUARD = 30659 +}; + +enum WorldStateIds { WORLD_STATE_VH = 3816, WORLD_STATE_VH_PRISON_STATE = 3815, diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 93886ed0e74..9efcd8406d7 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -33,7 +33,7 @@ class npc_four_car_garage : public CreatureScript { npc_four_car_garageAI(Creature* creature) : NullCreatureAI(creature) { } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE { if (apply) { @@ -64,7 +64,7 @@ class npc_four_car_garage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_four_car_garageAI(creature); } diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index acd241c8eaf..6d2a48910fe 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -49,7 +49,7 @@ EndContentData */ ## npc_sinkhole_kill_credit ######*/ -enum eSinkhole +enum Sinkhole { SPELL_SET_CART = 46797, SPELL_EXPLODE_CART = 46799, @@ -70,14 +70,14 @@ public: uint8 phase; uint64 casterGuid; - void Reset() + void Reset() OVERRIDE { phaseTimer = 500; phase = 0; casterGuid = 0; } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (phase || spell->Id != SPELL_SET_CART) return; @@ -90,9 +90,9 @@ public: } } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!phase) return; @@ -157,7 +157,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sinkhole_kill_creditAI(creature); } @@ -176,7 +176,8 @@ public: { npc_khunok_the_behemothAI(Creature* creature) : ScriptedAI(creature) {} - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); @@ -197,7 +198,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_khunok_the_behemothAI(creature); } @@ -207,7 +208,7 @@ public: ## npc_keristrasza ######*/ -enum eKeristrasza +enum Keristrasza { SPELL_TELEPORT_TO_SARAGOSA = 46772 }; @@ -219,7 +220,7 @@ class npc_keristrasza : public CreatureScript public: npc_keristrasza() : CreatureScript("npc_keristrasza") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -232,7 +233,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF + 1) @@ -251,7 +252,7 @@ public: #define GOSSIP_ITEM_C_1 "I... I think so..." -enum eCorastrasza +enum Corastrasza { SPELL_SUMMON_WYRMREST_SKYTALON = 61240, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC = 61244, @@ -265,7 +266,7 @@ class npc_corastrasza : public CreatureScript public: npc_corastrasza() : CreatureScript("npc_corastrasza") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -277,7 +278,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -299,7 +300,7 @@ public: #define GOSSIP_ITEM_I "<Search corpse for Issliruk's Totem.>" -enum eIruk +enum Iruk { QUEST_SPIRITS_WATCH_OVER_US = 11961, SPELL_CREATURE_TOTEM_OF_ISSLIRUK = 46816, @@ -311,7 +312,7 @@ class npc_iruk : public CreatureScript public: npc_iruk() : CreatureScript("npc_iruk") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_SPIRITS_WATCH_OVER_US) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_I, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -320,7 +321,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -355,11 +356,12 @@ public: { npc_nerubar_victimAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { Player* player = killer->ToPlayer(); if (!player) @@ -379,7 +381,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nerubar_victimAI(creature); } @@ -389,7 +391,7 @@ public: ## npc_jenny ######*/ -enum eJenny +enum Jenny { QUEST_LOADER_UP = 11881, @@ -412,7 +414,7 @@ public: bool setCrateNumber; - void Reset() + void Reset() OVERRIDE { if (!setCrateNumber) setCrateNumber = true; @@ -431,12 +433,12 @@ public: } } - void DamageTaken(Unit* /*pDone_by*/, uint32& /*uiDamage*/) + void DamageTaken(Unit* /*pDone_by*/, uint32& /*uiDamage*/) OVERRIDE { DoCast(me, SPELL_DROP_CRATE, true); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (setCrateNumber) { @@ -452,9 +454,9 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_jennyAI (creature); + return new npc_jennyAI(creature); } }; @@ -471,7 +473,8 @@ public: { npc_fezzix_geartwistAI(Creature* creature) : ScriptedAI(creature) {} - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); @@ -491,7 +494,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fezzix_geartwistAI(creature); } @@ -501,7 +504,7 @@ public: ## npc_nesingwary_trapper ######*/ -enum eNesingwaryTrapper +enum NesingwaryTrapper { GO_HIGH_QUALITY_FUR = 187983, @@ -545,7 +548,7 @@ public: uint8 phase; uint32 phaseTimer; - void Reset() + void Reset() OVERRIDE { me->SetVisible(false); phaseTimer = 2500; @@ -553,10 +556,11 @@ public: go_caribouGUID = 0; } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + + void JustDied(Unit* /*killer*/) OVERRIDE { if (GameObject* go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetLootState(GO_JUST_DEACTIVATED); @@ -571,7 +575,7 @@ public: go_caribou->SetGoState(GO_STATE_READY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (phaseTimer <= diff) { @@ -635,7 +639,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nesingwary_trapperAI(creature); } @@ -645,7 +649,7 @@ public: ## npc_lurgglbr ######*/ -enum eLurgglbr +enum Lurgglbr { QUEST_ESCAPE_WINTERFIN_CAVERNS = 11570, @@ -672,7 +676,7 @@ public: uint32 IntroTimer; uint32 IntroPhase; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -681,7 +685,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -696,7 +700,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IntroPhase) { @@ -752,12 +756,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lurgglbrAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPE_WINTERFIN_CAVERNS) { @@ -792,7 +796,7 @@ public: ## npc_nexus_drake_hatchling ######*/ -enum eNexusDrakeHatchling +enum NexusDrakeHatchling { SPELL_DRAKE_HARPOON = 46607, SPELL_RED_DRAGONBLOOD = 46620, @@ -820,18 +824,18 @@ public: uint64 HarpoonerGUID; bool WithRedDragonBlood; - void Reset() + void Reset() OVERRIDE { WithRedDragonBlood = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->IsValidAttackTarget(who)) AttackStart(who); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_DRAKE_HARPOON && caster->GetTypeId() == TYPEID_PLAYER) { @@ -841,7 +845,8 @@ public: WithRedDragonBlood = true; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -864,7 +869,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (WithRedDragonBlood && HarpoonerGUID && !me->HasAura(SPELL_RED_DRAGONBLOOD)) { @@ -894,7 +899,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nexus_drake_hatchlingAI(creature); } @@ -904,7 +909,7 @@ public: ## npc_thassarian ######*/ -enum eThassarian +enum Thassarian { QUEST_LAST_RITES = 12019, @@ -968,7 +973,7 @@ public: uint32 phase; uint32 phaseTimer; - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); me->RemoveStandFlags(UNIT_STAND_STATE_SIT); @@ -987,7 +992,7 @@ public: phaseTimer = 0; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -1020,7 +1025,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -1198,7 +1203,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* talbot = me->GetCreature(*me, talbotGUID)) talbot->RemoveFromWorld(); @@ -1214,7 +1219,7 @@ public: } }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1227,7 +1232,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -1240,7 +1245,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_thassarianAI(creature); } @@ -1259,12 +1264,12 @@ public: { npc_image_lich_kingAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -1275,7 +1280,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_image_lich_kingAI(creature); } @@ -1294,7 +1299,7 @@ public: { npc_general_arlosAI(Creature* creature) : ScriptedAI(creature) {} - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -1307,7 +1312,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_general_arlosAI(creature); } @@ -1317,7 +1322,7 @@ public: ## npc_counselor_talbot ######*/ -enum eCounselorTalbot +enum CounselorTalbot { SPELL_DEFLECTION = 51009, SPELL_SOUL_BLAST = 50992, @@ -1344,16 +1349,16 @@ public: uint32 deflectionTimer; uint32 soulBlastTimer; - void Reset() + void Reset() OVERRIDE { leryssaGUID = 0; arlosGUID = 0; bCheck = false; shadowBoltTimer = urand(5000, 12000); deflectionTimer = urand(20000, 25000); - soulBlastTimer = urand (12000, 18000); + soulBlastTimer = urand(12000, 18000); } - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -1363,7 +1368,7 @@ public: CAST_AI(npc_thassarian::npc_thassarianAI, summoner->ToCreature()->AI())->talbotInPosition = true; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (bCheck) { @@ -1394,14 +1399,14 @@ public: if (soulBlastTimer <= uiDiff) { DoCastVictim(SPELL_SOUL_BLAST); - soulBlastTimer = urand (12000, 18000); + soulBlastTimer = urand(12000, 18000); } else soulBlastTimer -= uiDiff; } DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!leryssaGUID || !arlosGUID) return; @@ -1425,7 +1430,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_counselor_talbotAI(creature); } @@ -1456,7 +1461,7 @@ public: uint32 phase; uint32 phaseTimer; - void MovementInform(uint32 type, uint32 /*uiId*/) + void MovementInform(uint32 type, uint32 /*uiId*/) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -1485,7 +1490,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { ScriptedAI::UpdateAI(uiDiff); @@ -1554,7 +1559,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_leryssaAI(creature); } @@ -1564,7 +1569,7 @@ public: ## npc_beryl_sorcerer ######*/ -enum eBerylSorcerer +enum BerylSorcerer { NPC_CAPTURED_BERLY_SORCERER = 25474, NPC_LIBRARIAN_DONATHAN = 25262, @@ -1585,19 +1590,19 @@ public: bool bEnslaved; - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_AGGRESSIVE); bEnslaved = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->IsValidAttackTarget(who)) AttackStart(who); } - void SpellHit(Unit* pCaster, const SpellInfo* pSpell) + void SpellHit(Unit* pCaster, const SpellInfo* pSpell) OVERRIDE { if (pSpell->Id == SPELL_ARCANE_CHAINS && pCaster->GetTypeId() == TYPEID_PLAYER && !HealthAbovePct(50) && !bEnslaved) { @@ -1614,7 +1619,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -1625,7 +1631,7 @@ public: } } - void UpdateAI(uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -1634,7 +1640,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_beryl_sorcererAI(creature); } @@ -1643,7 +1649,7 @@ public: /*###### ## npc_imprisoned_beryl_sorcerer ######*/ -enum eImprisionedBerylSorcerer +enum ImprisionedBerylSorcerer { SPELL_NEURAL_NEEDLE = 45634, @@ -1669,7 +1675,7 @@ public: uint32 rebuff; - void Reset() + void Reset() OVERRIDE { if (me->GetReactState() != REACT_PASSIVE) me->SetReactState(REACT_PASSIVE); @@ -1677,7 +1683,7 @@ public: rebuff = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { UpdateVictim(); @@ -1695,11 +1701,11 @@ public: DoMeleeAttackIfReady(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void SpellHit(Unit* unit, const SpellInfo* spell) + void SpellHit(Unit* unit, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TYPEID_PLAYER) { @@ -1744,7 +1750,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_imprisoned_beryl_sorcererAI(creature); } @@ -1770,7 +1776,7 @@ class npc_mootoo_the_younger : public CreatureScript public: npc_mootoo_the_younger() : CreatureScript("npc_mootoo_the_younger") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPING_THE_MIST) { @@ -1794,18 +1800,18 @@ public: { npc_mootoo_the_youngerAI(Creature* creature) : npc_escortAI(creature) {} - void Reset() + void Reset() OVERRIDE { SetDespawnAtFar(false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player=GetPlayerForEscort()) player->FailQuest(QUEST_ESCAPING_THE_MIST); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -1836,7 +1842,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mootoo_the_youngerAI(creature); } @@ -1860,7 +1866,7 @@ class npc_bonker_togglevolt : public CreatureScript public: npc_bonker_togglevolt() : CreatureScript("npc_bonker_togglevolt") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_GET_ME_OUTA_HERE) { @@ -1876,19 +1882,19 @@ public: npc_bonker_togglevoltAI(Creature* creature) : npc_escortAI(creature) {} uint32 Bonker_agro; - void Reset() + void Reset() OVERRIDE { Bonker_agro=0; SetDespawnAtFar(false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_GET_ME_OUTA_HERE); } - void UpdateEscortAI(const uint32 /*diff*/) + void UpdateEscortAI(const uint32 /*diff*/) OVERRIDE { if (GetAttack() && UpdateVictim()) { @@ -1902,7 +1908,7 @@ public: else Bonker_agro=0; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -1917,7 +1923,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bonker_togglevoltAI(creature); } @@ -1927,7 +1933,7 @@ public: ## Help Those That Cannot Help Themselves, Quest 11876 ######*/ -enum eHelpThemselves +enum HelpThemselves { QUEST_CANNOT_HELP_THEMSELVES = 11876, GO_MAMMOTH_TRAP_1 = 188022, @@ -1976,7 +1982,7 @@ public: uint32 uiTimer; bool bStarted; - void Reset() + void Reset() OVERRIDE { uiTimer = 1500; bStarted = false; @@ -1993,7 +1999,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bStarted) { @@ -2008,13 +2014,13 @@ public: } } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { if (param == 1) bStarted = true; } - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -2034,7 +2040,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_trapped_mammoth_calfAI(creature); } @@ -2044,7 +2050,7 @@ public: ## Quest 11653: Hah... You're Not So Big Now! ######*/ -enum eNotSoBig +enum NotSoBig { QUEST_YOU_RE_NOT_SO_BIG_NOW = 11653, SPELL_AURA_NOTSOBIG_1 = 45672, @@ -2062,7 +2068,7 @@ public: { npc_magmoth_crusherAI(Creature* creature) : ScriptedAI(creature) {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { Player* player = killer->ToPlayer(); if (!player) @@ -2079,7 +2085,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_magmoth_crusherAI(creature); } @@ -2089,8 +2095,15 @@ public: ## Quest 11608: Bury Those Cockroaches! ######*/ -#define QUEST_BURY_THOSE_COCKROACHES 11608 -#define SPELL_SEAFORIUM_DEPTH_CHARGE_EXPLOSION 45502 +enum BuryThoseCockroaches +{ + // Quest + QUEST_BURY_THOSE_COCKROACHES = 11608, + + // Spells + SPELL_SEAFORIUM_DEPTH_CHARGE_EXPLOSION = 45502 + +}; class npc_seaforium_depth_charge : public CreatureScript { @@ -2103,12 +2116,12 @@ public: uint32 uiExplosionTimer; - void Reset() + void Reset() OVERRIDE { uiExplosionTimer = urand(5000, 10000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiExplosionTimer < diff) { @@ -2131,7 +2144,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_seaforium_depth_chargeAI(creature); } @@ -2141,7 +2154,7 @@ public: ## Help Those That Cannot Help Themselves, Quest 11876 ######*/ -enum eValiancekeepcannons +enum Valiancekeepcannons { GO_VALIANCE_KEEP_CANNON_1 = 187560, GO_VALIANCE_KEEP_CANNON_2 = 188692 @@ -2158,12 +2171,12 @@ public: uint32 uiTimer; - void Reset() + void Reset() OVERRIDE { uiTimer = urand(13000, 18000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiTimer <= diff) { @@ -2182,7 +2195,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_valiance_keep_cannoneerAI(creature); } @@ -2216,16 +2229,16 @@ public: uint32 m_uiTimer; //Timer until recast - void Reset() + void Reset() OVERRIDE { m_uiTimer = 0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (m_uiTimer <= uiDiff) { @@ -2287,7 +2300,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_warmage_coldarraAI(creature); } @@ -2297,7 +2310,7 @@ public: ## npc_hidden_cultist ######*/ -enum eHiddenCultist +enum HiddenCultist { SPELL_SHROUD_OF_THE_DEATH_CULTIST = 46077, //not working SPELL_RIGHTEOUS_VISION = 46078, //player aura @@ -2343,7 +2356,7 @@ public: uint64 uiPlayerGUID; - void Reset() + void Reset() OVERRIDE { if (uiEmoteState) me->SetUInt32Value(UNIT_NPC_EMOTESTATE, uiEmoteState); @@ -2361,7 +2374,7 @@ public: me->RestoreFaction(); } - void DoAction(int32 /*iParam*/) + void DoAction(int32 /*iParam*/) OVERRIDE { me->StopMoving(); me->SetUInt32Value(UNIT_NPC_FLAGS, 0); @@ -2371,7 +2384,7 @@ public: uiEventPhase = 1; } - void SetGUID(uint64 uiGuid, int32 /*iId*/) + void SetGUID(uint64 uiGuid, int32 /*iId*/) OVERRIDE { uiPlayerGUID = uiGuid; } @@ -2383,7 +2396,7 @@ public: me->AI()->AttackStart(player); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiEventTimer && uiEventTimer <= uiDiff) { @@ -2444,12 +2457,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hidden_cultistAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { uint32 uiGossipText = 0; const char* charGossipItem; @@ -2484,7 +2497,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index d05e442b0f4..34a217b6418 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -58,12 +58,12 @@ public: uint64 uiTargetGUID; - void Reset() + void Reset() OVERRIDE { uiTargetGUID = 0; } - void UpdateAI(uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { if (me->IsNonMeleeSpellCasted(false)) return; @@ -103,7 +103,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_warmage_violetstandAI(creature); } diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index e629ade9f52..6d6e2193c1b 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -64,13 +64,14 @@ public: creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void Reset(){} + void Reset()OVERRIDE {} - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void AttackStart(Unit* /*who*/){} + void AttackStart(Unit* /*who*/)OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who || !who->IsInWorld() || who->GetZoneId() != 4395) return; @@ -117,10 +118,10 @@ public: return; } - void UpdateAI(uint32 /*diff*/){} + void UpdateAI(uint32 /*diff*/)OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mageguard_dalaranAI(creature); } diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 44bb405cf59..0357ea075f4 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -37,10 +37,13 @@ EndContentData */ #include "CombatAI.h" #include "Player.h" -enum eEnums +enum AlexstraszaWrGate { + // Quest QUEST_RETURN_TO_AG_A = 12499, QUEST_RETURN_TO_AG_H = 12500, + + // Movie MOVIE_ID_GATES = 14 }; @@ -51,7 +54,7 @@ class npc_alexstrasza_wr_gate : public CreatureScript public: npc_alexstrasza_wr_gate() : CreatureScript("npc_alexstrasza_wr_gate") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -63,7 +66,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -129,13 +132,13 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12096_q12092_dummy_SpellScript(); } @@ -161,13 +164,13 @@ public: lothalor->DespawnOrUnsummon(4000); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_bark_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12096_q12092_bark_SpellScript(); } @@ -204,7 +207,7 @@ class npc_wyrmrest_defender : public CreatureScript public: npc_wyrmrest_defender() : CreatureScript("npc_wyrmrest_defender") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_DEFENDING_WYRMREST_TEMPLE) == QUEST_STATUS_INCOMPLETE) { @@ -217,7 +220,7 @@ class npc_wyrmrest_defender : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -240,7 +243,7 @@ class npc_wyrmrest_defender : public CreatureScript uint32 RenewRecoveryChecker; - void Reset() + void Reset() OVERRIDE { hpWarningReady = true; renewRecoveryCanCheck = false; @@ -248,7 +251,7 @@ class npc_wyrmrest_defender : public CreatureScript RenewRecoveryChecker = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Check system for Health Warning should happen first time whenever get under 30%, // after it should be able to happen only after recovery of last renew is fully done (20 sec), @@ -270,7 +273,7 @@ class npc_wyrmrest_defender : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { switch (spell->Id) { @@ -294,7 +297,7 @@ class npc_wyrmrest_defender : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wyrmrest_defenderAI(creature); } diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 965d197050e..9b68b37507b 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -64,7 +64,7 @@ public: { npc_emilyAI(Creature* creature) : npc_escortAI(creature) { } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 50.0f)) summoned->AI()->AttackStart(Mrfloppy); @@ -72,7 +72,7 @@ public: summoned->AI()->AttackStart(me->GetVictim()); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -173,12 +173,12 @@ public: } } - void EnterCombat(Unit* /*Who*/) + void EnterCombat(Unit* /*Who*/) OVERRIDE { Talk(SAY_RANDOMAGGRO); } - void Reset() + void Reset() OVERRIDE { _mrfloppyGUID = 0; _RavenousworgGUID = 0; @@ -189,7 +189,7 @@ public: uint64 _mrfloppyGUID; }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_PERILOUS_ADVENTURE) { @@ -203,7 +203,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_emilyAI(creature); } @@ -219,9 +219,9 @@ public: { npc_mrfloppyAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* Who) + void EnterCombat(Unit* Who) OVERRIDE { if (Creature* Emily = GetClosestCreatureWithEntry(me, NPC_EMILY, 50.0f)) { @@ -239,18 +239,19 @@ public: } } - void EnterEvadeMode() {} + void EnterEvadeMode() OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 /*diff*/) + + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mrfloppyAI(creature); } @@ -280,19 +281,19 @@ public: { npc_outhouse_bunnyAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { _counter = 0; _gender = 0; } - void SetData(uint32 Type, uint32 Data) + void SetData(uint32 Type, uint32 Data) OVERRIDE { if (Type == 1) _gender = Data; } - void SpellHit(Unit* Caster, const SpellInfo* Spell) + void SpellHit(Unit* Caster, const SpellInfo* Spell) OVERRIDE { if (Spell->Id == SPELL_OUTHOUSE_GROANS) { @@ -319,7 +320,7 @@ public: uint8 _gender; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_outhouse_bunnyAI(creature); } @@ -342,12 +343,12 @@ public: { npc_tallhorn_stagAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { _phase = 1; } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (_phase == 1) { @@ -365,7 +366,7 @@ public: uint8 _phase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tallhorn_stagAI(creature); } @@ -394,7 +395,7 @@ public: { npc_amberpine_woodsmanAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { if (me->FindNearestCreature(NPC_TALLHORN_STAG, 0.2f)) { @@ -404,7 +405,7 @@ public: _events.ScheduleEvent(EVENT_WOODSMAN_1, 0); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -430,7 +431,7 @@ public: EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_amberpine_woodsmanAI(creature); } @@ -460,19 +461,19 @@ public: { npc_wounded_skirmisherAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { _despawnTimer = 5000; _playerGUID = 0; } - void MovementInform(uint32, uint32 id) + void MovementInform(uint32, uint32 id) OVERRIDE { if (id == 1) me->DespawnOrUnsummon(_despawnTimer); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(QUEST_OVERWHELMED) == QUEST_STATUS_INCOMPLETE) @@ -489,7 +490,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -501,7 +502,7 @@ public: uint32 _despawnTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wounded_skirmisherAI(creature); } @@ -535,12 +536,12 @@ public: { npc_lightning_sentryAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { _events.ScheduleEvent(EVENT_SENTRY, urand(10000, 12000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -566,7 +567,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer->ToPlayer() && killer->ToPlayer()->GetTypeId() == TYPEID_PLAYER) { @@ -582,7 +583,7 @@ public: EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lightning_sentryAI(creature); } @@ -620,7 +621,7 @@ public: { npc_venture_co_stragglerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { _playerGUID = 0; @@ -628,7 +629,7 @@ public: me->SetReactState(REACT_AGGRESSIVE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -670,7 +671,7 @@ public: DoMeleeAttackIfReady(); } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_SMOKE_BOMB && caster->GetTypeId() == TYPEID_PLAYER) { @@ -687,7 +688,7 @@ public: uint64 _playerGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_venture_co_stragglerAI(creature); } @@ -735,7 +736,7 @@ public: { npc_lake_frogAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { _following = false; _runningScript = false; @@ -743,7 +744,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_following) if (!me->HasAura(SPELL_FROG_LOVE)) @@ -782,7 +783,7 @@ public: } } - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { if (_following || _runningScript) return; @@ -812,7 +813,7 @@ public: } } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { DoCast(player, SPELL_SUMMON_ASHWOOD_BRAND); } @@ -823,7 +824,7 @@ public: bool _runningScript; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lake_frogAI(creature); } diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 4cb52f6360f..15273088940 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -51,7 +51,7 @@ class npc_apothecary_hanes : public CreatureScript public: npc_apothecary_hanes() : CreatureScript("npc_apothecary_hanes") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TRAIL_OF_FIRE) { @@ -74,19 +74,19 @@ public: npc_Apothecary_HanesAI(Creature* creature) : npc_escortAI(creature){} uint32 PotTimer; - void Reset() + void Reset() OVERRIDE { SetDespawnAtFar(false); PotTimer = 10000; //10 sec cooldown on potion } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_TRAIL_OF_FIRE); } - void UpdateEscortAI(const uint32 diff) + void UpdateEscortAI(const uint32 diff) OVERRIDE { if (HealthBelowPct(75)) { @@ -100,7 +100,7 @@ public: DoMeleeAttackIfReady(); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -150,7 +150,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_Apothecary_HanesAI(creature); } @@ -160,7 +160,7 @@ public: ## npc_plaguehound_tracker ######*/ -enum ePlaguehound +enum Plaguehound { QUEST_SNIFF_OUT_ENEMY = 11253 }; @@ -174,7 +174,7 @@ public: { npc_plaguehound_trackerAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() + void Reset() OVERRIDE { uint64 summonerGUID = 0; @@ -190,7 +190,7 @@ public: Start(false, false, summonerGUID); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId != 26) return; @@ -199,7 +199,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_plaguehound_trackerAI(creature); } @@ -212,7 +212,7 @@ public: #define GOSSIP_RAZAEL_REPORT "High Executor Anselm wants a report on the situation." #define GOSSIP_LYANA_REPORT "High Executor Anselm requests your report." -enum eRazael +enum Razael { QUEST_REPORTS_FROM_THE_FIELD = 11221, NPC_RAZAEL = 23998, @@ -228,7 +228,7 @@ class npc_razael_and_lyana : public CreatureScript public: npc_razael_and_lyana() : CreatureScript("npc_razael_and_lyana") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -257,7 +257,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -279,7 +279,7 @@ public: ## npc_daegarn ######*/ -enum eDaegarnn +enum Daegarnn { QUEST_DEFEAT_AT_RING = 11300, @@ -301,7 +301,7 @@ class npc_daegarn : public CreatureScript public: npc_daegarn() : CreatureScript("npc_daegarn") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_DEFEAT_AT_RING) { @@ -320,7 +320,7 @@ public: bool bEventInProgress; uint64 uiPlayerGUID; - void Reset() + void Reset() OVERRIDE { bEventInProgress = false; uiPlayerGUID = 0; @@ -336,7 +336,7 @@ public: SummonGladiator(NPC_FIRJUS); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (Player* player = me->GetPlayer(*me, uiPlayerGUID)) { @@ -357,7 +357,7 @@ public: me->SummonCreature(uiEntry, afSummon[0], afSummon[1], afSummon[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30*IN_MILLISECONDS); } - void SummonedCreatureDies(Creature* summoned, Unit* /*killer*/) + void SummonedCreatureDies(Creature* summoned, Unit* /*killer*/) OVERRIDE { uint32 uiEntry = 0; @@ -374,7 +374,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_daegarnAI(creature); } diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index f5f832bcb86..ef58138c653 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -47,7 +47,7 @@ EndContentData */ #define GOSSIP_ARETE_ITEM6 "Let's finish this!" #define GOSSIP_ARETE_ITEM7 "That's quite a tale, Lord-Commander." -enum eArete +enum Arete { GOSSIP_TEXTID_ARETE1 = 13525, GOSSIP_TEXTID_ARETE2 = 13526, @@ -65,7 +65,7 @@ class npc_arete : public CreatureScript public: npc_arete() : CreatureScript("npc_arete") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -81,7 +81,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -124,7 +124,7 @@ public: ## npc_squire_david ######*/ -enum eSquireDavid +enum SquireDavid { QUEST_THE_ASPIRANT_S_CHALLENGE_H = 13680, QUEST_THE_ASPIRANT_S_CHALLENGE_A = 13679, @@ -142,7 +142,7 @@ class npc_squire_david : public CreatureScript public: npc_squire_david() : CreatureScript("npc_squire_david") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_H) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_THE_ASPIRANT_S_CHALLENGE_A) == QUEST_STATUS_INCOMPLETE)//We need more info about it. @@ -155,7 +155,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -171,7 +171,7 @@ public: ## npc_argent_valiant ######*/ -enum eArgentValiant +enum ArgentValiant { SPELL_CHARGE = 63010, SPELL_SHIELD_BREAKER = 65147, @@ -194,13 +194,13 @@ public: uint32 uiChargeTimer; uint32 uiShieldBreakerTimer; - void Reset() + void Reset() OVERRIDE { uiChargeTimer = 7000; uiShieldBreakerTimer = 10000; } - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -208,7 +208,7 @@ public: me->setFaction(14); } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* pDoneBy, uint32& uiDamage) OVERRIDE { if (uiDamage > me->GetHealth() && pDoneBy->GetTypeId() == TYPEID_PLAYER) { @@ -221,7 +221,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -242,7 +242,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_argent_valiantAI(creature); } @@ -252,7 +252,7 @@ public: ## npc_guardian_pavilion ######*/ -enum eGuardianPavilion +enum GuardianPavilion { SPELL_TRESPASSER_H = 63987, AREA_SUNREAVER_PAVILION = 4676, @@ -273,7 +273,8 @@ public: SetCombatMovement(false); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->GetAreaId() != AREA_SUNREAVER_PAVILION && me->GetAreaId() != AREA_SILVER_COVENANT_PAVILION) return; @@ -292,7 +293,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_guardian_pavilionAI(creature); } @@ -302,7 +303,7 @@ public: ## npc_vereth_the_cunning ######*/ -enum eVerethTheCunning +enum VerethTheCunning { NPC_GEIST_RETURN_BUNNY_KC = 31049, NPC_LITHE_STALKER = 30894, @@ -318,7 +319,8 @@ public: { npc_vereth_the_cunningAI(Creature* creature) : ScriptedAI(creature) {} - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); @@ -337,7 +339,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_vereth_the_cunningAI(creature); } @@ -385,7 +387,7 @@ class npc_tournament_training_dummy : public CreatureScript EventMap events; bool isVulnerable; - void Reset() + void Reset() OVERRIDE { me->SetControlled(true, UNIT_STATE_STUNNED); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true); @@ -406,7 +408,7 @@ class npc_tournament_training_dummy : public CreatureScript events.ScheduleEvent(EVENT_DUMMY_RECAST_DEFEND, 5000); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (!_EnterEvadeMode()) return; @@ -414,13 +416,13 @@ class npc_tournament_training_dummy : public CreatureScript Reset(); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { damage = 0; events.RescheduleEvent(EVENT_DUMMY_RESET, 10000); } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { switch (me->GetEntry()) { @@ -450,7 +452,7 @@ class npc_tournament_training_dummy : public CreatureScript isVulnerable = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -492,10 +494,11 @@ class npc_tournament_training_dummy : public CreatureScript me->SetControlled(true, UNIT_STATE_STUNNED); } - void MoveInLineOfSight(Unit* /*who*/){} + void MoveInLineOfSight(Unit* /*who*/)OVERRIDE {} + }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tournament_training_dummyAI(creature); } @@ -616,7 +619,7 @@ public: uint64 guidMason[3]; uint64 guidHalof; - void Reset() + void Reset() OVERRIDE { me->setRegeneratingHealth(false); DoCast(SPELL_THREAT_PULSE); @@ -624,22 +627,23 @@ public: events.ScheduleEvent(EVENT_SPAWN, 3000); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} - void JustSummoned(Creature* Summoned) + void JustSummoned(Creature* Summoned) OVERRIDE { Summons.Summon(Summoned); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Summons.DespawnAll(); me->DespawnOrUnsummon(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -870,7 +874,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blessed_bannerAI(creature); } @@ -908,12 +912,12 @@ class npc_frostbrood_skytalon : public CreatureScript EventMap events; - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { me->GetMotionMaster()->MovePoint(POINT_GRAB_DECOY, summoner->GetPositionX(), summoner->GetPositionY(), summoner->GetPositionZ()); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -924,7 +928,7 @@ class npc_frostbrood_skytalon : public CreatureScript DoCast(summoner, SPELL_GRAB); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { VehicleAI::UpdateAI(diff); events.Update(diff); @@ -941,7 +945,7 @@ class npc_frostbrood_skytalon : public CreatureScript } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { switch (spell->Id) { @@ -956,7 +960,7 @@ class npc_frostbrood_skytalon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frostbrood_skytalonAI(creature); } diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 2c0a98ab0ad..c1bca1dae76 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -45,7 +45,7 @@ EndContentData */ #define GOSSIP_ITEM1 "I am ready to travel to your village now." -enum eRainspeaker +enum Rainspeaker { SAY_START_IRO = 0, SAY_QUEST_ACCEPT_IRO = 1, @@ -67,7 +67,7 @@ public: uint64 c_guid; - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); // if we will have other way to assign this to only one npc remove this part @@ -78,7 +78,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -115,7 +115,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -128,7 +128,7 @@ public: } }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -141,7 +141,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+1) @@ -162,13 +162,13 @@ public: return true; } - bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* /*_Quest*/) + bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* /*_Quest*/) OVERRIDE { creature->AI()->Talk(SAY_QUEST_ACCEPT_IRO); return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_injured_rainspeaker_oracleAI(creature); } @@ -181,7 +181,7 @@ public: #define GOSSIP_VEKJIK_ITEM1 "Shaman Vekjik, I have spoken with the big-tongues and they desire peace. I have brought this offering on their behalf." #define GOSSIP_VEKJIK_ITEM2 "No no... I had no intentions of betraying your people. I was only defending myself. it was all a misunderstanding." -enum eVekjik +enum Vekjik { GOSSIP_TEXTID_VEKJIK1 = 13137, GOSSIP_TEXTID_VEKJIK2 = 13138, @@ -198,7 +198,7 @@ class npc_vekjik : public CreatureScript public: npc_vekjik() : CreatureScript("npc_vekjik") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -214,7 +214,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -243,7 +243,7 @@ public: #define GOSSIP_ITEM_AOF2 "You can trust me. I am no friend of the Lich King." #define GOSSIP_ITEM_AOF3 "I will not fail." -enum eFreya +enum Freya { QUEST_FREYA_PACT = 12621, @@ -259,7 +259,7 @@ class npc_avatar_of_freya : public CreatureScript public: npc_avatar_of_freya() : CreatureScript("npc_avatar_of_freya") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -271,7 +271,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -308,7 +308,7 @@ public: { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (me->isDead()) return; @@ -320,7 +320,7 @@ public: Reset(); } - void UpdateAI(uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -329,7 +329,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bushwhackerAI(creature); } @@ -339,11 +339,13 @@ public: ## npc_engineer_helice ######*/ -enum eEnums +enum EngineerHelice { + // Spells SPELL_EXPLODE_CRYSTAL = 62487, SPELL_FLAMES = 64561, + // Yells SAY_WP_1 = 0, SAY_WP_2 = 1, SAY_WP_3 = 2, @@ -352,6 +354,7 @@ enum eEnums SAY_WP_6 = 5, SAY_WP_7 = 6, + // Quests QUEST_DISASTER = 12688 }; @@ -366,7 +369,7 @@ public: uint32 m_uiChatTimer; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); @@ -405,12 +408,12 @@ public: } } - void Reset() + void Reset() OVERRIDE { m_uiChatTimer = 4000; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -419,7 +422,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -435,12 +438,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_engineer_heliceAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_DISASTER) { @@ -506,7 +509,7 @@ public: { npc_jungle_punch_targetAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { sayTimer = 3500; sayStep = 0; @@ -516,7 +519,8 @@ public: orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -581,7 +585,7 @@ public: timer -= diff; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (phase) proceedCwEvent(uiDiff); @@ -635,7 +639,7 @@ public: sayTimer -= uiDiff; } - void SpellHit(Unit* caster, const SpellInfo* proto) + void SpellHit(Unit* caster, const SpellInfo* proto) OVERRIDE { if (!proto || proto->Id != SPELL_OFFER) return; @@ -687,7 +691,7 @@ public: uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jungle_punch_targetAI(creature); } @@ -701,7 +705,7 @@ public: #define GOSSIP_OPTION_BANANAS "Have a spare bunch of bananas?" #define GOSSIP_OPTION_PAPAYA "I could really use a papaya." -enum eAdventurousDwarf +enum AdventurousDwarf { QUEST_12634 = 12634, @@ -732,12 +736,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_adventurous_dwarfAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_12634) != QUEST_STATUS_INCOMPLETE) return false; @@ -755,7 +759,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); uint32 spellId = 0; @@ -850,13 +854,13 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12620_the_lifewarden_wrath_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12620_the_lifewarden_wrath_SpellScript(); } @@ -973,14 +977,14 @@ public: } } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_q12589_shoot_rjr_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_q12589_shoot_rjr_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12589_shoot_rjr_SpellScript(); } @@ -1010,7 +1014,7 @@ public: { npc_haiphoonAI(Creature* creature) : VehicleAI(creature) { } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (target == me) return; @@ -1026,7 +1030,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_haiphoonAI(creature); } @@ -1064,13 +1068,13 @@ public: { npc_vics_flying_machineAI(Creature* creature) : VehicleAI(creature) {} - void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* passenger, int8 /*seatId*/, bool apply) OVERRIDE { if (apply && passenger->GetTypeId() == TYPEID_PLAYER) me->GetMotionMaster()->MovePath(NPC_PLANE, false); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != WAYPOINT_MOTION_TYPE) return; @@ -1106,7 +1110,7 @@ public: } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_LAND) { @@ -1119,10 +1123,10 @@ public: } } - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_vics_flying_machineAI(creature); } diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index bf8a454f9e5..1fc0cce51b4 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -48,7 +48,7 @@ public: { npc_injured_goblinAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -65,18 +65,18 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void Reset() {} + void Reset() OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Player* player = GetPlayerForEscort(); if (HasEscortState(STATE_ESCORT_ESCORTING) && player) player->FailQuest(QUEST_BITTER_DEPARTURE); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); if (!UpdateVictim()) @@ -84,7 +84,7 @@ public: DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 sender, uint32 action) + void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE { if (sender == GOSSIP_ID && action == GOSSIP_OPTION_ID) { @@ -95,12 +95,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_injured_goblinAI(creature); } - bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_BITTER_DEPARTURE) creature->AI()->Talk(SAY_QUEST_ACCEPT); @@ -113,15 +113,18 @@ public: ## npc_roxi_ramrocket ######*/ -#define SPELL_MECHANO_HOG 60866 -#define SPELL_MEKGINEERS_CHOPPER 60867 +enum RoxiRamrocket +{ + SPELL_MECHANO_HOG = 60866, + SPELL_MEKGINEERS_CHOPPER = 60867 +}; class npc_roxi_ramrocket : public CreatureScript { public: npc_roxi_ramrocket() : CreatureScript("npc_roxi_ramrocket") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { //Quest Menu if (creature->IsQuestGiver()) @@ -140,7 +143,7 @@ public: return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (action) @@ -179,18 +182,18 @@ public: bool freed; - void Reset() + void Reset() OVERRIDE { freed = false; me->CastSpell(me, SPELL_ICE_PRISON, true); } - void JustRespawned() + void JustRespawned() OVERRIDE { Reset(); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!freed) return; @@ -199,7 +202,7 @@ public: me->DespawnOrUnsummon(); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id != SPELL_ICE_LANCE) return; @@ -214,7 +217,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_brunnhildar_prisonerAI(creature); } @@ -251,12 +254,12 @@ public: EventMap events; - void Reset() + void Reset() OVERRIDE { events.ScheduleEvent(EVENT_CHECK_AREA, 5000); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != WAYPOINT_MOTION_TYPE) return; @@ -266,7 +269,7 @@ public: events.ScheduleEvent(EVENT_REACHED_HOME, 2000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -307,7 +310,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_freed_protodrakeAI(creature); } @@ -322,11 +325,11 @@ public: { npc_icefangAI(Creature* creature) : npc_escortAI(creature) {} - void AttackStart(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} - void EnterEvadeMode() {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterEvadeMode() OVERRIDE {} - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -335,19 +338,19 @@ public: } } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void OnCharmed(bool /*apply*/) + void OnCharmed(bool /*apply*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -356,9 +359,9 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_icefangAI (creature); + return new npc_icefangAI(creature); } }; @@ -377,7 +380,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript public: npc_hyldsmeet_protodrakeAI(Creature* creature) : CreatureAI(creature), _accessoryRespawnTimer(0), _vehicleKit(creature->GetVehicleKit()) {} - void PassengerBoarded(Unit* who, int8 /*seat*/, bool apply) + void PassengerBoarded(Unit* who, int8 /*seat*/, bool apply) OVERRIDE { if (apply) return; @@ -386,7 +389,7 @@ class npc_hyldsmeet_protodrake : public CreatureScript _accessoryRespawnTimer = 5 * MINUTE * IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //! We need to manually reinstall accessories because the vehicle itself is friendly to players, //! so EnterEvadeMode is never triggered. The accessory on the other hand is hostile and killable. @@ -404,9 +407,9 @@ class npc_hyldsmeet_protodrake : public CreatureScript Vehicle* _vehicleKit; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { - return new npc_hyldsmeet_protodrakeAI (creature); + return new npc_hyldsmeet_protodrakeAI(creature); } }; @@ -424,13 +427,13 @@ class spell_close_rift : public SpellScriptLoader { PrepareAuraScript(spell_close_rift_AuraScript); - bool Load() + bool Load() OVERRIDE { _counter = 0; return true; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { return sSpellMgr->GetSpellInfo(SPELL_DESPAWN_RIFT); } @@ -441,7 +444,7 @@ class spell_close_rift : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_DESPAWN_RIFT, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_close_rift_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -451,7 +454,7 @@ class spell_close_rift : public SpellScriptLoader }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_close_rift_AuraScript(); } diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 43b5eaefc62..0b9c319bf56 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -115,7 +115,7 @@ class npc_wg_demolisher_engineer : public CreatureScript public: npc_wg_demolisher_engineer() : CreatureScript("npc_wg_demolisher_engineer") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -138,7 +138,7 @@ class npc_wg_demolisher_engineer : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->CLOSE_GOSSIP_MENU(); @@ -186,7 +186,7 @@ class npc_wg_spirit_guide : public CreatureScript public: npc_wg_spirit_guide() : CreatureScript("npc_wg_spirit_guide") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -204,7 +204,7 @@ class npc_wg_spirit_guide : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) OVERRIDE { player->CLOSE_GOSSIP_MENU(); @@ -224,14 +224,14 @@ class npc_wg_spirit_guide : public CreatureScript { npc_wg_spirit_guideAI(Creature* creature) : ScriptedAI(creature) { } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!me->HasUnitState(UNIT_STATE_CASTING)) DoCast(me, SPELL_CHANNEL_SPIRIT_HEAL); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wg_spirit_guideAI(creature); } @@ -242,7 +242,7 @@ class npc_wg_queue : public CreatureScript public: npc_wg_queue() : CreatureScript("npc_wg_queue") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -271,7 +271,7 @@ class npc_wg_queue : public CreatureScript return true; } - bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/) + bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->CLOSE_GOSSIP_MENU(); @@ -300,7 +300,7 @@ class go_wg_vehicle_teleporter : public GameObjectScript { go_wg_vehicle_teleporterAI(GameObject* gameObject) : GameObjectAI(gameObject), _checkTimer(1000) { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_checkTimer <= diff) { @@ -321,7 +321,7 @@ class go_wg_vehicle_teleporter : public GameObjectScript uint32 _checkTimer; }; - GameObjectAI* GetAI(GameObject* go) const + GameObjectAI* GetAI(GameObject* go) const OVERRIDE { return new go_wg_vehicle_teleporterAI(go); } @@ -332,7 +332,7 @@ class npc_wg_quest_giver : public CreatureScript public: npc_wg_quest_giver() : CreatureScript("npc_wg_quest_giver") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -463,7 +463,7 @@ class spell_wintergrasp_force_building : public SpellScriptLoader { PrepareSpellScript(spell_wintergrasp_force_building_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BUILD_CATAPULT_FORCE) || !sSpellMgr->GetSpellInfo(SPELL_BUILD_DEMOLISHER_FORCE) @@ -479,13 +479,13 @@ class spell_wintergrasp_force_building : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue(), false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_force_building_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_wintergrasp_force_building_SpellScript(); } @@ -506,13 +506,13 @@ class spell_wintergrasp_grab_passenger : public SpellScriptLoader target->CastSpell(GetCaster(), SPELL_RIDE_WG_VEHICLE, false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_grab_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_wintergrasp_grab_passenger_SpellScript(); } @@ -523,7 +523,7 @@ class achievement_wg_didnt_stand_a_chance : public AchievementCriteriaScript public: achievement_wg_didnt_stand_a_chance() : AchievementCriteriaScript("achievement_wg_didnt_stand_a_chance") { } - bool OnCheck(Player* source, Unit* target) + bool OnCheck(Player* source, Unit* target) OVERRIDE { if (!target) return false; @@ -566,13 +566,13 @@ public: return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_wintergrasp_defender_teleport_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_wintergrasp_defender_teleport_SpellScript(); } @@ -597,13 +597,13 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_defender_teleport_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_wintergrasp_defender_teleport_trigger_SpellScript(); } diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 68fdc16cfb0..60ae487daa7 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -48,7 +48,7 @@ public: { npc_drakuru_shacklesAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { _rageclawGUID = 0; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -86,7 +86,7 @@ public: me->setDeathState(DEAD); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_UNLOCK_SHACKLE) { @@ -108,7 +108,7 @@ public: uint64 _rageclawGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_drakuru_shacklesAI(creature); } @@ -134,15 +134,16 @@ public: { npc_captured_rageclawAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->setFaction(35); DoCast(me, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } - void MoveInLineOfSight(Unit* /*who*/){} + void MoveInLineOfSight(Unit* /*who*/)OVERRIDE {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_FREE_RAGECLAW) { @@ -158,7 +159,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_captured_rageclawAI(creature); } @@ -264,7 +265,7 @@ public: { npc_gurgthockAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { _summonGUID = 0; _playerGUID = 0; @@ -280,12 +281,12 @@ public: _removeFlag = false; } - void SetGUID(uint64 guid, int32 /*id*/) + void SetGUID(uint64 guid, int32 /*id*/) OVERRIDE { _playerGUID = guid; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { _removeFlag = true; me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); @@ -323,7 +324,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { ScriptedAI::UpdateAI(diff); @@ -459,7 +460,7 @@ public: }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { switch (quest->GetQuestId()) { @@ -486,7 +487,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_gurgthockAI(creature); } @@ -520,7 +521,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void Reset() + void Reset() OVERRIDE { _summoned = false; _battleShout = false; @@ -531,13 +532,13 @@ public: _affectedGUID = 0; } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (Creature* whisker = me->GetCreature(*me, _whiskerGUID)) whisker->RemoveFromWorld(); } - void MovementInform(uint32 type, uint32 /*pointId*/) + void MovementInform(uint32 type, uint32 /*pointId*/) OVERRIDE { if (type != EFFECT_MOTION_TYPE) return; @@ -548,12 +549,12 @@ public: uiBattleShoutTimer = 7000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoCast(who, SPELL_IMPALE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -587,7 +588,7 @@ public: DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { switch (summon->GetEntry()) { @@ -604,7 +605,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (_whiskerGUID) if (Creature* whisker = me->GetCreature(*me, _whiskerGUID)) @@ -625,7 +626,7 @@ public: uint64 _whiskerGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_orinoko_tuskbreakerAI(creature); } @@ -656,7 +657,7 @@ public: SetDespawnAtEnd(false); } - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->SetReactState(REACT_PASSIVE); @@ -666,7 +667,7 @@ public: } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -678,12 +679,12 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_GROW); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -712,7 +713,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) player->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_KORRAK_BLOODRAGER, killer); @@ -723,7 +724,7 @@ public: uint32 _uppercutTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_korrak_bloodragerAI(creature); } @@ -749,13 +750,13 @@ public: { npc_yggdrasAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { _cleaveTimer = 9000; _corrodeFleshTimer = 6000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -793,7 +794,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (Unit* summoner = me->ToTempSummon()->GetSummoner()) { @@ -815,7 +816,7 @@ public: uint32 _corrodeFleshTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_yggdrasAI(creature); } @@ -849,7 +850,7 @@ public: SetDespawnAtEnd(false); } - void Reset() + void Reset() OVERRIDE { me->AddAura(SPELL_THUNDERBLADE, me); uiKnockAwayTimer = 10000; @@ -858,7 +859,7 @@ public: _thunderClap = false; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -870,7 +871,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -932,7 +933,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) player->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, killer); @@ -947,7 +948,7 @@ public: uint32 uiStinkyBeardTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stinkbeardAI(creature); } @@ -975,7 +976,7 @@ public: bool bAddAttack; - void Reset() + void Reset() OVERRIDE { uiBossRandom = 0; uiSpellInfo = 0; @@ -984,7 +985,7 @@ public: bAddAttack = false; } - void SetData(uint32 uiData, uint32 uiValue) + void SetData(uint32 uiData, uint32 uiValue) OVERRIDE { if (uiData == 1) { @@ -1011,7 +1012,7 @@ public: } - void EnterCombat(Unit* unit) + void EnterCombat(Unit* unit) OVERRIDE { if (!SummonList.empty()) for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) @@ -1024,7 +1025,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -1075,7 +1076,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!SummonList.empty()) for (std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) @@ -1092,7 +1093,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_elemental_lordAI(creature); } @@ -1111,7 +1112,7 @@ public: { npc_fiend_elementalAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { if (me->GetPositionZ() >= 287.0f) me->GetMotionMaster()->MoveIdle(); @@ -1120,7 +1121,7 @@ public: _missleTimer = urand(2000, 7000); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -1128,14 +1129,14 @@ public: AttackStartNoMove(who); } - void SetData(uint32 Data, uint32 Value) + void SetData(uint32 Data, uint32 Value) OVERRIDE { if (Data == 1) _spell = Boss[Value].uiAddSpell; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1158,7 +1159,7 @@ public: uint32 _spell; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fiend_elementalAI(creature); } @@ -1177,14 +1178,14 @@ public: { npc_released_offspring_harkoaAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { float x, y, z; me->GetClosePoint(x, y, z, me->GetObjectSize() / 3, 25.0f); me->GetMotionMaster()->MovePoint(0, x, y, z); } - void MovementInform(uint32 Type, uint32 /*uiId*/) + void MovementInform(uint32 Type, uint32 /*uiId*/) OVERRIDE { if (Type != POINT_MOTION_TYPE) return; @@ -1192,7 +1193,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_released_offspring_harkoaAI(creature); } @@ -1223,14 +1224,14 @@ public: { npc_crusade_recruitAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_COWER); _heading = me->GetOrientation(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -1258,7 +1259,7 @@ public: return; } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { _events.ScheduleEvent(EVENT_RECRUIT_1, 100); player->CLOSE_GOSSIP_MENU(); @@ -1271,7 +1272,7 @@ public: float _heading; // Store creature heading }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crusade_recruitAI(creature); } @@ -1294,7 +1295,7 @@ class go_scourge_enclosure : public GameObjectScript public: go_scourge_enclosure() : GameObjectScript("go_scourge_enclosure") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE) @@ -1454,12 +1455,12 @@ public: { npc_alchemist_finklesteinAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { _events.ScheduleEvent(EVENT_TURN_TO_POT, urand(15000, 26000)); } - void SetData(uint32 Type, uint32 Data) + void SetData(uint32 Type, uint32 Data) OVERRIDE { if (Type == 1 && Data == 1) switch (_getingredienttry) @@ -1482,7 +1483,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -1538,7 +1539,7 @@ public: } } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->CLOSE_GOSSIP_MENU(); DoCast(player, SPELL_ALCHEMIST_APPRENTICE_INVISBUFF); @@ -1553,7 +1554,7 @@ public: uint8 _getingredienttry; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_alchemist_finklesteinAI(creature); } @@ -1564,7 +1565,7 @@ class go_finklesteins_cauldron : public GameObjectScript public: go_finklesteins_cauldron() : GameObjectScript("go_finklesteins_cauldron") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { player->CastSpell(player, SPELL_POT_CHECK); return true; @@ -1608,7 +1609,7 @@ class spell_random_ingredient_aura : public SpellScriptLoader { PrepareAuraScript(spell_random_ingredient_aura_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RANDOM_INGREDIENT_EASY) || !sSpellMgr->GetSpellInfo(SPELL_RANDOM_INGREDIENT_MEDIUM) || !sSpellMgr->GetSpellInfo(SPELL_RANDOM_INGREDIENT_HARD)) return false; @@ -1631,13 +1632,13 @@ class spell_random_ingredient_aura : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_random_ingredient_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_random_ingredient_aura_AuraScript(); } @@ -1655,7 +1656,7 @@ class spell_random_ingredient : public SpellScriptLoader { PrepareSpellScript(spell_random_ingredient_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FETCH_KNOTROOT) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PICKLED_EAGLE_EGG) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SPECKLED_GUANO) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_WITHERED_BATWING) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SEASONED_SLIDER_CIDER) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PULVERIZED_GARGOYLE_TEETH) || @@ -1695,13 +1696,13 @@ class spell_random_ingredient : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_random_ingredient_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_random_ingredient_SpellScript(); } @@ -1719,7 +1720,7 @@ class spell_pot_check : public SpellScriptLoader { PrepareSpellScript(spell_pot_check_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FETCH_KNOTROOT) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PICKLED_EAGLE_EGG) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SPECKLED_GUANO) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_WITHERED_BATWING) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_SEASONED_SLIDER_CIDER) || !sSpellMgr->GetSpellInfo(SPELL_FETCH_PULVERIZED_GARGOYLE_TEETH) || @@ -1788,13 +1789,13 @@ class spell_pot_check : public SpellScriptLoader player->DestroyItemCount(FetchIngredients[i][2], 1, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pot_check_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pot_check_SpellScript(); } @@ -1824,13 +1825,13 @@ class spell_fetch_ingredient_aura : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_fetch_ingredient_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_fetch_ingredient_aura_AuraScript(); } |